aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n..@apache.org
Subject svn commit: r1073347 - in /aries/trunk/application: ./ application-deployment-management/ application-deployment-management/src/main/java/org/apache/aries/application/deployment/management/impl/ application-deployment-management/src/main/java/org/apach...
Date Tue, 22 Feb 2011 14:48:06 GMT
Author: not
Date: Tue Feb 22 14:48:05 2011
New Revision: 1073347

URL: http://svn.apache.org/viewvc?rev=1073347&view=rev
Log:
ARIES-583 Refactor to remove the no-op platform repository and no-op PostResolveAction. We
can merge them into the client bundles and use the ext:default capability to override with
a service if one gets bound.

Added:
    aries/trunk/application/application-deployment-management/src/main/java/org/apache/aries/application/deployment/management/impl/DefaultPostResolveTransformer.java
    aries/trunk/application/application-deployment-management/src/main/java/org/apache/aries/application/deployment/management/impl/MessageUtil.java
      - copied, changed from r1072934, aries/trunk/application/application-deployment-management/src/main/java/org/apache/aries/application/deployment/management/internal/MessageUtil.java
    aries/trunk/application/application-obr-resolver/src/main/java/org/apache/aries/application/resolver/internal/DefaultPlatformRepository.java
Removed:
    aries/trunk/application/application-deployment-management/src/main/java/org/apache/aries/application/deployment/management/internal/
    aries/trunk/application/application-noop-platform-repository/
    aries/trunk/application/application-noop-postresolve-process/
Modified:
    aries/trunk/application/application-deployment-management/pom.xml
    aries/trunk/application/application-deployment-management/src/main/java/org/apache/aries/application/deployment/management/impl/DeploymentManifestManagerImpl.java
    aries/trunk/application/application-deployment-management/src/main/resources/OSGI-INF/blueprint/deployment-manager.xml
    aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicAppManagerTest.java
    aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicNoOpResolverTest.java
    aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedRuntimeTest.java
    aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/MinimumImportsTest.java
    aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRAppManagerTest.java
    aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java
    aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverTest.java
    aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/UpdateAppTest.java
    aries/trunk/application/application-obr-resolver/pom.xml
    aries/trunk/application/application-obr-resolver/src/main/resources/OSGI-INF/blueprint/obr-resolver.xml
    aries/trunk/application/pom.xml

Modified: aries/trunk/application/application-deployment-management/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-deployment-management/pom.xml?rev=1073347&r1=1073346&r2=1073347&view=diff
==============================================================================
--- aries/trunk/application/application-deployment-management/pom.xml (original)
+++ aries/trunk/application/application-deployment-management/pom.xml Tue Feb 22 14:48:05
2011
@@ -31,12 +31,7 @@
     </description>
 
     <properties>
-        <aries.osgi.export.pkg>
-        </aries.osgi.export.pkg>
-        <aries.osgi.private.pkg>
-            org.apache.aries.application.deployment.management.impl;
-            org.apache.aries.application.deployment.management.internal
-        </aries.osgi.private.pkg>
+        <aries.osgi.export.pkg/>
     </properties>
 
     <dependencies>

Added: aries/trunk/application/application-deployment-management/src/main/java/org/apache/aries/application/deployment/management/impl/DefaultPostResolveTransformer.java
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-deployment-management/src/main/java/org/apache/aries/application/deployment/management/impl/DefaultPostResolveTransformer.java?rev=1073347&view=auto
==============================================================================
--- aries/trunk/application/application-deployment-management/src/main/java/org/apache/aries/application/deployment/management/impl/DefaultPostResolveTransformer.java
(added)
+++ aries/trunk/application/application-deployment-management/src/main/java/org/apache/aries/application/deployment/management/impl/DefaultPostResolveTransformer.java
Tue Feb 22 14:48:05 2011
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIESOR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.aries.application.deployment.management.impl;
+
+import org.apache.aries.application.ApplicationMetadata;
+import org.apache.aries.application.management.ResolverException;
+import org.apache.aries.application.management.spi.resolve.PostResolveTransformer;
+import org.apache.aries.application.modelling.DeployedBundles;
+
+
+
+public class DefaultPostResolveTransformer implements PostResolveTransformer
+{
+
+  @Override
+  public DeployedBundles postResolveProcess(ApplicationMetadata appMetadata, DeployedBundles
deployedBundles)
+      throws ResolverException
+  {
+    
+    return deployedBundles;
+  }
+  
+
+}

Modified: aries/trunk/application/application-deployment-management/src/main/java/org/apache/aries/application/deployment/management/impl/DeploymentManifestManagerImpl.java
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-deployment-management/src/main/java/org/apache/aries/application/deployment/management/impl/DeploymentManifestManagerImpl.java?rev=1073347&r1=1073346&r2=1073347&view=diff
==============================================================================
--- aries/trunk/application/application-deployment-management/src/main/java/org/apache/aries/application/deployment/management/impl/DeploymentManifestManagerImpl.java
(original)
+++ aries/trunk/application/application-deployment-management/src/main/java/org/apache/aries/application/deployment/management/impl/DeploymentManifestManagerImpl.java
Tue Feb 22 14:48:05 2011
@@ -44,7 +44,6 @@ import org.apache.aries.application.Appl
 import org.apache.aries.application.Content;
 import org.apache.aries.application.InvalidAttributeException;
 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.BundleInfo;
 import org.apache.aries.application.management.ResolveConstraint;

Copied: aries/trunk/application/application-deployment-management/src/main/java/org/apache/aries/application/deployment/management/impl/MessageUtil.java
(from r1072934, aries/trunk/application/application-deployment-management/src/main/java/org/apache/aries/application/deployment/management/internal/MessageUtil.java)
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-deployment-management/src/main/java/org/apache/aries/application/deployment/management/impl/MessageUtil.java?p2=aries/trunk/application/application-deployment-management/src/main/java/org/apache/aries/application/deployment/management/impl/MessageUtil.java&p1=aries/trunk/application/application-deployment-management/src/main/java/org/apache/aries/application/deployment/management/internal/MessageUtil.java&r1=1072934&r2=1073347&rev=1073347&view=diff
==============================================================================
--- aries/trunk/application/application-deployment-management/src/main/java/org/apache/aries/application/deployment/management/internal/MessageUtil.java
(original)
+++ aries/trunk/application/application-deployment-management/src/main/java/org/apache/aries/application/deployment/management/impl/MessageUtil.java
Tue Feb 22 14:48:05 2011
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.aries.application.deployment.management.internal;
+package org.apache.aries.application.deployment.management.impl;
 
 import java.text.MessageFormat;
 import java.util.ArrayList;

Modified: aries/trunk/application/application-deployment-management/src/main/resources/OSGI-INF/blueprint/deployment-manager.xml
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-deployment-management/src/main/resources/OSGI-INF/blueprint/deployment-manager.xml?rev=1073347&r1=1073346&r2=1073347&view=diff
==============================================================================
--- aries/trunk/application/application-deployment-management/src/main/resources/OSGI-INF/blueprint/deployment-manager.xml
(original)
+++ aries/trunk/application/application-deployment-management/src/main/resources/OSGI-INF/blueprint/deployment-manager.xml
Tue Feb 22 14:48:05 2011
@@ -16,8 +16,9 @@
     limitations under the License.
 -->
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0">
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+           xmlns:ext="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.1.0">
   
   <bean id="deploymentManifestManager" class="org.apache.aries.application.deployment.management.impl.DeploymentManifestManagerImpl">
     <property name="resolver" ref="resolver"/>
@@ -28,12 +29,15 @@
     <property name="modellingHelper" ref="modellingHelper"/>
   </bean>
   
+  <bean id="default-postresolve-transformer" class="org.apache.aries.application.deployment.management.impl.DefaultPostResolveTransformer"/>
+
   <reference id="modellingManager" interface="org.apache.aries.application.modelling.ModellingManager"/>
   <reference id="modellingHelper" interface="org.apache.aries.application.modelling.utils.ModellingHelper"/>
   <reference id="modelledResourceManager" interface="org.apache.aries.application.modelling.ModelledResourceManager"/>
   <reference id="localPlatform" interface="org.apache.aries.application.management.spi.runtime.LocalPlatform"/>
   <reference id="resolver" interface="org.apache.aries.application.management.spi.resolve.AriesApplicationResolver"/>
-  <reference id="postResolveTransformer" interface="org.apache.aries.application.management.spi.resolve.PostResolveTransformer"/>
+  <reference id="postResolveTransformer" interface="org.apache.aries.application.management.spi.resolve.PostResolveTransformer"
+               availability="optional" ext:default="default-postresolve-transformer"/>
   
   <service id ="deploymentManifestManager-Service" ref="deploymentManifestManager" interface="org.apache.aries.application.management.spi.resolve.DeploymentManifestManager"/>
     

Modified: aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicAppManagerTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicAppManagerTest.java?rev=1073347&r1=1073346&r2=1073347&view=diff
==============================================================================
--- aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicAppManagerTest.java
(original)
+++ aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicAppManagerTest.java
Tue Feb 22 14:48:05 2011
@@ -138,8 +138,6 @@ public class BasicAppManagerTest extends
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.management"),
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.runtime"),
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.default.local.platform"),
-        mavenBundle("org.apache.aries.application", "org.apache.aries.application.noop.platform.repo"),
-        mavenBundle("org.apache.aries.application", "org.apache.aries.application.noop.postresolve.process"),
         mavenBundle("org.apache.felix", "org.apache.felix.bundlerepository"),
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.resolver.obr"),
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.runtime.itest.interfaces"),

Modified: aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicNoOpResolverTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicNoOpResolverTest.java?rev=1073347&r1=1073346&r2=1073347&view=diff
==============================================================================
--- aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicNoOpResolverTest.java
(original)
+++ aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicNoOpResolverTest.java
Tue Feb 22 14:48:05 2011
@@ -135,8 +135,6 @@ public class BasicNoOpResolverTest exten
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.utils"),
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.deployment.management"),
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.modeller"),
-        mavenBundle("org.apache.aries.application", "org.apache.aries.application.noop.platform.repo"),
-        mavenBundle("org.apache.aries.application", "org.apache.aries.application.noop.postresolve.process"),
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.default.local.platform"),
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.management"),
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.runtime"),

Modified: aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedRuntimeTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedRuntimeTest.java?rev=1073347&r1=1073346&r2=1073347&view=diff
==============================================================================
--- aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedRuntimeTest.java
(original)
+++ aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedRuntimeTest.java
Tue Feb 22 14:48:05 2011
@@ -250,8 +250,6 @@ public class IsolatedRuntimeTest extends
         mavenBundle("org.apache.aries", "org.apache.aries.util"),
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.api"),
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.utils"),
-        mavenBundle("org.apache.aries.application", "org.apache.aries.application.noop.platform.repo"),
-        mavenBundle("org.apache.aries.application", "org.apache.aries.application.noop.postresolve.process"),
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.default.local.platform"),
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.modeller"),
         mavenBundle("org.apache.felix", "org.apache.felix.bundlerepository"),

Modified: aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/MinimumImportsTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/MinimumImportsTest.java?rev=1073347&r1=1073346&r2=1073347&view=diff
==============================================================================
--- aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/MinimumImportsTest.java
(original)
+++ aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/MinimumImportsTest.java
Tue Feb 22 14:48:05 2011
@@ -185,8 +185,6 @@ public class MinimumImportsTest extends 
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.utils"),
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.management"),
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.runtime"),
-        mavenBundle("org.apache.aries.application", "org.apache.aries.application.noop.platform.repo"),
-        mavenBundle("org.apache.aries.application", "org.apache.aries.application.noop.postresolve.process"),
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.runtime.itest.interfaces"),
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.default.local.platform"),
         mavenBundle("org.apache.aries", "org.apache.aries.util"),

Modified: aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRAppManagerTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRAppManagerTest.java?rev=1073347&r1=1073346&r2=1073347&view=diff
==============================================================================
--- aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRAppManagerTest.java
(original)
+++ aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRAppManagerTest.java
Tue Feb 22 14:48:05 2011
@@ -170,8 +170,6 @@ public class OBRAppManagerTest extends A
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.api"),
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.utils"),
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.modeller"),
-        mavenBundle("org.apache.aries.application", "org.apache.aries.application.noop.platform.repo"),
-        mavenBundle("org.apache.aries.application", "org.apache.aries.application.noop.postresolve.process"),
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.default.local.platform"),
         mavenBundle("org.apache.felix", "org.apache.felix.bundlerepository"),
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.resolver.obr"),

Modified: aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java?rev=1073347&r1=1073346&r2=1073347&view=diff
==============================================================================
--- aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java
(original)
+++ aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java
Tue Feb 22 14:48:05 2011
@@ -547,8 +547,6 @@ public class OBRResolverAdvancedTest ext
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.utils"),
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.management"),
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.default.local.platform"),
-        mavenBundle("org.apache.aries.application", "org.apache.aries.application.noop.platform.repo"),
-        mavenBundle("org.apache.aries.application", "org.apache.aries.application.noop.postresolve.process"),
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.runtime"),
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.resolver.obr"),
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.deployment.management"),

Modified: aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverTest.java?rev=1073347&r1=1073346&r2=1073347&view=diff
==============================================================================
--- aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverTest.java
(original)
+++ aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverTest.java
Tue Feb 22 14:48:05 2011
@@ -288,8 +288,6 @@ public class OBRResolverTest extends Abs
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.utils"),
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.modeller"),
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.default.local.platform"),
-        mavenBundle("org.apache.aries.application", "org.apache.aries.application.noop.platform.repo"),
-        mavenBundle("org.apache.aries.application", "org.apache.aries.application.noop.postresolve.process"),
         mavenBundle("org.apache.felix", "org.apache.felix.bundlerepository"),
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.resolver.obr"),
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.deployment.management"),

Modified: aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/UpdateAppTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/UpdateAppTest.java?rev=1073347&r1=1073346&r2=1073347&view=diff
==============================================================================
--- aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/UpdateAppTest.java
(original)
+++ aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/UpdateAppTest.java
Tue Feb 22 14:48:05 2011
@@ -268,8 +268,6 @@ public class UpdateAppTest extends Abstr
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.utils"),
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.modeller"),
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.default.local.platform"),
-        mavenBundle("org.apache.aries.application", "org.apache.aries.application.noop.platform.repo"),
-        mavenBundle("org.apache.aries.application", "org.apache.aries.application.noop.postresolve.process"),
         mavenBundle("org.apache.felix", "org.apache.felix.bundlerepository"),
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.resolver.obr"),
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.deployment.management"),

Modified: aries/trunk/application/application-obr-resolver/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-obr-resolver/pom.xml?rev=1073347&r1=1073346&r2=1073347&view=diff
==============================================================================
--- aries/trunk/application/application-obr-resolver/pom.xml (original)
+++ aries/trunk/application/application-obr-resolver/pom.xml Tue Feb 22 14:48:05 2011
@@ -34,7 +34,8 @@
         <aries.osgi.private.pkg>
             org.apache.aries.application.resolver.obr;
             org.apache.aries.application.resolver.obr.impl;
-            org.apache.aries.application.resolver.internal
+            org.apache.aries.application.resolver.internal;
+            org.apache.aries.application.noop.*
         </aries.osgi.private.pkg>
     </properties>
     <dependencies>

Added: aries/trunk/application/application-obr-resolver/src/main/java/org/apache/aries/application/resolver/internal/DefaultPlatformRepository.java
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-obr-resolver/src/main/java/org/apache/aries/application/resolver/internal/DefaultPlatformRepository.java?rev=1073347&view=auto
==============================================================================
--- aries/trunk/application/application-obr-resolver/src/main/java/org/apache/aries/application/resolver/internal/DefaultPlatformRepository.java
(added)
+++ aries/trunk/application/application-obr-resolver/src/main/java/org/apache/aries/application/resolver/internal/DefaultPlatformRepository.java
Tue Feb 22 14:48:05 2011
@@ -0,0 +1,35 @@
+
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIESOR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.aries.application.resolver.internal;
+import java.net.URI;
+import java.util.Collection;
+
+import org.apache.aries.application.management.spi.repository.PlatformRepository;
+
+public class DefaultPlatformRepository implements PlatformRepository
+{
+  public Collection<URI> getPlatformRepositoryURLs()
+  {
+    return null;
+  }
+
+}

Modified: aries/trunk/application/application-obr-resolver/src/main/resources/OSGI-INF/blueprint/obr-resolver.xml
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-obr-resolver/src/main/resources/OSGI-INF/blueprint/obr-resolver.xml?rev=1073347&r1=1073346&r2=1073347&view=diff
==============================================================================
--- aries/trunk/application/application-obr-resolver/src/main/resources/OSGI-INF/blueprint/obr-resolver.xml
(original)
+++ aries/trunk/application/application-obr-resolver/src/main/resources/OSGI-INF/blueprint/obr-resolver.xml
Tue Feb 22 14:48:05 2011
@@ -17,7 +17,8 @@
 -->
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0">
+           xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+           xmlns:ext="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.1.0">
 
     <bean id="obr-resolver" class="org.apache.aries.application.resolver.obr.OBRAriesResolver"
scope="singleton">
         <argument>
@@ -28,7 +29,9 @@
         <property name="modellingHelper" ref="modellingHelper"/>
         
     </bean>
-    <reference id="platformRepository" interface="org.apache.aries.application.management.spi.repository.PlatformRepository"/>
+    <bean id="default-platform-repository" class="org.apache.aries.application.resolver.internal.DefaultPlatformRepository"/>
+    <reference id="platformRepository" interface="org.apache.aries.application.management.spi.repository.PlatformRepository"

+               availability="optional" ext:default="default-platform-repository"/>
     <reference id="modellingManager" interface="org.apache.aries.application.modelling.ModellingManager"/>
     <reference id="modellingHelper" interface="org.apache.aries.application.modelling.utils.ModellingHelper"/>
     <service ref="obr-resolver" interface="org.apache.aries.application.management.spi.resolve.AriesApplicationResolver"/>

Modified: aries/trunk/application/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/application/pom.xml?rev=1073347&r1=1073346&r2=1073347&view=diff
==============================================================================
--- aries/trunk/application/pom.xml (original)
+++ aries/trunk/application/pom.xml Tue Feb 22 14:48:05 2011
@@ -18,9 +18,9 @@
 
     <parent>
         <groupId>org.apache.aries</groupId>
-        <artifactId>java5-parent</artifactId>
+        <artifactId>java6-parent</artifactId>
         <version>0.4-SNAPSHOT</version>
-        <relativePath>../parent/default-parent/java5-parent/pom.xml</relativePath>
+        <relativePath>../parent/default-parent/java6-parent/pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -249,8 +249,6 @@
         <module>application-bundle</module>
         <module>application-deployment-management</module>
         <module>application-modeller</module>
-        <module>application-noop-platform-repository</module>
-	    <module>application-noop-postresolve-process</module>
 	    <module>application-default-local-platform</module>
         <module>application-itest-twitter</module>
 		<module>application-twitter4j</module>



Mime
View raw message