geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r1096949 [2/2] - in /geronimo/server/trunk: ./ framework/buildsupport/car-maven-plugin/ framework/buildsupport/car-maven-plugin/src/main/filtered-resources/ framework/buildsupport/car-maven-plugin/src/main/filtered-resources/resources/ fram...
Date Tue, 26 Apr 2011 23:16:30 GMT
Added: geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ThreadLocalProperties.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ThreadLocalProperties.java?rev=1096949&view=auto
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ThreadLocalProperties.java
(added)
+++ geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ThreadLocalProperties.java
Tue Apr 26 23:16:30 2011
@@ -0,0 +1,207 @@
+/*
+ * 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.mavenplugins.car;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PrintStream;
+import java.io.PrintWriter;
+import java.io.Reader;
+import java.io.Writer;
+import java.lang.Override;
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.InvalidPropertiesFormatException;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+
+/**
+ * @version $Rev:$ $Date:$
+ */
+public class ThreadLocalProperties extends Properties {
+
+    private static Properties defaultProperties;
+    private static int count = 0;
+
+    public static synchronized void install() {
+        if (count ==0) {
+            defaultProperties = System.getProperties();
+            System.setProperties(new ThreadLocalProperties());
+        }
+        count++;
+    }
+
+    public static synchronized void uninstall() {
+        count--;
+        if (count ==0) {
+            System.setProperties(defaultProperties);
+        }
+    }
+
+    private final ThreadLocal<Properties> properties = new InheritableThreadLocal<Properties>()
{
+        @Override
+        protected Properties initialValue() {
+            return new Properties(defaultProperties);
+        }
+    };
+
+    public Properties getProperties() {
+        return properties.get();
+    }
+
+    public int size() {
+        return getProperties().size();
+    }
+
+    public boolean isEmpty() {
+        return getProperties().isEmpty();
+    }
+
+    public Enumeration<Object> keys() {
+        return getProperties().keys();
+    }
+
+    public Enumeration<Object> elements() {
+        return getProperties().elements();
+    }
+
+    public boolean contains(Object o) {
+        return getProperties().contains(o);
+    }
+
+    public boolean containsValue(Object o) {
+        return getProperties().containsValue(o);
+    }
+
+    public boolean containsKey(Object o) {
+        return getProperties().containsKey(o);
+    }
+
+    public Object get(Object o) {
+        return getProperties().get(o);
+    }
+
+    public Object put(Object o, Object o1) {
+        return getProperties().put(o, o1);
+    }
+
+    public Object remove(Object o) {
+        return getProperties().remove(o);
+    }
+
+    public void putAll(Map<? extends Object, ? extends Object> map) {
+        getProperties().putAll(map);
+    }
+
+    public void clear() {
+        getProperties().clear();
+    }
+
+    public Object clone() {
+        return getProperties().clone();
+    }
+
+    public String toString() {
+        return getProperties().toString();
+    }
+
+    public Set<Object> keySet() {
+        return getProperties().keySet();
+    }
+
+    public Set<Map.Entry<Object, Object>> entrySet() {
+        return getProperties().entrySet();
+    }
+
+    public Collection<Object> values() {
+        return getProperties().values();
+    }
+
+    public boolean equals(Object o) {
+        return getProperties().equals(o);
+    }
+
+    public int hashCode() {
+        return getProperties().hashCode();
+    }
+
+    public Object setProperty(String s, String s1) {
+        return getProperties().setProperty(s, s1);
+    }
+
+    public void load(Reader reader) throws IOException {
+        getProperties().load(reader);
+    }
+
+    public void load(InputStream inputStream) throws IOException {
+        getProperties().load(inputStream);
+    }
+
+    public void save(OutputStream outputStream, String s) {
+        getProperties().save(outputStream, s);
+    }
+
+    public void store(Writer writer, String s) throws IOException {
+        getProperties().store(writer, s);
+    }
+
+    public void store(OutputStream outputStream, String s) throws IOException {
+        getProperties().store(outputStream, s);
+    }
+
+    public void loadFromXML(InputStream inputStream) throws IOException, InvalidPropertiesFormatException
{
+        getProperties().loadFromXML(inputStream);
+    }
+
+    public void storeToXML(OutputStream outputStream, String s) throws IOException {
+        getProperties().storeToXML(outputStream, s);
+    }
+
+    public void storeToXML(OutputStream outputStream, String s, String s1) throws IOException
{
+        getProperties().storeToXML(outputStream, s, s1);
+    }
+
+    public String getProperty(String s) {
+        return getProperties().getProperty(s);
+    }
+
+    public String getProperty(String s, String s1) {
+        return getProperties().getProperty(s, s1);
+    }
+
+    public Enumeration<?> propertyNames() {
+        return getProperties().propertyNames();
+    }
+
+    public Set<String> stringPropertyNames() {
+        return getProperties().stringPropertyNames();
+    }
+
+    public void list(PrintStream printStream) {
+        getProperties().list(printStream);
+    }
+
+    public void list(PrintWriter printWriter) {
+        getProperties().list(printWriter);
+    }
+}

Propchange: geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ThreadLocalProperties.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ThreadLocalProperties.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ThreadLocalProperties.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml?rev=1096949&r1=1096948&r2=1096949&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml
(original)
+++ geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml
Tue Apr 26 23:16:30 2011
@@ -45,12 +45,10 @@
                             </process-resources>
                             <compile>
                                 org.apache.geronimo.buildsupport:car-maven-plugin:validate-configuration,
-                                org.apache.geronimo.buildsupport:car-maven-plugin:prepare-plan,
-                                org.apache.geronimo.buildsupport:car-maven-plugin:verify-no-dependency-change,
-                                org.apache.geronimo.buildsupport:car-maven-plugin:prepare-metadata
+                                org.apache.geronimo.buildsupport:car-maven-plugin:prepare-plan
                             </compile>
                             <package>
-                                org.apache.geronimo.buildsupport:car-maven-plugin:package,
+                                org.apache.geronimo.buildsupport:car-maven-plugin:karaf-framework,
                                 org.apache.geronimo.buildsupport:car-maven-plugin:archive-car
                             </package>
                             <install>

Added: geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/test/java/org/apache/geronimo/mavenplugins/car/FrameworkHelperTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/test/java/org/apache/geronimo/mavenplugins/car/FrameworkHelperTest.java?rev=1096949&view=auto
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/test/java/org/apache/geronimo/mavenplugins/car/FrameworkHelperTest.java
(added)
+++ geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/test/java/org/apache/geronimo/mavenplugins/car/FrameworkHelperTest.java
Tue Apr 26 23:16:30 2011
@@ -0,0 +1,46 @@
+/*
+ * 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.mavenplugins.car;
+
+import java.io.File;
+import java.util.Collections;
+
+import org.apache.maven.artifact.Artifact;
+import org.junit.Test;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.launch.Framework;
+
+/**
+ * @version $Rev:$ $Date:$
+ */
+public class FrameworkHelperTest {
+
+    @Test
+    public void testFrameworkHelper() throws Exception {
+        String path = getClass().getProtectionDomain().getCodeSource().getLocation().getFile();
+        File f = new File(new File(path).getParentFile(), "karaf");
+        String karafHome = f.getAbsolutePath();
+        FrameworkHelper fh = new FrameworkHelper(karafHome, null, Collections.<Artifact>emptyList());
+        Framework framework = fh.start();
+        BundleContext bc = framework.getBundleContext();
+        fh.stop();
+    }
+}

Propchange: geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/test/java/org/apache/geronimo/mavenplugins/car/FrameworkHelperTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/test/java/org/apache/geronimo/mavenplugins/car/FrameworkHelperTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/test/java/org/apache/geronimo/mavenplugins/car/FrameworkHelperTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

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=1096949&r1=1096948&r2=1096949&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml Tue Apr 26 23:16:30 2011
@@ -113,6 +113,19 @@
     <build>
         <plugins>
             <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Import-Package>
+                            net.sf.cglib.*;resolution:=optional,
+                            com.thoughtworks.xstream.*;resolution:=optional,
+                            *
+                        </Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
                 <executions>

Modified: geronimo/server/trunk/framework/modules/geronimo-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/pom.xml?rev=1096949&r1=1096948&r2=1096949&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/pom.xml Tue Apr 26 23:16:30 2011
@@ -39,12 +39,12 @@
             <scope>provided</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-main</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.framework</groupId>-->
+            <!--<artifactId>geronimo-main</artifactId>-->
+            <!--<version>${project.version}</version>-->
+            <!--<scope>provided</scope>-->
+        <!--</dependency>-->
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
@@ -193,7 +193,10 @@
                 <configuration>
                     <instructions>
                         <!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
-                        <Import-Package>org.apache.log4j.helpers;resolution:=optional,
+                        <Import-Package>
+                            org.apache.geronimo.cli.*;resolution:=optional,
+                            net.sf.cglib.*;resolution:=optional,
+                            org.apache.log4j.helpers;resolution:=optional,
                             *</Import-Package>
                     </instructions>
                 </configuration>

Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/MainBridge.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/MainBridge.java?rev=1096949&r1=1096948&r2=1096949&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/MainBridge.java
(original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/MainBridge.java
Tue Apr 26 23:16:30 2011
@@ -33,7 +33,7 @@ import org.apache.geronimo.kernel.config
 import org.apache.geronimo.kernel.config.ConfigurationUtil;
 import org.apache.geronimo.kernel.config.PersistentConfigurationList;
 import org.apache.geronimo.kernel.repository.Artifact;
-import org.apache.geronimo.main.Main;
+//import org.apache.geronimo.main.Main;
 import org.osgi.framework.Bundle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -41,7 +41,7 @@ import org.slf4j.LoggerFactory;
 /**
  * @version $Rev:385659 $ $Date$
  */
-public class MainBridge implements Main, GBeanLifecycle {
+public class MainBridge implements /*Main,*/ GBeanLifecycle {
     private static final Logger log = LoggerFactory.getLogger(MainBridge.class);
 
     protected final Kernel kernel;
@@ -121,7 +121,7 @@ public class MainBridge implements Main,
     }
 
     public void doStart() throws Exception {
-        bundle.getBundleContext().registerService(Main.class.getName(), this, new Hashtable());
+//        bundle.getBundleContext().registerService(Main.class.getName(), this, new Hashtable());
     }
 
     public void doStop() throws Exception {

Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi/BootActivator.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi/BootActivator.java?rev=1096949&r1=1096948&r2=1096949&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi/BootActivator.java
(original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi/BootActivator.java
Tue Apr 26 23:16:30 2011
@@ -30,8 +30,8 @@ import org.apache.geronimo.kernel.basic.
 import org.apache.geronimo.kernel.config.ConfigurationData;
 import org.apache.geronimo.kernel.config.ConfigurationUtil;
 import org.apache.geronimo.kernel.util.Main;
-import org.apache.geronimo.system.main.LongStartupMonitor;
-import org.apache.geronimo.system.main.StartupMonitor;
+//import org.apache.geronimo.system.main.LongStartupMonitor;
+//import org.apache.geronimo.system.main.StartupMonitor;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
@@ -50,12 +50,12 @@ public class BootActivator implements Bu
 
     public void start(BundleContext bundleContext) throws Exception {
         if (bundleContext.getServiceReference(Kernel.class.getName()) == null) {
-            StartupMonitor monitor = new LongStartupMonitor();
-            monitor.systemStarting(System.currentTimeMillis());
+//            StartupMonitor monitor = new LongStartupMonitor();
+//            monitor.systemStarting(System.currentTimeMillis());
             Kernel kernel = new BasicKernel();
 //            Kernel kernel = KernelFactory.newInstance(bundleContext).createKernel("geronimo");
 //            kernel.boot();
-            monitor.systemStarted(kernel);
+//            monitor.systemStarted(kernel);
             Dictionary dictionary = null;//new Hashtable();
             kernelRegistration = bundleContext.registerService(Kernel.class.getName(), kernel,
dictionary);
             //boot the root configuration
@@ -74,9 +74,9 @@ public class BootActivator implements Bu
             }
 
             // register Main service if Main GBean present
-            if (bundleContext.getServiceReference(org.apache.geronimo.main.Main.class.getName())
== null) {
-                registerMainService(bundleContext, kernel);
-            }
+//            if (bundleContext.getServiceReference(org.apache.geronimo.main.Main.class.getName())
== null) {
+//                registerMainService(bundleContext, kernel);
+//            }
 
         } else {
 //            configurationActivator = new ConfigurationActivator();
@@ -97,19 +97,19 @@ public class BootActivator implements Bu
         }
     }
 
-    private void registerMainService(BundleContext bundleContext, Kernel kernel) {
-        try {
-            final Main main = kernel.getGBean(Main.class);
-            bundleContext.registerService(
-                    org.apache.geronimo.main.Main.class.getName(),
-                    new org.apache.geronimo.main.Main() {
-                        public int execute(Object opaque) {
-                            return main.execute(opaque);
-                        }
-                    },
-                    null);
-        } catch (GBeanNotFoundException e) {
-            // ignore
-        }
-    }
+//    private void registerMainService(BundleContext bundleContext, Kernel kernel) {
+//        try {
+//            final Main main = kernel.getGBean(Main.class);
+//            bundleContext.registerService(
+//                    org.apache.geronimo.main.Main.class.getName(),
+//                    new org.apache.geronimo.main.Main() {
+//                        public int execute(Object opaque) {
+//                            return main.execute(opaque);
+//                        }
+//                    },
+//                    null);
+//        } catch (GBeanNotFoundException e) {
+//            // ignore
+//        }
+//    }
 }

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=1096949&r1=1096948&r2=1096949&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Tue Apr 26 23:16:30 2011
@@ -56,6 +56,7 @@
 
         <!-- This property is required by the car:package mojo -->
         <geronimoVersion>${project.version}</geronimoVersion>
+        <geronimo.version>3.0-SNAPSHOT</geronimo.version>
 
         <geronimoSchemaVersion>1.2</geronimoSchemaVersion>
         <warnOnDependencyChange>true</warnOnDependencyChange>
@@ -136,22 +137,91 @@
         <pluginSrcRepoLocal>~/.m2/repository/</pluginSrcRepoLocal>
         <pluginSrcRepoCentral>http://repo1.maven.org/maven2/</pluginSrcRepoCentral>
         <pluginSrcRepoApacheSnapshots>http://repository.apache.org/snapshots/</pluginSrcRepoApacheSnapshots>
-        
+
         <!-- OSGI properties -->
+        <!--<felix.bundlerepository.version>1.6.4</felix.bundlerepository.version>-->
+        <karaf.version>3.0.0-SNAPSHOT</karaf.version>
+        <karaf.osgi.version>3.0.0.SNAPSHOT</karaf.osgi.version>
+        <!--<aries.blueprint.version>0.3</aries.blueprint.version>-->
+        <!--<aries.jmx.version>0.3</aries.jmx.version>-->
+        <!--<aries.util.version>0.3</aries.util.version>-->
+        <!--<aries.jndi.version>0.3</aries.jndi.version>-->
+        <!-- karaf properties copied over -->
+        <!-- Apache ServiceMix Bundles -->
+        <aopalliance.bundle.version>1.0_4</aopalliance.bundle.version>
+        <asm.bundle.version>3.3_1</asm.bundle.version>
+        <cglib.bundle.version>2.1_3_6</cglib.bundle.version>
+        <commons-codec.bundle.version>1.3_3</commons-codec.bundle.version>
+        <commons-collections.bundle.version>3.2.1_1</commons-collections.bundle.version>
+        <commons-fileupload.version>1.1.1</commons-fileupload.version>
+        <commons-lang.bundle.version>2.4_4</commons-lang.bundle.version>
+        <jasypt.bundle.version>1.7_1</jasypt.bundle.version>
+        <jetty.version>7.3.1.v20110307</jetty.version>
+        <junit.bundle.version>4.7_2</junit.bundle.version>
+
+        <geronimo.servlet.version>1.1.2</geronimo.servlet.version>
+        <geronimo.jpa-spec.version>1.1</geronimo.jpa-spec.version>
+        <geronimo.jta-spec.version>1.1.1</geronimo.jta-spec.version>
+        <depends-maven-plugin.version>1.0</depends-maven-plugin.version>
+        <easymock.version>2.4</easymock.version>
+        <equinox.version>3.6.0.v20100517</equinox.version>
         <felix.bundlerepository.version>1.6.4</felix.bundlerepository.version>
-        <karaf.version>2.2.1-SNAPSHOT</karaf.version>
-        <karaf.osgi.version>2.2.1.SNAPSHOT</karaf.osgi.version>
+        <felix.configadmin.version>1.2.8</felix.configadmin.version>
+        <felix.fileinstall.version>3.1.10</felix.fileinstall.version>
+        <felix.framework.version>3.0.9</felix.framework.version>
+        <felix.gogo.version>0.6.1</felix.gogo.version>
+        <felix.plugin.version>2.3.4</felix.plugin.version>
+        <felix.utils.version>1.1.0</felix.utils.version>
+        <felix.webconsole.version>3.1.8</felix.webconsole.version>
+        <felix.metatype.version>1.0.4</felix.metatype.version>
+        <felix.eventadmin.version>1.2.10</felix.eventadmin.version>
+        <felix.eventadmin-plugin.version>1.0.2</felix.eventadmin-plugin.version>
+        <aries.application.version>0.3</aries.application.version>
         <aries.blueprint.version>0.3</aries.blueprint.version>
         <aries.jmx.version>0.3</aries.jmx.version>
-        <aries.util.version>0.3</aries.util.version>
+        <aries.jpa.version>0.3</aries.jpa.version>
         <aries.jndi.version>0.3</aries.jndi.version>
         <aries.proxy.version>0.3</aries.proxy.version>
+        <aries.transaction.version>0.3</aries.transaction.version>
+        <aries.util.version>0.3</aries.util.version>
+        <jansi.version>1.5</jansi.version>
+        <jline.version>2.5</jline.version>
+        <jsw.version>3.2.3</jsw.version>
+        <log4j.version>1.2.16</log4j.version>
+        <maven.version>2.0.9</maven.version>
+        <mina.version>2.0.1</mina.version>
+        <osgi.version>4.2.0</osgi.version>
+        <pax.exam.version>1.2.4</pax.exam.version>
+        <pax.logging.version>1.6.1</pax.logging.version>
+        <pax.runner.version>1.6.1</pax.runner.version>
+        <pax.url.version>1.2.5</pax.url.version>
+        <pax.web.version>1.1.0-SNAPSHOT</pax.web.version>
+        <pax.tinybundles.version>1.3.0</pax.tinybundles.version>
+        <servlet.api.version>2.5</servlet.api.version>
+        <slf4j.version>1.6.1</slf4j.version>
+        <spring.osgi.version>1.2.1</spring.osgi.version>
+        <spring2.version>2.5.6.SEC02</spring2.version>
+        <spring.version>3.0.5.RELEASE</spring.version>
+        <sshd.version>0.5.0</sshd.version>
+        <xbean.version>3.7</xbean.version>
+        <javax.mail.version>1.4.3</javax.mail.version>
+
+        <!--<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>-->
+        <!--<appendedResourcesDirectory>${basedir}/etc/appended-resources</appendedResourcesDirectory>-->
+        <!--<bnd.version.policy>[$(version;==;$(@)),$(version;+;$(@)))</bnd.version.policy>-->
     </properties>
 
     <dependencyManagement>
         <dependencies>
 
             <dependency>
+                <groupId>org.apache.karaf</groupId>
+                <artifactId>karaf</artifactId>
+                <type>pom</type>
+                <version>${karaf.version}</version>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-osgi-registry</artifactId>
                 <version>1.0</version>
@@ -243,7 +313,7 @@
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-jaxb_2.2_spec</artifactId>
-                <version>1.0.1</version>
+                <version>1.0.2-SNAPSHOT</version>
             </dependency>
 
             <dependency>
@@ -309,7 +379,7 @@
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-stax-api_1.2_spec</artifactId>
-                <version>1.0</version>
+                <version>1.1-SNAPSHOT</version>
             </dependency>
 
             <dependency>
@@ -325,39 +395,39 @@
             </dependency>
 
             <!--<dependency>-->
-                <!--<groupId>org.apache.geronimo.schema</groupId>-->
-                <!--<artifactId>geronimo-schema-jee_5</artifactId>-->
-                <!--<version>1.2</version>-->
-                <!--<exclusions>-->
-                    <!--<exclusion>-->
-                        <!--<groupId>org.apache.xmlbeans</groupId>-->
-                        <!--<artifactId>xmlbeans</artifactId>-->
-                    <!--</exclusion>-->
-                <!--</exclusions>-->
+            <!--<groupId>org.apache.geronimo.schema</groupId>-->
+            <!--<artifactId>geronimo-schema-jee_5</artifactId>-->
+            <!--<version>1.2</version>-->
+            <!--<exclusions>-->
+            <!--<exclusion>-->
+            <!--<groupId>org.apache.xmlbeans</groupId>-->
+            <!--<artifactId>xmlbeans</artifactId>-->
+            <!--</exclusion>-->
+            <!--</exclusions>-->
             <!--</dependency>-->
 
             <!--<dependency>-->
-                <!--<groupId>org.apache.geronimo.schema</groupId>-->
-                <!--<artifactId>geronimo-schema-j2ee_1.4</artifactId>-->
-                <!--<version>1.3</version>-->
-                <!--<exclusions>-->
-                    <!--<exclusion>-->
-                        <!--<groupId>org.apache.xmlbeans</groupId>-->
-                        <!--<artifactId>xmlbeans</artifactId>-->
-                    <!--</exclusion>-->
-                <!--</exclusions>-->
+            <!--<groupId>org.apache.geronimo.schema</groupId>-->
+            <!--<artifactId>geronimo-schema-j2ee_1.4</artifactId>-->
+            <!--<version>1.3</version>-->
+            <!--<exclusions>-->
+            <!--<exclusion>-->
+            <!--<groupId>org.apache.xmlbeans</groupId>-->
+            <!--<artifactId>xmlbeans</artifactId>-->
+            <!--</exclusion>-->
+            <!--</exclusions>-->
             <!--</dependency>-->
 
             <!--<dependency>-->
-                <!--<groupId>org.apache.geronimo.schema</groupId>-->
-                <!--<artifactId>geronimo-schema-javaee_6</artifactId>-->
-                <!--<version>1.0</version>-->
-                <!--<exclusions>-->
-                    <!--<exclusion>-->
-                        <!--<groupId>org.apache.xmlbeans</groupId>-->
-                        <!--<artifactId>xmlbeans</artifactId>-->
-                    <!--</exclusion>-->
-                <!--</exclusions>-->
+            <!--<groupId>org.apache.geronimo.schema</groupId>-->
+            <!--<artifactId>geronimo-schema-javaee_6</artifactId>-->
+            <!--<version>1.0</version>-->
+            <!--<exclusions>-->
+            <!--<exclusion>-->
+            <!--<groupId>org.apache.xmlbeans</groupId>-->
+            <!--<artifactId>xmlbeans</artifactId>-->
+            <!--</exclusion>-->
+            <!--</exclusions>-->
             <!--</dependency>-->
 
             <dependency>
@@ -523,7 +593,7 @@
                 <artifactId>xbean-asm-shaded</artifactId>
                 <version>${xbeanVersion}</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.apache.xbean</groupId>
                 <artifactId>xbean-classloader</artifactId>
@@ -932,7 +1002,7 @@
                 <artifactId>commons-lang</artifactId>
                 <version>2.5</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>commons-pool</groupId>
                 <artifactId>commons-pool</artifactId>
@@ -1019,7 +1089,7 @@
                 <artifactId>json</artifactId>
                 <version>20090211_1</version>
             </dependency>
-        
+
             <dependency>
                 <groupId>org.apache.geronimo.bundles</groupId>
                 <artifactId>dwr</artifactId>
@@ -1116,8 +1186,8 @@
                         <artifactId>serp</artifactId>
                     </exclusion>
                     <!--<exclusion>-->
-                        <!--<groupId>org.apache.openwebbeans</groupId>-->
-                        <!--<artifactId>openwebbeans-ee</artifactId>-->
+                    <!--<groupId>org.apache.openwebbeans</groupId>-->
+                    <!--<artifactId>openwebbeans-ee</artifactId>-->
                     <!--</exclusion>-->
                     <exclusion>
                         <groupId>org.apache.openwebbeans</groupId>
@@ -1299,7 +1369,7 @@
                 <artifactId>openejb-javaagent</artifactId>
                 <version>${openejbVersion}</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.apache.openejb</groupId>
                 <artifactId>openejb-osgi-core</artifactId>
@@ -1661,14 +1731,14 @@
                 </exclusions>
             </dependency>
 
-<!--
-only found in cxf
-            <dependency>
-                <groupId>org.bouncycastle</groupId>
-                <artifactId>bcprov-jdk15</artifactId>
-                <version>1.43</version>
-            </dependency>
--->
+            <!--
+            only found in cxf
+                        <dependency>
+                            <groupId>org.bouncycastle</groupId>
+                            <artifactId>bcprov-jdk15</artifactId>
+                            <version>1.43</version>
+                        </dependency>
+            -->
 
             <dependency>
                 <groupId>org.apache.velocity</groupId>
@@ -1739,8 +1809,25 @@ only found in cxf
                     </exclusion>
                 </exclusions>
             </dependency>
+            <dependency>
+                <groupId>org.apache.karaf</groupId>
+                <artifactId>org.apache.karaf.main</artifactId>
+                <version>${karaf.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.karaf.assemblies.features</groupId>
+                <artifactId>karaf-framework</artifactId>
+                <version>${karaf.version}</version>
+                <type>kar</type>
+            </dependency>
 
             <dependency>
+                <groupId>org.apache.karaf.assemblies.features</groupId>
+                <artifactId>karaf-framework</artifactId>
+                <version>${karaf.version}</version>
+                <type>kar</type>
+            </dependency>
+            <dependency>
                 <groupId>org.apache.karaf.shell</groupId>
                 <artifactId>org.apache.karaf.shell.console</artifactId>
                 <version>${karaf.version}</version>
@@ -1761,7 +1848,7 @@ only found in cxf
                         <groupId>org.apache.aries.blueprint</groupId>
                         <artifactId>org.apache.aries.blueprint</artifactId>
                     </exclusion>
-               </exclusions>
+                </exclusions>
             </dependency>
 
             <dependency>
@@ -2009,7 +2096,7 @@ only found in cxf
 
                         NOTE: targetPath is broken for webResources (as documented)
                         -->
-                         <webResources>
+                        <webResources>
                             <resource>
                                 <directory>${project.build.outputDirectory}</directory>
                                 <includes>
@@ -2319,7 +2406,7 @@ only found in cxf
                 <module>assemblies</module>
             </modules>
 
-            <repositories>            
+            <repositories>
                 <repository>
                     <!-- org.eclipse.jetty routing -->
                     <id>jetty.oss.sonatype.org</id>
@@ -2412,10 +2499,10 @@ only found in cxf
                 <module>testsuite</module>
             </modules>
         </profile>
-        
+
         <profile>
             <id>notar</id>
-            
+
             <properties>
                 <tarAssemblies>false</tarAssemblies>
             </properties>



Mime
View raw message