geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r1221399 - in /geronimo/server/trunk: framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/ framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ framework/modules/geronimo-kernel/s...
Date Tue, 20 Dec 2011 18:05:43 GMT
Author: djencks
Date: Tue Dec 20 18:05:42 2011
New Revision: 1221399

URL: http://svn.apache.org/viewvc?rev=1221399&view=rev
Log:
GERONIMO-6240 make SharedLibExtender not depend on the (now non-service) DependencyManager

Modified:
    geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentConfigurationManager.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ConfigurationManagerGBean.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ConfigurationSource.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/SimpleConfigurationManager.java
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/mock/MockConfigurationManager.java
    geronimo/server/trunk/plugins/sharedlib/geronimo-sharedlib/pom.xml
    geronimo/server/trunk/plugins/sharedlib/geronimo-sharedlib/src/main/java/org/apache/geronimo/system/sharedlib/SharedLibExtender.java
    geronimo/server/trunk/plugins/sharedlib/pom.xml
    geronimo/server/trunk/plugins/sharedlib/sharedlib-extender/pom.xml
    geronimo/server/trunk/plugins/sharedlib/sharedlib-extender/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/sharedlib/sharedlib/pom.xml
    geronimo/server/trunk/plugins/sharedlib/sharedlib/src/main/history/dependencies.xml

Modified: geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentConfigurationManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentConfigurationManager.java?rev=1221399&r1=1221398&r2=1221399&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentConfigurationManager.java
(original)
+++ geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentConfigurationManager.java
Tue Dec 20 18:05:42 2011
@@ -96,6 +96,7 @@ public class DeploymentConfigurationMana
         return configurationManager.isConfiguration(artifact) || super.isConfiguration(artifact);
     }
 
+    @Override
     public synchronized Configuration getConfiguration(Artifact configurationId) {
         Configuration configuration = configurationManager.getConfiguration(configurationId);
         if (configuration == null) {
@@ -105,6 +106,15 @@ public class DeploymentConfigurationMana
     }
 
     @Override
+    public synchronized Configuration getConfiguration(long bundleId) {
+        Configuration configuration = configurationManager.getConfiguration(bundleId);
+        if (configuration == null) {
+            configuration = super.getConfiguration(bundleId);
+        }
+        return configuration;
+    }
+
+    @Override
     public Bundle getBundle(Artifact id) {
         Bundle bundle = configurationManager.getBundle(id);
         if (bundle == null) {

Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ConfigurationManagerGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ConfigurationManagerGBean.java?rev=1221399&r1=1221398&r2=1221399&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ConfigurationManagerGBean.java
(original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ConfigurationManagerGBean.java
Tue Dec 20 18:05:42 2011
@@ -246,4 +246,9 @@ public class ConfigurationManagerGBean e
     public Configuration getConfiguration(Artifact configurationId) {
         return get().getConfiguration(configurationId);
     }
+
+    @Override
+    public Configuration getConfiguration(long bundleId) {
+        return get().getConfiguration(bundleId);
+    }
 }

Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ConfigurationSource.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ConfigurationSource.java?rev=1221399&r1=1221398&r2=1221399&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ConfigurationSource.java
(original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ConfigurationSource.java
Tue Dec 20 18:05:42 2011
@@ -37,4 +37,6 @@ public interface ConfigurationSource {
      */
     Configuration getConfiguration(Artifact configurationId);
 
+    Configuration getConfiguration(long bundleId);
+
 }

Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/SimpleConfigurationManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/SimpleConfigurationManager.java?rev=1221399&r1=1221398&r2=1221399&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/SimpleConfigurationManager.java
(original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/SimpleConfigurationManager.java
Tue Dec 20 18:05:42 2011
@@ -79,6 +79,7 @@ public class SimpleConfigurationManager 
     protected final Collection<DeploymentWatcher> watchers = new LinkedHashSet<DeploymentWatcher>();
 
     protected final Map<Artifact, Configuration> configurations = new LinkedHashMap<Artifact,
Configuration>();
+    protected final Map<Long, Configuration> configurationsByID = new LinkedHashMap<Long,
Configuration>();
     protected final Map<Artifact, Bundle> bundles = new LinkedHashMap<Artifact,
Bundle>();
 
     protected BundleContext bundleContext;
@@ -342,6 +343,11 @@ public class SimpleConfigurationManager 
         }
     }
 
+    @Override
+    public Configuration getConfiguration(long bundleId) {
+        return configurationsByID.get(bundleId);
+    }
+
     public Bundle getBundle(Artifact id) {
         if (!id.isResolved()) {
             throw new IllegalArgumentException("Artifact " + id + " is not fully resolved");
@@ -554,6 +560,7 @@ public class SimpleConfigurationManager 
                 getConfigurationIds(getLoadParents(configuration)),
                 getConfigurationIds(getStartParents(configuration)));
         configurations.put(configuration.getId(), configuration);
+        configurationsByID.put(configuration.getBundle().getBundleId(), configuration);
     }
 
     protected LinkedHashSet<Configuration> getLoadParents(Configuration configuration)
throws NoSuchConfigException {
@@ -567,12 +574,18 @@ public class SimpleConfigurationManager 
         for (Configuration childConfiguration : configuration.getChildren()) {
             ConfigurationSource childSource = new ConfigurationSource() {
 
+                @Override
                 public Configuration getConfiguration(Artifact configurationId) {
                     if (configurationId.equals(configuration.getId())) {
                         return configuration;
                     }
                     return configurationSource.getConfiguration(configurationId);
                 }
+
+                @Override
+                public Configuration getConfiguration(long bundleId) {
+                    return configurationSource.getConfiguration(bundleId);
+                }
             };
             getLoadParentsInternal(childConfiguration, parents, childSource);
             // remove this configuration from the parent Ids since it will cause an infinite
loop
@@ -597,6 +610,11 @@ public class SimpleConfigurationManager 
                     }
                     return configurationSource.getConfiguration(configurationId);
                 }
+
+                @Override
+                public Configuration getConfiguration(long bundleId) {
+                    return configurationSource.getConfiguration(bundleId);
+                }
             };
             getStartParentsInternal(childConfiguration, parents, childSource);
             // remove this configuration from the parent Ids since it will cause an infinite
loop
@@ -962,7 +980,11 @@ public class SimpleConfigurationManager 
         if (configurationModel.containsConfiguration(configurationId)) {
             configurationModel.removeConfiguration(configurationId);
         }
-        configurations.remove(configurationId);
+        Configuration conf = configurations.remove(configurationId);
+        if (conf != null) {
+            configurationsByID.remove(conf.getBundle().getBundleId());
+
+        }
     }
 
     protected void unload(Configuration configuration) {

Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/mock/MockConfigurationManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/mock/MockConfigurationManager.java?rev=1221399&r1=1221398&r2=1221399&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/mock/MockConfigurationManager.java
(original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/mock/MockConfigurationManager.java
Tue Dec 20 18:05:42 2011
@@ -107,6 +107,11 @@ public class MockConfigurationManager im
         return configurations.get(configurationId);
     }
 
+    @Override
+    public Configuration getConfiguration(long bundleId) {
+        return null;
+    }
+
     public LifecycleResults loadConfiguration(Artifact configurationId) throws NoSuchConfigException,
LifecycleException {
         return null;
     }

Modified: geronimo/server/trunk/plugins/sharedlib/geronimo-sharedlib/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/sharedlib/geronimo-sharedlib/pom.xml?rev=1221399&r1=1221398&r2=1221399&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/sharedlib/geronimo-sharedlib/pom.xml (original)
+++ geronimo/server/trunk/plugins/sharedlib/geronimo-sharedlib/pom.xml Tue Dec 20 18:05:42
2011
@@ -35,6 +35,11 @@
 
     <dependencies>
         <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.scr.annotations</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-system</artifactId>
             <version>${project.version}</version>
@@ -46,6 +51,16 @@
             <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
-    </dependencies>    
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-scr-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
 

Modified: geronimo/server/trunk/plugins/sharedlib/geronimo-sharedlib/src/main/java/org/apache/geronimo/system/sharedlib/SharedLibExtender.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/sharedlib/geronimo-sharedlib/src/main/java/org/apache/geronimo/system/sharedlib/SharedLibExtender.java?rev=1221399&r1=1221398&r2=1221399&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/sharedlib/geronimo-sharedlib/src/main/java/org/apache/geronimo/system/sharedlib/SharedLibExtender.java
(original)
+++ geronimo/server/trunk/plugins/sharedlib/geronimo-sharedlib/src/main/java/org/apache/geronimo/system/sharedlib/SharedLibExtender.java
Tue Dec 20 18:05:42 2011
@@ -24,18 +24,17 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.locks.ReentrantLock;
 
-import org.apache.geronimo.gbean.GBeanLifecycle;
-import org.apache.geronimo.gbean.annotation.GBean;
-import org.apache.geronimo.gbean.annotation.OsgiService;
-import org.apache.geronimo.gbean.annotation.ParamReference;
-import org.apache.geronimo.gbean.annotation.ParamSpecial;
-import org.apache.geronimo.gbean.annotation.SpecialAttributeType;
+import org.apache.felix.scr.annotations.Activate;
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Deactivate;
+import org.apache.felix.scr.annotations.Reference;
+import org.apache.felix.scr.annotations.ReferenceCardinality;
+import org.apache.felix.scr.annotations.Service;
 import org.apache.geronimo.hook.BundleHelper;
 import org.apache.geronimo.hook.SharedLibraryRegistry;
 import org.apache.geronimo.kernel.config.Configuration;
 import org.apache.geronimo.kernel.config.ConfigurationManager;
 import org.apache.geronimo.kernel.repository.Artifact;
-import org.apache.geronimo.system.configuration.DependencyManager;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.BundleEvent;
@@ -46,16 +45,15 @@ import org.slf4j.LoggerFactory;
 /**
  * @version $Rev$ $Date$
  */
-@OsgiService
-@GBean(j2eeType = "ShareLibExtender")
-public class SharedLibExtender implements SynchronousBundleListener, SharedLibraryRegistry,
GBeanLifecycle {
+@Component(immediate = true)
+@Service
+public class SharedLibExtender implements SynchronousBundleListener, SharedLibraryRegistry
{
 
     private static final Logger logger = LoggerFactory.getLogger(SharedLibExtender.class);
 
-    private DependencyManager dependencyManager;
-
     private BundleContext bundleContext;
 
+    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     private ConfigurationManager configurationManager;
 
     private Map<Artifact, List<Bundle>> configruationSharedLibBundlesMap = new
ConcurrentHashMap<Artifact, List<Bundle>>();
@@ -64,14 +62,37 @@ public class SharedLibExtender implement
 
     private final ReentrantLock registerLock = new ReentrantLock();
 
-    public SharedLibExtender(@ParamSpecial(type = SpecialAttributeType.bundleContext) BundleContext
bundleContext,
-            @ParamReference(name = "DependencyManager") DependencyManager dependencyManager,
-            @ParamReference(name = "ConfigurationManager", namingType = "ConfigurationManager")
ConfigurationManager configurationManager) {
-        this.dependencyManager = dependencyManager;
-        this.bundleContext = bundleContext;
+//    public SharedLibExtender(@ParamSpecial(type = SpecialAttributeType.bundleContext) BundleContext
bundleContext,
+//            @ParamReference(name = "DependencyManager") DependencyManager dependencyManager,
+//            @ParamReference(name = "ConfigurationManager", namingType = "ConfigurationManager")
ConfigurationManager configurationManager) {
+//        this.bundleContext = bundleContext;
+//        this.configurationManager = configurationManager;
+//    }
+    
+    public void setConfigurationManager(ConfigurationManager configurationManager) {
         this.configurationManager = configurationManager;
     }
 
+    public void unsetConfigurationManager(ConfigurationManager configurationManager) {
+        if (this.configurationManager == configurationManager) {
+            this.configurationManager = null;
+        }
+    }
+    
+    @Activate
+    public void activate(BundleContext bundleContext) throws Exception {
+        this.bundleContext = bundleContext;
+        bundleContext.addBundleListener(this);
+        BundleHelper.setSharedLibraryRegistry(this);
+    }
+
+    @Deactivate
+    public void deactivate() throws Exception {
+        bundleContext.removeBundleListener(this);
+        this.bundleContext = null;
+        BundleHelper.setSharedLibraryRegistry(null);
+    }
+
     @Override
     public void bundleChanged(BundleEvent event) {
         if (event.getType() == BundleEvent.STARTED) {
@@ -100,17 +121,10 @@ public class SharedLibExtender implement
     }
 
     private void installSharedLibs(Bundle appBundle) {
-        Artifact artifact = dependencyManager.getArtifact(appBundle.getBundleId());
-        if (artifact == null) {
-            if (logger.isDebugEnabled()) {
-                logger.debug("Unable to recongnize the artifact id for the bundle " + appBundle.getSymbolicName());
-            }
-            return;
-        }
-        if (!configurationManager.isConfiguration(artifact)) {
+        Configuration configuration = configurationManager.getConfiguration(appBundle.getBundleId());
+        if (configuration == null) {
             return;
         }
-        Configuration configuration = configurationManager.getConfiguration(artifact);
         List<Bundle> dependentSharedLibBundles = new ArrayList<Bundle>();
         for (Artifact parentArtifact : configuration.getDependencyNode().getParents()) {
             List<Bundle> sharedLibBundles = configruationSharedLibBundlesMap.get(parentArtifact);
@@ -150,23 +164,4 @@ public class SharedLibExtender implement
         }
     }
 
-    @Override
-    public void doStart() throws Exception {
-        bundleContext.addBundleListener(this);
-        BundleHelper.setSharedLibraryRegistry(this);
-    }
-
-    @Override
-    public void doStop() throws Exception {
-        bundleContext.removeBundleListener(this);
-        BundleHelper.setSharedLibraryRegistry(null);
-    }
-
-    @Override
-    public void doFail() {
-        try {
-            doStop();
-        } catch (Exception e) {
-        }
-    }
 }

Modified: geronimo/server/trunk/plugins/sharedlib/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/sharedlib/pom.xml?rev=1221399&r1=1221398&r2=1221399&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/sharedlib/pom.xml (original)
+++ geronimo/server/trunk/plugins/sharedlib/pom.xml Tue Dec 20 18:05:42 2011
@@ -39,7 +39,7 @@
     <modules>
         <module>geronimo-sharedlib</module>
         <module>sharedlib</module>
-        <module>sharedlib-extender</module>
+        <!--<module>sharedlib-extender</module>-->
     </modules>
 
 </project>

Modified: geronimo/server/trunk/plugins/sharedlib/sharedlib-extender/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/sharedlib/sharedlib-extender/pom.xml?rev=1221399&r1=1221398&r2=1221399&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/sharedlib/sharedlib-extender/pom.xml (original)
+++ geronimo/server/trunk/plugins/sharedlib/sharedlib-extender/pom.xml Tue Dec 20 18:05:42
2011
@@ -63,12 +63,24 @@
             <version>${project.version}</version>
             <type>kar</type>
         </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.framework.features</groupId>
+            <artifactId>org.apache.geronimo.javaee-specs</artifactId>
+            <version>${project.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-sharedlib</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-hook</artifactId>
+            <version>${project.version}</version>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>

Modified: geronimo/server/trunk/plugins/sharedlib/sharedlib-extender/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/sharedlib/sharedlib-extender/src/main/history/dependencies.xml?rev=1221399&r1=1221398&r2=1221399&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/sharedlib/sharedlib-extender/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/sharedlib/sharedlib-extender/src/main/history/dependencies.xml
Tue Dec 20 18:05:42 2011
@@ -7,43 +7,28 @@
         <type>car</type>
     </module-id>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-cli</artifactId>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>org.apache.felix.bundlerepository</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>rmi-naming</artifactId>
-        <type>car</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-sharedlib</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-osgi-registry</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.servicemix.bundles</groupId>
-        <artifactId>org.apache.servicemix.bundles.xpp3</artifactId>
+        <artifactId>geronimo-cli</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.xbean</groupId>
-        <artifactId>xbean-bundleutils</artifactId>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-hook</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.xbean</groupId>
-        <artifactId>xbean-finder</artifactId>
-        <type>jar</type>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>rmi-naming</artifactId>
+        <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.xbean</groupId>
-        <artifactId>xbean-reflect</artifactId>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-sharedlib</artifactId>
         <type>jar</type>
     </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/sharedlib/sharedlib/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/sharedlib/sharedlib/pom.xml?rev=1221399&r1=1221398&r2=1221399&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/sharedlib/sharedlib/pom.xml (original)
+++ geronimo/server/trunk/plugins/sharedlib/sharedlib/pom.xml Tue Dec 20 18:05:42 2011
@@ -63,13 +63,24 @@
             <version>${project.version}</version>
             <type>kar</type>
         </dependency>
+
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>sharedlib-extender</artifactId>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-sharedlib</artifactId>
             <version>${project.version}</version>
-            <type>car</type>
         </dependency>
         
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-hook</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>j2ee-system</artifactId>
+            <version>${project.version}</version>
+            <type>car</type>
+        </dependency>
     </dependencies>
 
     <build>

Modified: geronimo/server/trunk/plugins/sharedlib/sharedlib/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/sharedlib/sharedlib/src/main/history/dependencies.xml?rev=1221399&r1=1221398&r2=1221399&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/sharedlib/sharedlib/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/sharedlib/sharedlib/src/main/history/dependencies.xml Tue
Dec 20 18:05:42 2011
@@ -7,8 +7,23 @@
         <type>car</type>
     </module-id>
     <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>sharedlib-extender</artifactId>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-cli</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-hook</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>j2ee-system</artifactId>
         <type>car</type>
     </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-sharedlib</artifactId>
+        <type>jar</type>
+    </dependency>
 </plugin-artifact>



Mime
View raw message