geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r923794 - in /geronimo/server/trunk: framework/configs/geronimo-gbean-deployer/src/main/history/ framework/configs/j2ee-system/ framework/configs/j2ee-system/src/main/history/ framework/configs/j2ee-system/src/main/plan/ framework/configs/k...
Date Tue, 16 Mar 2010 15:05:53 GMT
Author: gawor
Date: Tue Mar 16 15:05:52 2010
New Revision: 923794

URL: http://svn.apache.org/viewvc?rev=923794&view=rev
Log:
GERONIMO-4971: Initial OBR integration for Aries Applications. Some of the OBR resolver code is based on the resolver in Apache Aries

Added:
    geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/GeronimoLocalPlatform.java   (with props)
    geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/
    geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/CapabilityImpl.java   (with props)
    geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/ResourceImpl.java   (with props)
    geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/pom.xml   (with props)
    geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/
    geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/
    geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/
    geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/org/
    geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/org/apache/
    geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/org/apache/geronimo/
    geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/org/apache/geronimo/aries/
    geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/org/apache/geronimo/aries/resolver/
    geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/org/apache/geronimo/aries/resolver/GeronimoOBRResolver.java   (with props)
    geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/org/apache/geronimo/aries/resolver/generator/
    geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/org/apache/geronimo/aries/resolver/generator/RepositoryDescriptorGenerator.java   (with props)
    geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/org/apache/geronimo/aries/resolver/impl/
    geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/org/apache/geronimo/aries/resolver/impl/ApplicationResourceImpl.java   (with props)
    geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/org/apache/geronimo/aries/resolver/impl/MapToDictionary.java   (with props)
    geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/org/apache/geronimo/aries/resolver/impl/OBRBundleInfo.java   (with props)
    geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/org/apache/geronimo/aries/resolver/impl/RequirementImpl.java   (with props)
    geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/resources/
    geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/resources/OSGI-INF/
    geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/resources/OSGI-INF/blueprint/
    geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/resources/OSGI-INF/blueprint/obr-resolver.xml   (with props)
Removed:
    geronimo/server/trunk/framework/modules/geronimo-obr/src/main/java/org/apache/geronimo/obr/Activator.java
Modified:
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/j2ee-system/pom.xml
    geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/j2ee-system/src/main/plan/plan.xml
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties
    geronimo/server/trunk/framework/modules/geronimo-obr/pom.xml
    geronimo/server/trunk/plugins/aries/aries-deployer/pom.xml
    geronimo/server/trunk/plugins/aries/aries-deployer/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/ApplicationGBean.java
    geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/ApplicationInstaller.java
    geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/resources/OSGI-INF/blueprint/app-context-management.xml
    geronimo/server/trunk/plugins/aries/pom.xml
    geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/openjpa2/openjpa2/src/main/history/dependencies.xml

Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml?rev=923794&r1=923793&r2=923794&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml Tue Mar 16 15:05:52 2010
@@ -7,11 +7,6 @@
         <type>car</type>
     </module-id>
     <dependency>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>org.apache.felix.bundlerepository</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-cli</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/framework/configs/j2ee-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/j2ee-system/pom.xml?rev=923794&r1=923793&r2=923794&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/j2ee-system/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/j2ee-system/pom.xml Tue Mar 16 15:05:52 2010
@@ -58,6 +58,12 @@
             <artifactId>geronimo-crypto</artifactId>
             <version>${version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-obr</artifactId>
+            <version>${version}</version>
+        </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>

Modified: geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml?rev=923794&r1=923793&r2=923794&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml Tue Mar 16 15:05:52 2010
@@ -68,6 +68,11 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-obr</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-pax-logging</artifactId>
         <type>jar</type>
     </dependency>

Modified: geronimo/server/trunk/framework/configs/j2ee-system/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/j2ee-system/src/main/plan/plan.xml?rev=923794&r1=923793&r2=923794&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/j2ee-system/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/framework/configs/j2ee-system/src/main/plan/plan.xml Tue Mar 16 15:05:52 2010
@@ -126,6 +126,15 @@ specific services - those should be prov
     </gbean>
     -->
 
+    <gbean name="GeronimoOBR" class="org.apache.geronimo.obr.GeronimoOBRGBean">
+        <reference name="Repository">
+            <name>Repository</name>
+        </reference>
+        <reference name="ServerInfo">
+            <name>ServerInfo</name>
+        </reference>
+    </gbean>
+
     <gbean name="EmbeddedDaemon" class="org.apache.geronimo.system.main.EmbeddedDaemon"/>
 
 </module>

Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties?rev=923794&r1=923793&r2=923794&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties (original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties Tue Mar 16 15:05:52 2010
@@ -48,6 +48,7 @@ org/apache/felix/karaf/shell/org.apache.
 org/apache/felix/karaf/shell/org.apache.felix.karaf.shell.config/${felix.karaf.version}/org.apache.felix.karaf.shell.config-${felix.karaf.version}.jar=30
 org/apache/felix/karaf/shell/org.apache.felix.karaf.shell.packages/${felix.karaf.version}/org.apache.felix.karaf.shell.packages-${felix.karaf.version}.jar=30
 org/apache/felix/karaf/shell/org.apache.felix.karaf.shell.commands/${felix.karaf.version}/org.apache.felix.karaf.shell.commands-${felix.karaf.version}.jar=30
+org/apache/felix/karaf/shell/org.apache.felix.karaf.shell.obr/${felix.karaf.version}/org.apache.felix.karaf.shell.obr-${felix.karaf.version}.jar=30
 org/apache/felix/karaf/jaas/org.apache.felix.karaf.jaas.boot/${felix.karaf.version}/org.apache.felix.karaf.jaas.boot-${felix.karaf.version}.jar=30
 org/apache/felix/karaf/jaas/org.apache.felix.karaf.jaas.config/${felix.karaf.version}/org.apache.felix.karaf.jaas.config-${felix.karaf.version}.jar=30
 org/apache/felix/karaf/jaas/org.apache.felix.karaf.jaas.modules/${felix.karaf.version}/org.apache.felix.karaf.jaas.modules-${felix.karaf.version}.jar=30
@@ -80,8 +81,8 @@ commons-cli/commons-cli/1.2/commons-cli-
 org/apache/geronimo/bundles/sxc-jaxb/0.7.2_1-SNAPSHOT/sxc-jaxb-0.7.2_1-SNAPSHOT.jar=40
 org/apache/geronimo/bundles/sxc-runtime/0.7.2_1-SNAPSHOT/sxc-runtime-0.7.2_1-SNAPSHOT.jar=40
 org/apache/xbean/xbean-reflect/${xbeanVersion}/xbean-reflect-${xbeanVersion}.jar=40
-#org/apache/geronimo/framework/geronimo-logging/${pom.version}/geronimo-logging-${pom.version}.jar=40
 org/apache/felix/org.apache.felix.bundlerepository/1.5.0-SNAPSHOT/org.apache.felix.bundlerepository-1.5.0-SNAPSHOT.jar=40
+org/apache/geronimo/framework/geronimo-obr/${pom.version}/geronimo-obr-${pom.version}.jar=40
 org/apache/geronimo/framework/geronimo-cli/${pom.version}/geronimo-cli-${pom.version}.jar=40
 org/apache/geronimo/framework/geronimo-common/${pom.version}/geronimo-common-${pom.version}.jar=40
 org/apache/geronimo/framework/geronimo-crypto/${pom.version}/geronimo-crypto-${pom.version}.jar=40

Modified: geronimo/server/trunk/framework/modules/geronimo-obr/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-obr/pom.xml?rev=923794&r1=923793&r2=923794&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-obr/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-obr/pom.xml Tue Mar 16 15:05:52 2010
@@ -59,7 +59,6 @@
                 <configuration>
                     <instructions>
                         <Export-Package>org.apache.geronimo.obr*</Export-Package>
-                        <Bundle-Activator>org.apache.geronimo.obr.Activator</Bundle-Activator>
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/server/trunk/plugins/aries/aries-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/aries-deployer/pom.xml?rev=923794&r1=923793&r2=923794&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/aries/aries-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/aries/aries-deployer/pom.xml Tue Mar 16 15:05:52 2010
@@ -55,6 +55,12 @@
         </dependency>
 
         <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-aries-resolver</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+        <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint</artifactId>
         </dependency>
@@ -68,12 +74,7 @@
             <groupId>org.apache.aries.application</groupId>
             <artifactId>org.apache.aries.application.management</artifactId>
         </dependency>
-<!--
-        <dependency>
-            <groupId>org.apache.aries.application</groupId>
-            <artifactId>org.apache.aries.application.resolver.obr</artifactId>
-        </dependency>
--->
+
     </dependencies>
 
     <build>
@@ -82,7 +83,7 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <category>Geronimo Core</category>
+                    <category>Aries</category>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/trunk/plugins/aries/aries-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/aries-deployer/src/main/history/dependencies.xml?rev=923794&r1=923793&r2=923794&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/aries/aries-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/aries/aries-deployer/src/main/history/dependencies.xml Tue Mar 16 15:05:52 2010
@@ -98,6 +98,11 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-aries-resolver</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>geronimo-aries-shell</artifactId>
         <type>jar</type>
     </dependency>

Modified: geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/ApplicationGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/ApplicationGBean.java?rev=923794&r1=923793&r2=923794&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/ApplicationGBean.java (original)
+++ geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/ApplicationGBean.java Tue Mar 16 15:05:52 2010
@@ -37,6 +37,7 @@ import org.apache.geronimo.gbean.annotat
 import org.apache.geronimo.gbean.annotation.ParamSpecial;
 import org.apache.geronimo.gbean.annotation.SpecialAttributeType;
 import org.apache.geronimo.kernel.Kernel;
+import org.apache.geronimo.kernel.osgi.BundleUtils;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.BundleException;
@@ -199,8 +200,8 @@ public class ApplicationGBean implements
         List<Bundle> bundlesWeStarted = new ArrayList<Bundle>();
         try {
             for (Bundle b : applicationBundles) {
-                if (b.getState() != Bundle.ACTIVE) {
-                    b.start(Bundle.START_ACTIVATION_POLICY);
+                if (BundleUtils.canStart(b)) {
+                    b.start(Bundle.START_TRANSIENT);
                     bundlesWeStarted.add(b);
                 }
             }

Modified: geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/ApplicationInstaller.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/ApplicationInstaller.java?rev=923794&r1=923793&r2=923794&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/ApplicationInstaller.java (original)
+++ geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/ApplicationInstaller.java Tue Mar 16 15:05:52 2010
@@ -117,7 +117,7 @@ public class ApplicationInstaller implem
             context.initializeConfiguration();
                         
             app.store(configDir);
-            
+                        
             AbstractName name = naming.createChildName(moduleName, "AriesApplication", "GBean");
             GBeanData data = new GBeanData(name, ApplicationGBean.class);
             data.setReferencePattern("Installer", abstractName);
@@ -189,16 +189,17 @@ public class ApplicationInstaller implem
         return null;
     }
     
-    private Artifact getConfigId(AriesApplication app) {
-        Artifact configId = 
-            new Artifact("aries-app", 
-                         app.getApplicationMetadata().getApplicationSymbolicName(), 
-                         getVersion(app.getApplicationMetadata().getApplicationVersion()), 
-                         "jar");
-        return configId;
+    private static Artifact getConfigId(AriesApplication app) {
+        return createArtifact("aries-app", 
+                              app.getApplicationMetadata().getApplicationSymbolicName(), 
+                              app.getApplicationMetadata().getApplicationVersion());
+    }
+    
+    private static Artifact createArtifact(String group, String symbolicName, Version version) {
+        return new Artifact(group, symbolicName, getVersion(version), "jar");
     }
     
-    private String getVersion(Version version) {
+    private static String getVersion(Version version) {
         String str = version.getMajor() + "." + version.getMinor() + "." + version.getMinor();
         if (version.getQualifier() != null) {
             str += "-" + version.getQualifier();

Added: geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/GeronimoLocalPlatform.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/GeronimoLocalPlatform.java?rev=923794&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/GeronimoLocalPlatform.java (added)
+++ geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/GeronimoLocalPlatform.java Tue Mar 16 15:05:52 2010
@@ -0,0 +1,40 @@
+/**
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.aries.builder;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.apache.aries.application.management.LocalPlatform;
+
+/**
+ * @version $Rev:385232 $ $Date$
+ */
+public class GeronimoLocalPlatform implements LocalPlatform {
+
+    public File getTemporaryDirectory() throws IOException {
+        File f = File.createTempFile("ebaTmp", null);
+        f.delete();
+        f.mkdir();
+        return f;
+    }
+
+    public File getTemporaryFile() throws IOException {
+        return File.createTempFile("ebaTmp", null);
+    }
+          
+}

Propchange: geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/GeronimoLocalPlatform.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/GeronimoLocalPlatform.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/GeronimoLocalPlatform.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/resources/OSGI-INF/blueprint/app-context-management.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/resources/OSGI-INF/blueprint/app-context-management.xml?rev=923794&r1=923793&r2=923794&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/resources/OSGI-INF/blueprint/app-context-management.xml (original)
+++ geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/resources/OSGI-INF/blueprint/app-context-management.xml Tue Mar 16 15:05:52 2010
@@ -23,15 +23,9 @@
     <property name="bundleContext" ref="blueprintBundleContext"/>
   </bean>
   <service interface="org.apache.aries.application.management.AriesApplicationContextManager" ref="app-context-manager" />
-  
-  
-  <bean id="default-local-platform" class="org.apache.aries.application.utils.management.DefaultLocalPlatform"/>
+    
+  <bean id="default-local-platform" class="org.apache.geronimo.aries.builder.GeronimoLocalPlatform"/>
   <service interface="org.apache.aries.application.management.LocalPlatform" 
            ref="default-local-platform" />
-  
-  <bean id="no-op-resolver" class="org.apache.aries.application.utils.management.NoOpResolver"/>
-  <service interface="org.apache.aries.application.management.AriesApplicationResolver" 
-            ref="no-op-resolver"
-            ranking="-1"/>
- 
+   
 </blueprint>

Added: geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/CapabilityImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/CapabilityImpl.java?rev=923794&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/CapabilityImpl.java (added)
+++ geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/CapabilityImpl.java Tue Mar 16 15:05:52 2010
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.apache.aries.application.resolver.obr.impl;
+
+import org.osgi.service.obr.Capability;
+
+import java.util.Map;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class CapabilityImpl implements Capability
+{
+
+  private final String name;
+  private final Map properties;
+
+  public CapabilityImpl(String name, Map properties)
+  {
+    this.name = name;
+    this.properties = properties;
+  }
+
+  public String getName()
+  {
+    return name;
+  }
+
+  public Map getProperties()
+  {
+    return properties;
+  }
+  
+}

Propchange: geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/CapabilityImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/CapabilityImpl.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/CapabilityImpl.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/ResourceImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/ResourceImpl.java?rev=923794&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/ResourceImpl.java (added)
+++ geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/ResourceImpl.java Tue Mar 16 15:05:52 2010
@@ -0,0 +1,113 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.apache.aries.application.resolver.obr.impl;
+
+import org.osgi.framework.Version;
+import org.osgi.service.obr.Capability;
+import org.osgi.service.obr.Repository;
+import org.osgi.service.obr.Requirement;
+import org.osgi.service.obr.Resource;
+
+import java.net.URL;
+import java.util.Map;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class ResourceImpl implements Resource
+{
+
+  private final Map properties;
+  private final String symbolicName;
+  private final String presentationName;
+  private final Version version;
+  private final String id;
+  private final URL url;
+  private final Requirement[] requirements;
+  private final Capability[] capabilities;
+  private final String[] categories;
+  private final Repository repository;
+
+
+  public ResourceImpl(Map properties, String symbolicName, String presentationName, Version version, String id, URL url, Requirement[] requirements, Capability[] capabilities, String[] categories, Repository repository)
+  {
+    this.properties = properties;
+    this.symbolicName = symbolicName;
+    this.presentationName = presentationName;
+    this.version = version;
+    this.id = id;
+    this.url = url;
+    this.requirements = requirements;
+    this.capabilities = capabilities;
+    this.categories = categories;
+    this.repository = repository;
+  }
+
+  public Map getProperties()
+  {
+    return properties;
+  }
+
+  public String getSymbolicName()
+  {
+    return symbolicName;
+  }
+
+  public String getPresentationName()
+  {
+    return presentationName;
+  }
+
+  public Version getVersion()
+  {
+    return version;
+  }
+
+  public String getId()
+  {
+    return id;
+  }
+
+  public URL getURL()
+  {
+    return url;
+  }
+
+  public Requirement[] getRequirements()
+  {
+    return requirements;
+  }
+
+  public Capability[] getCapabilities()
+  {
+    return capabilities;
+  }
+
+  public String[] getCategories()
+  {
+    return categories;
+  }
+
+  public Repository getRepository()
+  {
+    return repository;
+  }
+}

Propchange: geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/ResourceImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/ResourceImpl.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/ResourceImpl.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/pom.xml?rev=923794&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/pom.xml (added)
+++ geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/pom.xml Tue Mar 16 15:05:52 2010
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>aries</artifactId>
+        <version>3.0-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.modules</groupId>
+    <artifactId>geronimo-aries-resolver</artifactId>
+    <packaging>bundle</packaging>
+    <name>Geronimo Plugins, Aries :: OBR Resolver</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.aries.application</groupId>
+            <artifactId>org.apache.aries.application.api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.aries.application</groupId>
+            <artifactId>org.apache.aries.application.utils</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.bundlerepository</artifactId>
+            <version>1.5.0-SNAPSHOT</version>
+        </dependency>
+
+    </dependencies>
+
+</project>

Propchange: geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/org/apache/geronimo/aries/resolver/GeronimoOBRResolver.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/org/apache/geronimo/aries/resolver/GeronimoOBRResolver.java?rev=923794&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/org/apache/geronimo/aries/resolver/GeronimoOBRResolver.java (added)
+++ geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/org/apache/geronimo/aries/resolver/GeronimoOBRResolver.java Tue Mar 16 15:05:52 2010
@@ -0,0 +1,198 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.geronimo.aries.resolver;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+
+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.AriesApplicationResolver;
+import org.apache.aries.application.management.BundleInfo;
+import org.apache.aries.application.management.ResolveConstraint;
+import org.apache.aries.application.management.ResolverException;
+import org.apache.aries.application.utils.manifest.ManifestHeaderProcessor;
+import org.apache.felix.bundlerepository.Reason;
+import org.apache.felix.bundlerepository.Repository;
+import org.apache.felix.bundlerepository.RepositoryAdmin;
+import org.apache.felix.bundlerepository.Resolver;
+import org.apache.felix.bundlerepository.Resource;
+import org.apache.geronimo.aries.resolver.generator.RepositoryDescriptorGenerator;
+import org.apache.geronimo.aries.resolver.impl.ApplicationResourceImpl;
+import org.apache.geronimo.aries.resolver.impl.OBRBundleInfo;
+import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.framework.Version;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class GeronimoOBRResolver implements AriesApplicationResolver {
+    private static Logger log = LoggerFactory.getLogger(GeronimoOBRResolver.class);
+
+    private final RepositoryAdmin repositoryAdmin;
+    private boolean includeOptional = true;
+
+    public GeronimoOBRResolver(RepositoryAdmin repositoryAdmin) {
+        this.repositoryAdmin = repositoryAdmin;
+    }
+
+    public void setIncludeOptional(boolean includeOptional) {
+        this.includeOptional = includeOptional;
+    }
+
+    public Set<BundleInfo> resolve(AriesApplication app, ResolveConstraint... constraints)
+            throws ResolverException {
+        log.trace("resolving {}", app);
+
+        ApplicationMetadata appMeta = app.getApplicationMetadata();
+
+        String appName = appMeta.getApplicationSymbolicName();
+        Version appVersion = appMeta.getApplicationVersion();
+        List<Content> appContent = appMeta.getApplicationContents();
+
+        Repository appRepository = null;
+
+        try {
+            Document doc = RepositoryDescriptorGenerator.generateRepositoryDescriptor(appName + "_"
+                                                                                      + appVersion,
+                    app.getBundleInfo());
+
+            File f = File.createTempFile(appName + "_" + appVersion, "repository.xml");
+            TransformerFactory.newInstance().newTransformer().transform(new DOMSource(doc),
+                    new StreamResult(f));
+
+            appRepository = repositoryAdmin.repository(f.toURI().toURL());
+
+            f.delete();
+        } catch (Exception e) {
+            throw new ResolverException(e);
+        }
+
+        List<Repository> appRepositories = new ArrayList<Repository>();
+        
+        // add system & local repositories
+        appRepositories.add(repositoryAdmin.getSystemRepository());
+        appRepositories.add(repositoryAdmin.getLocalRepository());
+        
+        // add application repository
+        appRepositories.add(appRepository);
+        
+        // add user repositories
+        Repository[] userRepositories = repositoryAdmin.listRepositories();
+        for (Repository userRepository : userRepositories) {
+            appRepositories.add(userRepository);
+        }
+        
+        Resolver obrResolver = repositoryAdmin.resolver(appRepositories.toArray(new Repository[appRepositories.size()]));
+
+        // add a resource describing the requirements of the application metadata.
+        try {
+            obrResolver.add(new ApplicationResourceImpl(repositoryAdmin, appName, appVersion, appContent));
+        } catch (InvalidSyntaxException e) {
+            throw new ResolverException(e); 
+        }
+
+        if (obrResolver.resolve()) {
+            Set<BundleInfo> result = new HashSet<BundleInfo>();
+            for (Resource resource : obrResolver.getRequiredResources()) {
+                BundleInfo bundleInfo = toBundleInfo(resource, false);
+                result.add(bundleInfo);
+            }
+            if (includeOptional) {
+                for (Resource resource : obrResolver.getOptionalResources()) {
+                    BundleInfo bundleInfo = toBundleInfo(resource, true);
+                    result.add(bundleInfo);
+                }
+            }
+            return result;
+        } else {
+            throw new ResolverException("Could not resolve requirements: "
+                                        + getUnsatisfiedRequirements(obrResolver));
+        }
+
+    }
+
+    public BundleInfo getBundleInfo(String bundleSymbolicName, Version bundleVersion) {
+        Map<String, String> attribs = new HashMap<String, String>();
+        attribs.put(Resource.VERSION, bundleVersion.toString());
+        String filterString = ManifestHeaderProcessor.generateFilter(Resource.SYMBOLIC_NAME,
+                bundleSymbolicName, attribs);
+        Resource[] resources;
+        try {
+            resources = repositoryAdmin.discoverResources(filterString);
+        } catch (InvalidSyntaxException e) {
+            throw new RuntimeException("Unexpected exception", e);
+        }
+        if (resources != null && resources.length > 0) {
+            return toBundleInfo(resources[0], false);
+        } else {
+            return null;
+        }
+    }
+
+    private String getUnsatisfiedRequirements(Resolver resolver) {
+        Reason[] reasons = resolver.getUnsatisfiedRequirements();
+        if (reasons != null) {
+            StringBuilder sb = new StringBuilder();
+            for (int reqIdx = 0; reqIdx < reasons.length; reqIdx++) {
+                sb.append("   " + reasons[reqIdx].getRequirement().getFilter()).append("\n");
+                Resource resource = reasons[reqIdx].getResource();
+                if (resource != null) {
+                    sb.append("      " + resource.getPresentationName()).append("\n");
+                }
+            }
+            return sb.toString();
+        }
+        return null;
+    }
+
+    private BundleInfo toBundleInfo(Resource resource, boolean optional) {
+        Map<String, String> directives = null;
+        if (optional) {
+            directives = new HashMap<String, String>();
+            directives.put("resolution", "optional");
+        }
+        String location = resource.getURI();        
+        return new OBRBundleInfo(resource.getSymbolicName(), 
+                                 resource.getVersion(), 
+                                 location, 
+                                 null,
+                                 null, 
+                                 null, 
+                                 null, 
+                                 null, 
+                                 null, 
+                                 directives, 
+                                 null);
+    }
+}
\ No newline at end of file

Propchange: geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/org/apache/geronimo/aries/resolver/GeronimoOBRResolver.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/org/apache/geronimo/aries/resolver/GeronimoOBRResolver.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/org/apache/geronimo/aries/resolver/GeronimoOBRResolver.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/org/apache/geronimo/aries/resolver/generator/RepositoryDescriptorGenerator.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/org/apache/geronimo/aries/resolver/generator/RepositoryDescriptorGenerator.java?rev=923794&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/org/apache/geronimo/aries/resolver/generator/RepositoryDescriptorGenerator.java (added)
+++ geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/org/apache/geronimo/aries/resolver/generator/RepositoryDescriptorGenerator.java Tue Mar 16 15:05:52 2010
@@ -0,0 +1,171 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.geronimo.aries.resolver.generator;
+
+import java.util.Map;
+import java.util.Set;
+
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.apache.aries.application.Content;
+import org.apache.aries.application.management.BundleInfo;
+import org.apache.aries.application.utils.manifest.ManifestHeaderProcessor;
+import org.apache.felix.bundlerepository.Resource;
+import org.osgi.framework.Constants;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+public final class RepositoryDescriptorGenerator {
+    
+    public static Document generateRepositoryDescriptor(String name, 
+                                                        Set<BundleInfo> bundles)
+            throws ParserConfigurationException {
+        Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
+        Element root = doc.createElement("repository");
+
+        root.setAttribute("name", name);
+        doc.appendChild(root);
+
+        for (BundleInfo info : bundles) {
+            Element resource = doc.createElement("resource");
+            resource.setAttribute(Resource.VERSION, info.getVersion().toString());
+            resource.setAttribute("uri", info.getLocation());
+            resource.setAttribute(Resource.SYMBOLIC_NAME, info.getSymbolicName());
+            resource.setAttribute(Resource.PRESENTATION_NAME, info.getHeaders().get(
+                    Constants.BUNDLE_NAME));
+            resource.setAttribute(Resource.ID, info.getSymbolicName() + "/" + info.getVersion());
+            root.appendChild(resource);
+
+            addBundleCapability(doc, resource, info);
+
+            for (Content p : info.getExportPackage()) {
+                addPackageCapability(doc, resource, info, p);
+            }
+
+            for (Content p : info.getImportPackage()) {
+                addPackageRequirement(doc, resource, info, p);
+            }
+
+            for (Content p : info.getRequireBundle()) {
+                addBundleRequirement(doc, resource, info, p);
+            }
+        }
+
+        return doc;
+    }
+
+    private static void addBundleRequirement(Document doc,
+                                             Element resource,
+                                             BundleInfo info,
+                                             Content p) {
+        Element requirement = doc.createElement("require");
+        requirement.setAttribute("name", "bundle");
+
+        requirement.setAttribute("extend", "false");
+        requirement.setAttribute("multiple", "false");
+        requirement.setAttribute("optional", "false");
+
+        requirement.setAttribute("filter", ManifestHeaderProcessor.generateFilter("bundle", p
+                .getContentName(), p.getAttributes()));
+
+        resource.appendChild(requirement);
+    }
+
+    private static void addPackageRequirement(Document doc,
+                                              Element resource,
+                                              BundleInfo info,
+                                              Content p) {
+        Element requirement = doc.createElement("require");
+        requirement.setAttribute("name", "package");
+
+        requirement.setAttribute("extend", "false");
+        requirement.setAttribute("multiple", "false");
+
+        String optional = p.getDirective("optional");
+        if (optional == null)
+            optional = "false";
+
+        requirement.setAttribute("optional", optional);
+
+        requirement.setAttribute("filter", ManifestHeaderProcessor.generateFilter("package", p
+                .getContentName(), p.getAttributes()));
+
+        resource.appendChild(requirement);
+    }
+
+    private static void addPackageCapability(Document doc,
+                                             Element resource,
+                                             BundleInfo info,
+                                             Content p) {
+        Element capability = doc.createElement("capability");
+        capability.setAttribute("name", "package");
+        resource.appendChild(capability);
+
+        addProperty(doc, capability, "package", p.getContentName(), null);
+        addProperty(doc, capability, Constants.VERSION_ATTRIBUTE, p.getVersion().toString(),
+                "version");
+        addProperty(doc, capability, Constants.BUNDLE_SYMBOLICNAME_ATTRIBUTE, info
+                .getSymbolicName(), null);
+        addProperty(doc, capability, Constants.BUNDLE_VERSION_ATTRIBUTE, info.getVersion()
+                .toString(), "version");
+
+        for (Map.Entry<String, String> entry : p.getAttributes().entrySet()) {
+            if (!!!Constants.VERSION_ATTRIBUTE.equals(entry.getKey())) {
+                addProperty(doc, capability, entry.getKey(), entry.getValue(), null);
+            }
+        }
+
+        String mandatory = p.getDirective(Constants.MANDATORY_DIRECTIVE);
+        if (mandatory == null)
+            mandatory = "";
+        addProperty(doc, capability, Constants.MANDATORY_DIRECTIVE, mandatory, "set");
+    }
+
+    private static void addBundleCapability(Document doc, Element resource, BundleInfo info) {
+        Element capability = doc.createElement("capability");
+        capability.setAttribute("name", "bundle");
+        resource.appendChild(capability);
+
+        addProperty(doc, capability, Resource.SYMBOLIC_NAME, info.getSymbolicName(), null);
+        addProperty(doc, capability, Constants.VERSION_ATTRIBUTE, info.getVersion().toString(),
+                "version");
+        addProperty(doc, capability, Resource.PRESENTATION_NAME, info.getHeaders().get(
+                Constants.BUNDLE_NAME), null);
+        addProperty(doc, capability, Constants.BUNDLE_MANIFESTVERSION, "2", "version");
+        addProperty(doc, capability, Constants.FRAGMENT_ATTACHMENT_DIRECTIVE, info
+                .getBundleDirectives().get(Constants.FRAGMENT_ATTACHMENT_DIRECTIVE), null);
+        addProperty(doc, capability, Constants.SINGLETON_DIRECTIVE, info.getBundleDirectives().get(
+                Constants.SINGLETON_DIRECTIVE), null);
+    }
+
+    private static void addProperty(Document doc,
+                                    Element capability,
+                                    String name,
+                                    String value,
+                                    String type) {
+        Element p = doc.createElement("p");
+        p.setAttribute("n", name);
+        p.setAttribute("v", value);
+        if (type != null)
+            p.setAttribute("t", type);
+        capability.appendChild(p);
+    }
+}
\ No newline at end of file

Propchange: geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/org/apache/geronimo/aries/resolver/generator/RepositoryDescriptorGenerator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/org/apache/geronimo/aries/resolver/generator/RepositoryDescriptorGenerator.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/org/apache/geronimo/aries/resolver/generator/RepositoryDescriptorGenerator.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/org/apache/geronimo/aries/resolver/impl/ApplicationResourceImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/org/apache/geronimo/aries/resolver/impl/ApplicationResourceImpl.java?rev=923794&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/org/apache/geronimo/aries/resolver/impl/ApplicationResourceImpl.java (added)
+++ geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/org/apache/geronimo/aries/resolver/impl/ApplicationResourceImpl.java Tue Mar 16 15:05:52 2010
@@ -0,0 +1,109 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.geronimo.aries.resolver.impl;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.aries.application.Content;
+import org.apache.aries.application.utils.manifest.ManifestHeaderProcessor;
+import org.apache.felix.bundlerepository.Capability;
+import org.apache.felix.bundlerepository.Repository;
+import org.apache.felix.bundlerepository.RepositoryAdmin;
+import org.apache.felix.bundlerepository.Requirement;
+import org.apache.felix.bundlerepository.Resource;
+import org.osgi.framework.Filter;
+import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.framework.Version;
+
+public class ApplicationResourceImpl implements Resource {
+    
+    private String _symbolicName;
+    private Version _version;
+    private Requirement[] _requirements;
+
+    public ApplicationResourceImpl(RepositoryAdmin repositoryAdmin,
+                                   String appName, 
+                                   Version appVersion, 
+                                   List<Content> appContent) throws InvalidSyntaxException {
+        _symbolicName = appName;
+        _version = appVersion;
+
+        _requirements = new Requirement[appContent.size()];
+        for (int i = 0; i < _requirements.length; i++) {
+            Content c = appContent.get(i);
+
+            String comment = "Requires " + Resource.SYMBOLIC_NAME + " " + c.getContentName()
+                             + " with attributes " + c.getAttributes();
+
+            String resolution = c.getDirective("resolution");
+
+            boolean optional = Boolean.valueOf(resolution);
+
+            String f = ManifestHeaderProcessor.generateFilter(Resource.SYMBOLIC_NAME, c.getContentName(), c.getAttributes());
+            Filter filter = repositoryAdmin.filter(f);
+            _requirements[i] = new RequirementImpl("bundle", filter, false, optional, false, comment);
+        }
+    }
+
+    public Capability[] getCapabilities() {
+        return null;
+    }
+
+    public String[] getCategories() {
+        return null;
+    }
+
+    public String getId() {
+        return _symbolicName;
+    }
+
+    public String getPresentationName() {
+        return _symbolicName;
+    }
+
+    public Map getProperties() {
+        return null;
+    }
+
+    public Repository getRepository() {
+        return null;
+    }
+
+    public Requirement[] getRequirements() {
+        return _requirements;
+    }
+
+    public String getSymbolicName() {
+        return _symbolicName;
+    }
+
+    public String getURI() {
+        return null;
+    }
+
+    public Version getVersion() {
+        return _version;
+    }
+
+    public boolean isLocal() {
+        return false;
+    }
+}

Propchange: geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/org/apache/geronimo/aries/resolver/impl/ApplicationResourceImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/org/apache/geronimo/aries/resolver/impl/ApplicationResourceImpl.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/org/apache/geronimo/aries/resolver/impl/ApplicationResourceImpl.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/org/apache/geronimo/aries/resolver/impl/MapToDictionary.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/org/apache/geronimo/aries/resolver/impl/MapToDictionary.java?rev=923794&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/org/apache/geronimo/aries/resolver/impl/MapToDictionary.java (added)
+++ geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/org/apache/geronimo/aries/resolver/impl/MapToDictionary.java Tue Mar 16 15:05:52 2010
@@ -0,0 +1,108 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.geronimo.aries.resolver.impl;
+
+import java.util.Dictionary;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.Map;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class MapToDictionary extends Dictionary {
+    /**
+     * Map source.
+     */
+    private final Map m_map;
+
+    public MapToDictionary(Map map) {
+        m_map = map;
+    }
+
+    public Enumeration elements() {
+        if (m_map == null) {
+            return null;
+        }
+        return new IteratorToEnumeration(m_map.values().iterator());
+    }
+
+    public Object get(Object key) {
+        if (m_map == null) {
+            return null;
+        }
+        return m_map.get(key);
+    }
+
+    public boolean isEmpty() {
+        if (m_map == null) {
+            return true;
+        }
+        return m_map.isEmpty();
+    }
+
+    public Enumeration keys() {
+        if (m_map == null) {
+            return null;
+        }
+        return new IteratorToEnumeration(m_map.keySet().iterator());
+    }
+
+    public Object put(Object key, Object value) {
+        throw new UnsupportedOperationException();
+    }
+
+    public Object remove(Object key) {
+        throw new UnsupportedOperationException();
+    }
+
+    public int size() {
+        if (m_map == null) {
+            return 0;
+        }
+        return m_map.size();
+    }
+
+    @Override
+    public String toString() {
+        return m_map != null ? m_map.toString() : "null";
+    }
+
+    private static class IteratorToEnumeration implements Enumeration {
+        private final Iterator m_iter;
+
+        public IteratorToEnumeration(Iterator iter) {
+            m_iter = iter;
+        }
+
+        public boolean hasMoreElements() {
+            if (m_iter == null)
+                return false;
+            return m_iter.hasNext();
+        }
+
+        public Object nextElement() {
+            if (m_iter == null)
+                return null;
+            return m_iter.next();
+        }
+    }
+
+}

Propchange: geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/org/apache/geronimo/aries/resolver/impl/MapToDictionary.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/org/apache/geronimo/aries/resolver/impl/MapToDictionary.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/org/apache/geronimo/aries/resolver/impl/MapToDictionary.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/org/apache/geronimo/aries/resolver/impl/OBRBundleInfo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/org/apache/geronimo/aries/resolver/impl/OBRBundleInfo.java?rev=923794&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/org/apache/geronimo/aries/resolver/impl/OBRBundleInfo.java (added)
+++ geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/org/apache/geronimo/aries/resolver/impl/OBRBundleInfo.java Tue Mar 16 15:05:52 2010
@@ -0,0 +1,139 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.geronimo.aries.resolver.impl;
+
+import org.apache.aries.application.Content;
+import org.apache.aries.application.management.BundleInfo;
+import org.osgi.framework.Version;
+
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class OBRBundleInfo implements BundleInfo {
+
+    private final String symbolicName;
+    private final Version version;
+    private final String location;
+    private final Set<Content> importPackage;
+    private final Set<Content> exportPackage;
+    private final Set<Content> importService;
+    private final Set<Content> exportService;
+    private final Map<String, String> headers;
+    private final Set<Content> requireBundle;
+    private final Map<String, String> attributes;
+    private final Map<String, String> directives;
+
+    public OBRBundleInfo(String symbolicName,
+                         Version version,
+                         String location,
+                         Set<Content> importPackage,
+                         Set<Content> exportPackage,
+                         Set<Content> importService,
+                         Set<Content> exportService,
+                         Set<Content> requireBundle,
+                         Map<String, String> attributes,
+                         Map<String, String> directives,
+                         Map<String, String> headers) {
+        this.symbolicName = symbolicName;
+        this.version = version;
+        this.location = location;
+        this.importPackage = importPackage;
+        this.exportPackage = exportPackage;
+        this.importService = importService;
+        this.exportService = exportService;
+        this.headers = headers;
+        this.requireBundle = requireBundle;
+        this.attributes = attributes;
+        this.directives = directives;
+    }
+
+    public String getSymbolicName() {
+        return symbolicName;
+    }
+
+    public Version getVersion() {
+        return version;
+    }
+
+    public String getLocation() {
+        return location;
+    }
+
+    public Set<Content> getImportPackage() {
+        return importPackage;
+    }
+
+    public Set<Content> getExportPackage() {
+        return exportPackage;
+    }
+
+    public Set<Content> getImportService() {
+        return importService;
+    }
+
+    public Set<Content> getExportService() {
+        return exportService;
+    }
+
+    public Map<String, String> getHeaders() {
+        return headers;
+    }
+
+    public Map<String, String> getBundleAttributes() {
+        return attributes;
+    }
+
+    public Map<String, String> getBundleDirectives() {
+        return directives;
+    }
+
+    public Set<Content> getRequireBundle() {
+        return requireBundle;
+    }
+
+    /**
+     * Equality is just based on the location. If you install a bundle from the
+     * same location string you get the same Bundle, even if the underlying
+     * bundle had a different symbolic name/version. This seems reasonable and
+     * quick.
+     */
+    public boolean equals(Object other) {
+        if (other == null)
+            return false;
+        if (other == this)
+            return true;
+        if (other instanceof OBRBundleInfo) {
+            return location.equals(((OBRBundleInfo) other).location);
+        }
+
+        return false;
+    }
+
+    public int hashCode() {
+        return location.hashCode();
+    }
+
+    public String toString() {
+        return symbolicName + "_" + version;
+    }
+}
\ No newline at end of file

Propchange: geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/org/apache/geronimo/aries/resolver/impl/OBRBundleInfo.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/org/apache/geronimo/aries/resolver/impl/OBRBundleInfo.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/org/apache/geronimo/aries/resolver/impl/OBRBundleInfo.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/org/apache/geronimo/aries/resolver/impl/RequirementImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/org/apache/geronimo/aries/resolver/impl/RequirementImpl.java?rev=923794&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/org/apache/geronimo/aries/resolver/impl/RequirementImpl.java (added)
+++ geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/org/apache/geronimo/aries/resolver/impl/RequirementImpl.java Tue Mar 16 15:05:52 2010
@@ -0,0 +1,79 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.geronimo.aries.resolver.impl;
+
+import org.apache.felix.bundlerepository.Capability;
+import org.apache.felix.bundlerepository.Requirement;
+import org.osgi.framework.Filter;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class RequirementImpl implements Requirement {
+    
+    private final String name;
+    private final Filter filter;
+    private final boolean multiple;
+    private final boolean optional;
+    private final boolean extend;
+    private final String comment;
+
+    public RequirementImpl(String name,
+                           Filter filter,
+                           boolean multiple,
+                           boolean optional,
+                           boolean extend,
+                           String comment) {
+        this.name = name;
+        this.filter = filter;
+        this.multiple = multiple;
+        this.optional = optional;
+        this.extend = extend;
+        this.comment = comment;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getFilter() {
+        return filter.toString();
+    }
+
+    public boolean isMultiple() {
+        return multiple;
+    }
+
+    public boolean isOptional() {
+        return optional;
+    }
+
+    public boolean isExtend() {
+        return extend;
+    }
+
+    public String getComment() {
+        return comment;
+    }
+
+    public boolean isSatisfied(Capability capability) {
+        return filter.match(new MapToDictionary(capability.getProperties()));
+    }
+}

Propchange: geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/org/apache/geronimo/aries/resolver/impl/RequirementImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/org/apache/geronimo/aries/resolver/impl/RequirementImpl.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/java/org/apache/geronimo/aries/resolver/impl/RequirementImpl.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/resources/OSGI-INF/blueprint/obr-resolver.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/resources/OSGI-INF/blueprint/obr-resolver.xml?rev=923794&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/resources/OSGI-INF/blueprint/obr-resolver.xml (added)
+++ geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/resources/OSGI-INF/blueprint/obr-resolver.xml Tue Mar 16 15:05:52 2010
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<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">
+
+    <bean id="obr-resolver" class="org.apache.geronimo.aries.resolver.GeronimoOBRResolver" scope="singleton"
+          activation="eager">
+        <argument>
+            <reference interface="org.apache.felix.bundlerepository.RepositoryAdmin"/>
+        </argument>
+        <property name="includeOptional" value="false"/>
+    </bean>
+
+    <service interface="org.apache.aries.application.management.AriesApplicationResolver" ref="obr-resolver"/>
+
+</blueprint>

Propchange: geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/resources/OSGI-INF/blueprint/obr-resolver.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/resources/OSGI-INF/blueprint/obr-resolver.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/aries/geronimo-aries-resolver/src/main/resources/OSGI-INF/blueprint/obr-resolver.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/server/trunk/plugins/aries/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/pom.xml?rev=923794&r1=923793&r2=923794&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/aries/pom.xml (original)
+++ geronimo/server/trunk/plugins/aries/pom.xml Tue Mar 16 15:05:52 2010
@@ -38,6 +38,7 @@
     
     <modules>
         <module>geronimo-aries-builder</module>
+        <module>geronimo-aries-resolver</module>
         <module>geronimo-aries-shell</module>
         <module>aries-deployer</module>
     </modules>
@@ -59,11 +60,6 @@
                 <artifactId>org.apache.aries.application.management</artifactId>
                 <version>0.1-incubating-SNAPSHOT</version>
             </dependency>
-            <dependency>
-                <groupId>org.apache.aries.application</groupId>
-                <artifactId>org.apache.aries.application.resolver.obr</artifactId>
-                <version>0.1-incubating-SNAPSHOT</version>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 

Modified: geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml?rev=923794&r1=923793&r2=923794&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml Tue Mar 16 15:05:52 2010
@@ -47,11 +47,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>org.apache.felix.bundlerepository</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.bundles</groupId>
         <artifactId>backport-util-concurrent</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/history/dependencies.xml?rev=923794&r1=923793&r2=923794&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/history/dependencies.xml Tue Mar 16 15:05:52 2010
@@ -7,11 +7,6 @@
         <type>car</type>
     </module-id>
     <dependency>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>org.apache.felix.bundlerepository</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>j2ee-deployer</artifactId>
         <type>car</type>

Modified: geronimo/server/trunk/plugins/openjpa2/openjpa2/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa2/openjpa2/src/main/history/dependencies.xml?rev=923794&r1=923793&r2=923794&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa2/openjpa2/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/openjpa2/openjpa2/src/main/history/dependencies.xml Tue Mar 16 15:05:52 2010
@@ -27,11 +27,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>org.apache.felix.bundlerepository</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>transaction-1_6</artifactId>
         <type>car</type>



Mime
View raw message