geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r821961 [30/30] - in /geronimo/sandbox/djencks/osgi/framework: ./ buildsupport/ buildsupport/car-maven-plugin/ buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ buildsupport/geronimo-maven-plugin/src/main/jav...
Date Mon, 05 Oct 2009 18:54:56 GMT
Copied: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi/BootActivator.java
(from r817123, geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/osgi/KernelActivator.java)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi/BootActivator.java?p2=geronimo/sandbox/djencks/osgi/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi/BootActivator.java&p1=geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/osgi/KernelActivator.java&r1=817123&r2=821961&rev=821961&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/osgi/KernelActivator.java
(original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi/BootActivator.java
Mon Oct  5 18:54:50 2009
@@ -18,31 +18,160 @@
  */
 
 
-package org.apache.geronimo.kernel.osgi;
+package org.apache.geronimo.system.osgi;
 
 import java.util.Dictionary;
+import java.util.Set;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.LinkedHashSet;
+import java.net.URL;
+import java.io.InputStream;
+import java.io.IOException;
 
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.KernelFactory;
+import org.apache.geronimo.kernel.osgi.ConfigurationActivator;
+import org.apache.geronimo.kernel.repository.Artifact;
+import org.apache.geronimo.kernel.config.ConfigurationData;
+import org.apache.geronimo.kernel.config.ConfigurationUtil;
+import org.apache.geronimo.kernel.config.PersistentConfigurationList;
+import org.apache.geronimo.kernel.config.ConfigurationManager;
+import org.apache.geronimo.kernel.config.InvalidConfigException;
+import org.apache.geronimo.kernel.config.DebugLoggingLifecycleMonitor;
+import org.apache.geronimo.kernel.config.LifecycleMonitor;
+import org.apache.geronimo.gbean.AbstractName;
+import org.apache.geronimo.gbean.AbstractNameQuery;
+import org.apache.geronimo.system.main.StartupMonitor;
+import org.apache.geronimo.system.main.LongStartupMonitor;
+import org.apache.geronimo.system.main.ServerStatus;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.ServiceReference;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @version $Rev$ $Date$
  */
-public class KernelActivator implements BundleActivator {
+public class BootActivator implements BundleActivator {
+
+    private static final Logger log = LoggerFactory.getLogger(BootActivator.class);
 
     private ServiceRegistration kernelRegistration;
+    private BundleActivator configurationActivator;
 
     public void start(BundleContext bundleContext) throws Exception {
-        Kernel kernel = KernelFactory.newInstance(bundleContext).createKernel("geronimo");
-        kernel.boot();
-        Dictionary dictionary = null;//new Hashtable();
-        kernelRegistration = bundleContext.registerService(Kernel.class.getName(), kernel,
dictionary);
+        if (bundleContext.getServiceReference(Kernel.class.getName()) == null) {
+            StartupMonitor monitor = new LongStartupMonitor();
+            monitor.systemStarting(System.currentTimeMillis());
+            Kernel kernel = KernelFactory.newInstance(bundleContext).createKernel("geronimo");
+            kernel.boot();
+            monitor.systemStarted(kernel);
+            Dictionary dictionary = null;//new Hashtable();
+            kernelRegistration = bundleContext.registerService(Kernel.class.getName(), kernel,
dictionary);
+            //boot the root configuration
+            Bundle bundle = bundleContext.getBundle();
+            URL plan = bundle.getEntry("META-INF/config.ser");
+            InputStream in = plan.openStream();
+            try {
+                //TODO there are additional consistency checks in RepositoryConfigurationStore
that we should use.
+                ConfigurationData data = ConfigurationUtil.readConfigurationData(in);
+                data.setBundleContext(bundleContext);
+                AbstractName name = ConfigurationUtil.loadBootstrapConfiguration(kernel,
data, bundleContext, false);
+//                Artifact id = data.getId();
+//                manager.startConfiguration(id);
+            } finally {
+                in.close();
+            }
+
+            List<Artifact> configs = new ArrayList<Artifact>();
+            AbstractNameQuery query = new AbstractNameQuery(PersistentConfigurationList.class.getName());
+
+//        if (configs.isEmpty()) {
+            // --override wasn't used (nothing explicit), see what was running before
+            Set<AbstractName> configLists = kernel.listGBeans(query);
+            for (AbstractName configListName : configLists) {
+                try {
+                    configs.addAll((List<Artifact>) kernel.invoke(configListName, "restore"));
+                } catch (IOException e) {
+                    System.err.println("Unable to restore last known configurations");
+                    e.printStackTrace();
+//                    shutdownKernel();
+                    return;
+                }
+            }
+//        }
+            LifecycleMonitor lifecycleMonitor = new DebugLoggingLifecycleMonitor(log);
+
+            monitor.foundModules(configs.toArray(new Artifact[configs.size()]));
+
+            // load the rest of the configurations
+            try {
+                ConfigurationManager configurationManager = ConfigurationUtil.getConfigurationManager(kernel);
+                try {
+                    List<Artifact> unloadedConfigs = new ArrayList<Artifact>(configs);
+                    int unloadedConfigsCount;
+                    do {
+                        unloadedConfigsCount = unloadedConfigs.size();
+                        LinkedHashSet<Artifact> sorted = configurationManager.sort(unloadedConfigs,
lifecycleMonitor);
+                        for (Artifact configID : sorted) {
+                            monitor.moduleLoading(configID);
+                            configurationManager.loadConfiguration(configID, lifecycleMonitor);
+                            unloadedConfigs.remove(configID);
+                            monitor.moduleLoaded(configID);
+                            monitor.moduleStarting(configID);
+                            configurationManager.startConfiguration(configID, lifecycleMonitor);
+                            monitor.moduleStarted(configID);
+                        }
+                    } while (unloadedConfigsCount > unloadedConfigs.size());
+                    if (!unloadedConfigs.isEmpty()) {
+                        throw new InvalidConfigException("Could not locate configs to start:
" + unloadedConfigs);
+                    }
+                    // the server has finished loading the persistent configuration so inform
the gbean
+                    AbstractNameQuery startedQuery = new AbstractNameQuery(ServerStatus.class.getName());
+                    Set<AbstractName> statusBeans = kernel.listGBeans(startedQuery);
+                    for (AbstractName statusName : statusBeans) {
+                        ServerStatus status = (ServerStatus) kernel.getGBean(statusName);
+                        if (status != null) {
+                            status.setServerStarted(true);
+                        }
+                    }
+                } finally {
+                    ConfigurationUtil.releaseConfigurationManager(kernel, configurationManager);
+                }
+            } catch (Exception e) {
+                //Exception caught when starting configurations, starting kernel shutdown
+                monitor.serverStartFailed(e);
+//            shutdownKernel();
+                return;
+            }
+
+            // Tell every persistent configuration list that the kernel is now fully started
+            configLists = kernel.listGBeans(query);
+            for (AbstractName configListName : configLists) {
+                kernel.setAttribute(configListName, "kernelFullyStarted", Boolean.TRUE);
+            }
+
+            // Startup sequence is finished
+            monitor.startupFinished();
+        } else {
+            configurationActivator = new ConfigurationActivator();
+            configurationActivator.start(bundleContext);
+        }
+
     }
 
     public void stop(BundleContext bundleContext) throws Exception {
-        kernelRegistration.unregister();
+        if (configurationActivator == null) {
+            Kernel kernel = (Kernel) bundleContext.getService(kernelRegistration.getReference());
+            kernel.shutdown();
+            kernelRegistration.unregister();
+            kernelRegistration = null;
+        } else {
+            configurationActivator.stop(bundleContext);
+        }
     }
-}
+}
\ No newline at end of file

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/serverinfo/BasicServerInfo.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/serverinfo/BasicServerInfo.java?rev=821961&r1=821960&r2=821961&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/serverinfo/BasicServerInfo.java
(original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/serverinfo/BasicServerInfo.java
Mon Oct  5 18:54:50 2009
@@ -19,9 +19,17 @@
 
 import java.io.File;
 import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.net.JarURLConnection;
 
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.gbean.annotation.GBean;
+import org.apache.geronimo.gbean.annotation.ParamAttribute;
+import org.apache.geronimo.gbean.annotation.ParamSpecial;
+import org.apache.geronimo.gbean.annotation.SpecialAttributeType;
+import org.osgi.framework.BundleContext;
 
 /**
  * Contains information about the server and functions for resolving
@@ -29,6 +37,8 @@
  *
  * @version $Rev$ $Date$
  */
+
+@GBean
 public class BasicServerInfo implements ServerInfo {
     public static final String SERVER_NAME_SYS_PROP = "org.apache.geronimo.server.name";
     public static final String SERVER_DIR_SYS_PROP = "org.apache.geronimo.server.dir";
@@ -49,10 +59,16 @@
     }
 
     public BasicServerInfo(String defaultBaseDirectory) throws Exception {
-        this(defaultBaseDirectory, true);
+        this(defaultBaseDirectory, true, null);
     }
-
+    
     public BasicServerInfo(String defaultBaseDirectory, boolean useSystemProperties) throws
Exception {
+        this(defaultBaseDirectory, useSystemProperties, null);
+    }
+
+    public BasicServerInfo(@ParamAttribute(name = "baseDirectory")String defaultBaseDirectory,
+                           @ParamAttribute(name="useSystemProperties") boolean useSystemProperties,
+                           @ParamSpecial(type = SpecialAttributeType.bundleContext) BundleContext
bundleContext) throws Exception {
         // Before we try the persistent value, we always check the
         // system properties first.  This lets an admin override this
         // on the command line.
@@ -62,10 +78,55 @@
         ServerConstants.getVersion();
 
         if (baseDirectory == null || baseDirectory.length() == 0) {
-            base = DirectoryUtils.getGeronimoInstallDirectory();
-            if (base == null) {
-                throw new IllegalArgumentException("Could not determine geronimo installation
directory");
+            String karafHome = System.getProperty("karaf.home");
+            if (karafHome == null) {
+                throw new IllegalStateException("NO karaf.home specified");
             }
+            this.base = new File(karafHome);
+//            if (bundleContext == null) {
+//                throw new IllegalArgumentException("No bundleContext, and no way to determine
server location from system properties or explicitly");
+//            }
+//            URL url = bundleContext.getBundle().getResource("META-INF/config.ser");
+//            if (url != null) {
+//                try {
+//                    JarURLConnection jarConnection = (JarURLConnection) url.openConnection();
+//                    url = jarConnection.getJarFileURL();
+//
+//                    URI baseURI = url.toURI();
+//                    while (!baseURI.getPath().endsWith("respository")) {
+//                        baseURI = baseURI.resolve("..");
+//                    }
+//                    base = new File(baseURI);
+//                } catch (Exception ignored) {
+//                    throw new RuntimeException("Error while determining the installation
directory of Apache Geronimo", ignored);
+//                }
+//            } else {
+////                log.error("Cound not determine the installation directory of Apache Geronimo,
because the startup jar could not be found in the current class loader.");
+//                base = new File(".");
+//            }
+//            File b = null;
+//            try {
+//                String bundleLocation = bundleContext.getBundle().getLocation();
+//                URI uri = new URI(bundleLocation);
+//                while(!"file".equalsIgnoreCase(uri.getScheme()) && uri.getScheme()
!= null) {
+//                    uri = new URI(uri.getSchemeSpecificPart());
+//                }
+////            bundleLocation = bundleLocation.substring(bundleLocation.lastIndexOf("file://")
+ 7);
+//                b = new File(uri);
+//                boolean foundRepoString = false;
+//                while (!foundRepoString) {
+//                    foundRepoString = b.getPath().endsWith("repository");
+//                    b = b.getParentFile();
+//                }
+//            } catch (Throwable e) {
+//                e.printStackTrace();
+//                b = new File(".").getAbsoluteFile();
+//            }
+//            base = b;
+//            base = DirectoryUtils.getGeronimoInstallDirectory();
+//            if (base == null) {
+//                throw new IllegalArgumentException("Could not determine geronimo installation
directory");
+//            }
         } else {
             base = new File(baseDirectory);
         }
@@ -199,21 +260,4 @@
         return baseServerDir;
     }
     
-    public static final GBeanInfo GBEAN_INFO;
-
-    static {
-        GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic(BasicServerInfo.class);
-
-        infoFactory.addAttribute("baseDirectory", String.class, true);
-
-        infoFactory.addInterface(ServerInfo.class);
-
-        infoFactory.setConstructor(new String[]{"baseDirectory"});
-
-        GBEAN_INFO = infoFactory.getBeanInfo();
-    }
-
-    public static GBeanInfo getGBeanInfo() {
-        return GBEAN_INFO;
-    }
 }

Modified: geronimo/sandbox/djencks/osgi/framework/modules/testsupport-common/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/testsupport-common/pom.xml?rev=821961&r1=821960&r2=821961&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/testsupport-common/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/testsupport-common/pom.xml Mon Oct  5
18:54:50 2009
@@ -60,8 +60,8 @@
         </dependency>
         
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+            <groupId>org.apache.servicemix.specs</groupId>
+            <artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.exam</groupId>

Modified: geronimo/sandbox/djencks/osgi/framework/plugingroups/framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/plugingroups/framework/pom.xml?rev=821961&r1=821960&r2=821961&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/plugingroups/framework/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/plugingroups/framework/pom.xml Mon Oct  5 18:54:50
2009
@@ -37,24 +37,24 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-boilerplate</artifactId>
+            <artifactId>karaf-framework</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>gshell-framework</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.framework</groupId>-->
+            <!--<artifactId>gshell-framework</artifactId>-->
+            <!--<version>${version}</version>-->
+            <!--<type>car</type>-->
+        <!--</dependency>-->
 
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>gshell-geronimo</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.framework</groupId>-->
+            <!--<artifactId>gshell-geronimo</artifactId>-->
+            <!--<version>${version}</version>-->
+            <!--<type>car</type>-->
+        <!--</dependency>-->
 
         <!--
         HACK: This should really only be included in the full assemblies, but due
@@ -64,12 +64,12 @@
               the entires to be different for assembly types.
         -->
 
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>gshell-remote</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.framework</groupId>-->
+            <!--<artifactId>gshell-remote</artifactId>-->
+            <!--<version>${version}</version>-->
+            <!--<type>car</type>-->
+        <!--</dependency>-->
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>

Modified: geronimo/sandbox/djencks/osgi/framework/plugingroups/framework/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/plugingroups/framework/src/main/history/dependencies.xml?rev=821961&r1=821960&r2=821961&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/plugingroups/framework/src/main/history/dependencies.xml
(original)
+++ geronimo/sandbox/djencks/osgi/framework/plugingroups/framework/src/main/history/dependencies.xml
Mon Oct  5 18:54:50 2009
@@ -13,37 +13,22 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-boilerplate</artifactId>
-        <type>car</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>gshell-framework</artifactId>
-        <type>car</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>gshell-geronimo</artifactId>
-        <type>car</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>gshell-remote</artifactId>
+        <artifactId>j2ee-security</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>j2ee-security</artifactId>
+        <artifactId>j2ee-system</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>j2ee-system</artifactId>
+        <artifactId>jsr88-cli</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>jsr88-cli</artifactId>
+        <artifactId>karaf-framework</artifactId>
         <type>car</type>
     </dependency>
     <dependency>

Modified: geronimo/sandbox/djencks/osgi/framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/pom.xml?rev=821961&r1=821960&r2=821961&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/pom.xml Mon Oct  5 18:54:50 2009
@@ -18,10 +18,11 @@
 
 <!-- $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">
-    
+<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</groupId>
         <artifactId>geronimo</artifactId>
@@ -102,26 +103,6 @@
                 </exclusions>
             </dependency>
             <dependency>
-                <groupId>org.ops4j.pax.logging</groupId>
-                <artifactId>pax-logging-api</artifactId>
-                <version>1.3.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.logging</groupId>
-                <artifactId>pax-logging-service</artifactId>
-                <version>1.3.0</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>log4j</groupId>
-                        <artifactId>log4j</artifactId>
-                    </exclusion>
-                    <!--<exclusion>-->
-                        <!--<groupId>javax</groupId>-->
-                        <!--<artifactId>jms</artifactId>-->
-                    <!--</exclusion>-->
-                </exclusions>
-            </dependency>
-            <dependency>
                 <groupId>org.ops4j.pax.url</groupId>
                 <artifactId>pax-url-mvn</artifactId>
                 <version>1.0.0</version>
@@ -137,6 +118,21 @@
             <!-- bundleized jars -->
             <dependency>
                 <groupId>org.apache.geronimo.bundles</groupId>
+                <artifactId>asm</artifactId>
+                <version>3.1_1-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.bundles</groupId>
+                <artifactId>asm-commons</artifactId>
+                <version>3.1_1-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.bundles</groupId>
+                <artifactId>commons-cli</artifactId>
+                <version>1.0_1-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.bundles</groupId>
                 <artifactId>slf4j</artifactId>
                 <version>1.5.5_1-SNAPSHOT</version>
             </dependency>
@@ -155,10 +151,41 @@
                 <artifactId>sxc-runtime</artifactId>
                 <version>0.7.2_1-SNAPSHOT</version>
             </dependency>
+            <!--<dependency>-->
+                <!--<groupId>org.apache.geronimo.bundles</groupId>-->
+                <!--<artifactId>plexus-utils</artifactId>-->
+                <!--<version>1.5.15_1-SNAPSHOT</version>-->
+            <!--</dependency>-->
+
             <dependency>
-                <groupId>org.apache.geronimo.bundles</groupId>
-                <artifactId>plexus-utils</artifactId>
-                <version>1.4.5_1-SNAPSHOT</version>
+                <groupId>org.apache.servicemix.bundles</groupId>
+                <artifactId>org.apache.servicemix.bundles.commons-jexl</artifactId>
+                <version>1.1_2-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.servicemix.bundles</groupId>
+                <artifactId>org.apache.servicemix.bundles.commons-lang</artifactId>
+                <version>2.4_2-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.servicemix.bundles</groupId>
+                <artifactId>org.apache.servicemix.bundles.cglib</artifactId>
+                <version>2.1_3_3-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.servicemix.bundles</groupId>
+                <artifactId>org.apache.servicemix.bundles.jaxb-impl</artifactId>
+                <version>2.1.6_1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.servicemix.bundles</groupId>
+                <artifactId>org.apache.servicemix.bundles.jline</artifactId>
+                <version>0.9.94_2-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.servicemix.bundles</groupId>
+                <artifactId>org.apache.servicemix.bundles.woodstox</artifactId>
+                <version>3.2.8_1-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.servicemix.bundles</groupId>
@@ -170,11 +197,40 @@
                 <artifactId>org.apache.servicemix.bundles.xmlresolver</artifactId>
                 <version>1.2_2-SNAPSHOT</version>
             </dependency>
+
+
             <dependency>
                 <groupId>org.apache.servicemix.bundles</groupId>
-                <artifactId>org.apache.servicemix.bundles.jline</artifactId>
-                <version>0.9.94_2-SNAPSHOT</version>
+                <artifactId>org.apache.servicemix.bundles.xpp3</artifactId>
+                <version>1.1.4c_2-SNAPSHOT</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.servicemix.bundles</groupId>
+                <artifactId>org.apache.servicemix.bundles.xstream</artifactId>
+                <version>1.3_2-SNAPSHOT</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.servicemix.specs</groupId>
+                <artifactId>org.apache.servicemix.specs.activation-api-1.1</artifactId>
+                <version>1.4-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.servicemix.specs</groupId>
+                <artifactId>org.apache.servicemix.specs.jaxb-api-2.1</artifactId>
+                <version>1.2.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.servicemix.specs</groupId>
+                <artifactId>org.apache.servicemix.specs.saaj-api-1.3</artifactId>
+                <version>1.3.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.servicemix.specs</groupId>
+                <artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
+                <version>1.3.0</version>
+            </dependency>
+
             <!-- updated specs -->
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
@@ -186,7 +242,12 @@
             <dependency>
                 <groupId>org.apache.maven</groupId>
                 <artifactId>maven-core</artifactId>
-                <version>2.0.9</version>
+                <version>2.2.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.codehaus.plexus</groupId>
+                <artifactId>plexus-io</artifactId>
+                <version>1.0-alpha-3</version>
             </dependency>
 
 
@@ -198,27 +259,27 @@
                 <plugin>
                     <groupId>org.apache.felix</groupId>
                     <artifactId>maven-bundle-plugin</artifactId>
-                    <version>2.0.1-SNAPSHOT</version>
+                    <version>2.0.1</version>
                     <!--<configuration>-->
-                        <!--<instructions>-->
-                            <!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
-                        <!--</instructions>-->
+                    <!--<instructions>-->
+                    <!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
+                    <!--</instructions>-->
                     <!--</configuration>-->
                 </plugin>
 
             </plugins>
         </pluginManagement>
     </build>
-    
+
     <!--<dependencies>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.testsupport</groupId>-->
-            <!--<artifactId>testsupport-common</artifactId>-->
-            <!--<version>${version}</version>-->
-            <!--<scope>test</scope>-->
-        <!--</dependency>-->
+    <!--<dependency>-->
+    <!--<groupId>org.apache.geronimo.testsupport</groupId>-->
+    <!--<artifactId>testsupport-common</artifactId>-->
+    <!--<version>${version}</version>-->
+    <!--<scope>test</scope>-->
+    <!--</dependency>-->
     <!--</dependencies>-->
-    
+
     <profiles>
         <profile>
             <id>default</id>



Mime
View raw message