geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r918544 - in /geronimo/server/trunk/framework: configs/client-system/src/main/history/ configs/geronimo-gbean-deployer-bootstrap/src/main/history/ configs/geronimo-gbean-deployer/src/main/history/ configs/gshell-geronimo/src/main/history/ c...
Date Wed, 03 Mar 2010 16:20:02 GMT
Author: gawor
Date: Wed Mar  3 16:20:01 2010
New Revision: 918544

URL: http://svn.apache.org/viewvc?rev=918544&view=rev
Log:
GERONIMO-5165: Litte extender that scans for META-INF/services/java.sql.Driver resources and
installs the drivers

Added:
    geronimo/server/trunk/framework/modules/geronimo-jdbc/src/main/java/org/apache/geronimo/jdbc/DatabaseDriverExtender.java
  (with props)
Modified:
    geronimo/server/trunk/framework/configs/client-system/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/gshell-geronimo/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/online-deployer/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/modules/geronimo-jdbc/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-jdbc/src/main/java/org/apache/geronimo/jdbc/DelegatingDriver.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-main/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-obr/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-pax-logging/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-shell-base/pom.xml
    geronimo/server/trunk/framework/modules/pom.xml
    geronimo/server/trunk/framework/modules/testsupport-common/pom.xml

Modified: geronimo/server/trunk/framework/configs/client-system/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/client-system/src/main/history/dependencies.xml?rev=918544&r1=918543&r2=918544&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/client-system/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/framework/configs/client-system/src/main/history/dependencies.xml
Wed Mar  3 16:20:01 2010
@@ -32,11 +32,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>org.osgi.core</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/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml?rev=918544&r1=918543&r2=918544&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml
Wed Mar  3 16:20:01 2010
@@ -22,11 +22,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>org.osgi.core</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/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=918544&r1=918543&r2=918544&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
Wed Mar  3 16:20:01 2010
@@ -12,11 +12,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>org.osgi.core</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/gshell-geronimo/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/gshell-geronimo/src/main/history/dependencies.xml?rev=918544&r1=918543&r2=918544&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/gshell-geronimo/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/framework/configs/gshell-geronimo/src/main/history/dependencies.xml
Wed Mar  3 16:20:01 2010
@@ -37,11 +37,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>org.osgi.core</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/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml?rev=918544&r1=918543&r2=918544&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
Wed Mar  3 16:20:01 2010
@@ -32,11 +32,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>org.osgi.core</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.bundles</groupId>
         <artifactId>sxc-jaxb</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml?rev=918544&r1=918543&r2=918544&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml Wed
Mar  3 16:20:01 2010
@@ -27,11 +27,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>org.osgi.core</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/jsr88-deploymentfactory/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/history/dependencies.xml?rev=918544&r1=918543&r2=918544&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/history/dependencies.xml
Wed Mar  3 16:20:01 2010
@@ -22,11 +22,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>org.osgi.core</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/online-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/online-deployer/src/main/history/dependencies.xml?rev=918544&r1=918543&r2=918544&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/online-deployer/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/framework/configs/online-deployer/src/main/history/dependencies.xml
Wed Mar  3 16:20:01 2010
@@ -27,11 +27,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>org.osgi.core</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/shutdown/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml?rev=918544&r1=918543&r2=918544&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml Wed
Mar  3 16:20:01 2010
@@ -27,11 +27,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>org.osgi.core</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-cli</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/framework/modules/geronimo-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-jdbc/pom.xml?rev=918544&r1=918543&r2=918544&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-jdbc/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-jdbc/pom.xml Wed Mar  3 16:20:01 2010
@@ -34,5 +34,26 @@
     
     <description>Database driver that delegates to a DataSource from jndi.</description>
 
+    <dependencies>
+        <dependency>
+            <groupId>org.ops4j.pax.logging</groupId>
+            <artifactId>pax-logging-api</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-Activator>org.apache.geronimo.jdbc.DatabaseDriverExtender</Bundle-Activator>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
 

Added: geronimo/server/trunk/framework/modules/geronimo-jdbc/src/main/java/org/apache/geronimo/jdbc/DatabaseDriverExtender.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-jdbc/src/main/java/org/apache/geronimo/jdbc/DatabaseDriverExtender.java?rev=918544&view=auto
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-jdbc/src/main/java/org/apache/geronimo/jdbc/DatabaseDriverExtender.java
(added)
+++ geronimo/server/trunk/framework/modules/geronimo-jdbc/src/main/java/org/apache/geronimo/jdbc/DatabaseDriverExtender.java
Wed Mar  3 16:20:01 2010
@@ -0,0 +1,118 @@
+/*
+ * 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.jdbc;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.sql.Driver;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleEvent;
+import org.osgi.util.tracker.BundleTracker;
+import org.osgi.util.tracker.BundleTrackerCustomizer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class DatabaseDriverExtender implements BundleActivator {
+
+    private static final Logger LOG = LoggerFactory.getLogger(DatabaseDriverExtender.class);
+    
+    private BundleTracker tracker;
+    
+    public void start(BundleContext context) throws Exception {
+        tracker = new BundleTracker(context, Bundle.ACTIVE, new DriverBundleTrackerCustomizer());
+        tracker.open();
+    }
+
+    public void stop(BundleContext context) throws Exception {
+        tracker.close();        
+    }
+
+    private static List<Driver> loadDrivers(Bundle bundle, URL providerURL) {
+        List<Driver> drivers = new ArrayList<Driver>();
+        
+        try {
+            BufferedReader in = new BufferedReader(new InputStreamReader(providerURL.openStream()));
+            String line;
+            while ( (line = in.readLine()) != null) {
+                line = line.trim();
+
+                try {
+                    Class driverClass = bundle.loadClass(line);
+                    drivers.add( (Driver) driverClass.newInstance());
+                } catch (Exception e) {
+                    LOG.warn("Failed to load driver {}", line, e);
+                }
+                
+            }
+        } catch (IOException e) {
+            // ignore - shouldn't happen
+            LOG.warn("Error reading {} service file", providerURL);
+        }
+        
+        return drivers;
+    }
+    
+    private static void register(List<Driver> drivers) {
+        for (Driver driver : drivers) {
+            DelegatingDriver.registerDriver(driver);
+        }
+    }
+    
+    private static void unregister(List<Driver> drivers) {
+        for (Driver driver : drivers) {
+            DelegatingDriver.unregisterDriver(driver);
+        }
+    }
+    
+    private static class DriverBundleTrackerCustomizer implements BundleTrackerCustomizer
{
+
+        public Object addingBundle(Bundle bundle, BundleEvent event) {
+            URL providerURL = bundle.getEntry("META-INF/services/java.sql.Driver");
+            if (providerURL != null) {
+                List<Driver> drivers = loadDrivers(bundle, providerURL);
+                register(drivers);
+                LOG.debug("Registered {} drivers in bundle {}", drivers, bundle);
+                return drivers;
+            }
+            return null;
+        }
+
+        public void modifiedBundle(Bundle bundle, BundleEvent event, Object object) {
+        }
+
+        public void removedBundle(Bundle bundle, BundleEvent event, Object object) {
+            List<Driver> drivers = (List<Driver>) object;
+            unregister(drivers);
+            LOG.debug("Unregistered {} drivers in bundle {}", drivers, bundle);
+        }
+        
+    }
+    
+}

Propchange: geronimo/server/trunk/framework/modules/geronimo-jdbc/src/main/java/org/apache/geronimo/jdbc/DatabaseDriverExtender.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/modules/geronimo-jdbc/src/main/java/org/apache/geronimo/jdbc/DatabaseDriverExtender.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/modules/geronimo-jdbc/src/main/java/org/apache/geronimo/jdbc/DatabaseDriverExtender.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/framework/modules/geronimo-jdbc/src/main/java/org/apache/geronimo/jdbc/DelegatingDriver.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-jdbc/src/main/java/org/apache/geronimo/jdbc/DelegatingDriver.java?rev=918544&r1=918543&r2=918544&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-jdbc/src/main/java/org/apache/geronimo/jdbc/DelegatingDriver.java
(original)
+++ geronimo/server/trunk/framework/modules/geronimo-jdbc/src/main/java/org/apache/geronimo/jdbc/DelegatingDriver.java
Wed Mar  3 16:20:01 2010
@@ -17,12 +17,11 @@
  * under the License.
  */
 
-
 package org.apache.geronimo.jdbc;
 
 import java.util.List;
-import java.util.ArrayList;
 import java.util.Properties;
+import java.util.concurrent.CopyOnWriteArrayList;
 import java.sql.Driver;
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -36,7 +35,7 @@
  */
 public class DelegatingDriver implements Driver {
 
-    private static final List<Driver> DRIVERS = new ArrayList<Driver>();
+    private static final List<Driver> DRIVERS = new CopyOnWriteArrayList<Driver>();
 
     static {
         try {

Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml?rev=918544&r1=918543&r2=918544&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml Wed Mar  3 16:20:01 2010
@@ -41,11 +41,6 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.osgi.core</artifactId>
-        </dependency>
-
-        <dependency>
             <groupId>org.ops4j.pax.logging</groupId>
             <artifactId>pax-logging-api</artifactId>
         </dependency>
@@ -94,31 +89,6 @@
         </dependency>
 
         <dependency>
-            <groupId>org.ops4j.pax.exam</groupId>
-            <artifactId>pax-exam</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.ops4j.pax.exam</groupId>
-            <artifactId>pax-exam-junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.ops4j.pax.exam</groupId>
-            <artifactId>pax-exam-container-default</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.ops4j.pax.exam</groupId>
-            <artifactId>pax-exam-junit-extender-impl</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.ops4j.pax.runner</groupId>
-            <artifactId>pax-runner-no-jcl</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>

Modified: geronimo/server/trunk/framework/modules/geronimo-main/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-main/pom.xml?rev=918544&r1=918543&r2=918544&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-main/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-main/pom.xml Wed Mar  3 16:20:01 2010
@@ -38,16 +38,6 @@
             <artifactId>org.apache.felix.karaf.main</artifactId>
             <scope>provided</scope>
         </dependency>                
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.osgi.core</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.osgi.compendium</artifactId>
-            <scope>provided</scope>
-        </dependency>
     </dependencies>
 
      <build>

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=918544&r1=918543&r2=918544&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-obr/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-obr/pom.xml Wed Mar  3 16:20:01 2010
@@ -49,13 +49,6 @@
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.bundlerepository</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.osgi.compendium</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
     </dependencies>
 
     <build>

Modified: geronimo/server/trunk/framework/modules/geronimo-pax-logging/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-pax-logging/pom.xml?rev=918544&r1=918543&r2=918544&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-pax-logging/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-pax-logging/pom.xml Wed Mar  3 16:20:01
2010
@@ -50,11 +50,6 @@
         </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
-            <artifactId>org.osgi.core</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.configadmin</artifactId>
         </dependency>
     </dependencies>

Modified: geronimo/server/trunk/framework/modules/geronimo-shell-base/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-shell-base/pom.xml?rev=918544&r1=918543&r2=918544&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-shell-base/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-shell-base/pom.xml Wed Mar  3 16:20:01
2010
@@ -37,17 +37,5 @@
             <artifactId>org.apache.felix.karaf.shell.console</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.osgi.core</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.osgi.compendium</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
     </dependencies>
 </project>

Modified: geronimo/server/trunk/framework/modules/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/pom.xml?rev=918544&r1=918543&r2=918544&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/pom.xml Wed Mar  3 16:20:01 2010
@@ -32,6 +32,16 @@
     
     <dependencies>
         <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.osgi.core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.osgi.compendium</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
             <scope>test</scope>
@@ -153,4 +163,4 @@
         </plugins>
     </build>
 
-</project>
\ No newline at end of file
+</project>

Modified: geronimo/server/trunk/framework/modules/testsupport-common/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/testsupport-common/pom.xml?rev=918544&r1=918543&r2=918544&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/testsupport-common/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/testsupport-common/pom.xml Wed Mar  3 16:20:01
2010
@@ -62,11 +62,7 @@
             <groupId>org.ops4j.pax.logging</groupId>
             <artifactId>pax-logging-service</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.osgi.core</artifactId>
-        </dependency>
 
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>



Mime
View raw message