geronimo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Forrest Xia <forres...@gmail.com>
Subject Re: svn commit: r1090982 - in /geronimo/server/trunk: ./ framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ framework/buildsupport/geronimo-osgi-plugin/src/main/resources/ framework/configs/j2ee-security/src/m
Date Mon, 11 Apr 2011 16:58:16 GMT
Hi Viola,

I met build error like this after your patch, can you double check?

#
# A fatal error has been detected by the Java Runtime Environment:
#
#  SIGFPE (0x8) at pc=0xf7f2420b, pid=7251, tid=4145761184
#
# JRE version: 6.0_23-b05
# Java VM: Java HotSpot(TM) Server VM (19.0-b09 mixed mode linux-x86 )
# Problematic frame:
# C  [ld-linux.so.2+0x920b]
#
# An error report file with more information is saved as:
#
/home/tcker/tckdata/tckbuildsrc/geronimo/framework/configs/jsr88-cli/hs_err_pid7251.log
#
# If you would like to submit a bug report, please visit:
#   http://java.sun.com/webapps/bugreport/crash.jsp
# The crash happened outside the Java Virtual Machine in native code.
# See problematic frame for where to report the bug.
#

This happens when build framework/config/jsr88-cli

Forrest

On Mon, Apr 11, 2011 at 4:56 PM, <violalu@apache.org> wrote:

> Author: violalu
> Date: Mon Apr 11 08:56:25 2011
> New Revision: 1090982
>
> URL: http://svn.apache.org/viewvc?rev=1090982&view=rev
> Log:
> GERONIMO-5885 Upgrade karaf from 2.1.2 to 2.2.1-SNAPSHOT
>
> Modified:
>
>  geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
>
>  geronimo/server/trunk/framework/buildsupport/geronimo-osgi-plugin/src/main/resources/Geronimo-1.6.profile
>
>  geronimo/server/trunk/framework/configs/j2ee-security/src/main/history/dependencies.xml
>
>  geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml
>    geronimo/server/trunk/framework/configs/karaf-framework/pom.xml
>
>  geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties
>
>  geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml
>
>  geronimo/server/trunk/framework/configs/rmi-naming/src/main/history/dependencies.xml
>
>  geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml
>
>  geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/StreamConsoleReader.java
>    geronimo/server/trunk/framework/modules/geronimo-pax-logging/pom.xml
>    geronimo/server/trunk/framework/modules/geronimo-security/pom.xml
>    geronimo/server/trunk/framework/modules/geronimo-shell-base/pom.xml
>
>  geronimo/server/trunk/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/deploy/ConnectCommand.java
>    geronimo/server/trunk/framework/modules/geronimo-shell-diagnose/pom.xml
>
>  geronimo/server/trunk/plugingroups/console-jetty/src/main/history/dependencies.xml
>
>  geronimo/server/trunk/plugingroups/console-tomcat/src/main/history/dependencies.xml
>
>  geronimo/server/trunk/plugingroups/eba-jetty/src/main/history/dependencies.xml
>
>  geronimo/server/trunk/plugingroups/webservices-axis2/src/main/history/dependencies.xml
>
>  geronimo/server/trunk/plugins/aries/aries-deployer/src/main/history/dependencies.xml
>
>  geronimo/server/trunk/plugins/aries/aries/src/main/history/dependencies.xml
>    geronimo/server/trunk/plugins/aries/geronimo-aries/pom.xml
>    geronimo/server/trunk/plugins/aries/pom.xml
>
>  geronimo/server/trunk/plugins/axis/axis/src/main/history/dependencies.xml
>
>  geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml
>
>  geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml
>
>  geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/history/dependencies.xml
>    geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml
>
>  geronimo/server/trunk/plugins/hotdeploy/hot-deployer/src/main/history/dependencies.xml
>
>  geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/history/dependencies.xml
>
>  geronimo/server/trunk/plugins/j2ee/javaee-builder-support/src/main/history/dependencies.xml
>
>  geronimo/server/trunk/plugins/j2ee/jsr88-jar-configurer/src/main/history/dependencies.xml
>
>  geronimo/server/trunk/plugins/j2ee/jsr88-rar-configurer/src/main/history/dependencies.xml
>
>  geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/src/main/history/dependencies.xml
>    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/pom.xml
>
>  geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/src/main/history/dependencies.xml
>
>  geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml
>
>  geronimo/server/trunk/plugins/tomcat/tomcat7/src/main/history/dependencies.xml
>
>  geronimo/server/trunk/plugins/wab/web-extender/src/main/history/dependencies.xml
>
>  geronimo/server/trunk/plugins/wink/wink/src/main/history/dependencies.xml
>    geronimo/server/trunk/pom.xml
>
> Modified:
> geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
> (original)
> +++
> geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
> Mon Apr 11 08:56:25 2011
> @@ -887,7 +887,7 @@ public abstract class AbstractCarMojo
>                         "org.apache.geronimo.transformer," +
>                         "org.apache.geronimo.hook," +
>                         "org.apache.geronimo.mavenplugins.car," +
> -                        "org.apache.karaf.jaas.boot;version=\"2.1.2\"," +
> +
>  "org.apache.karaf.jaas.boot;version=\"2.2.1.SNAPSHOT\"," +
>                         "org.apache.yoko," +
>                         "org.apache.yoko.osgi," +
>                         "org.apache.yoko.rmispec.util"
>
> Modified:
> geronimo/server/trunk/framework/buildsupport/geronimo-osgi-plugin/src/main/resources/Geronimo-1.6.profile
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/geronimo-osgi-plugin/src/main/resources/Geronimo-1.6.profile?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/framework/buildsupport/geronimo-osgi-plugin/src/main/resources/Geronimo-1.6.profile
> (original)
> +++
> geronimo/server/trunk/framework/buildsupport/geronimo-osgi-plugin/src/main/resources/Geronimo-1.6.profile
> Mon Apr 11 08:56:25 2011
> @@ -143,7 +143,7 @@ org.osgi.framework.system.packages.extra
>  sun.reflect, \
>  org.apache.geronimo.main, \
>  org.apache.geronimo.transformer, \
> - org.apache.karaf.jaas.boot;version=2.1.2
> + org.apache.karaf.jaas.boot;version=2.2.1.SNAPSHOT
>
>  org.osgi.framework.bootdelegation = \
>  javax.*,\
>
> Modified:
> geronimo/server/trunk/framework/configs/j2ee-security/src/main/history/dependencies.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/j2ee-security/src/main/history/dependencies.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/framework/configs/j2ee-security/src/main/history/dependencies.xml
> (original)
> +++
> geronimo/server/trunk/framework/configs/j2ee-security/src/main/history/dependencies.xml
> Mon Apr 11 08:56:25 2011
> @@ -36,4 +36,9 @@
>         <artifactId>geronimo-jaspic_1.0_spec</artifactId>
>         <type>jar</type>
>     </dependency>
> +    <dependency>
> +        <groupId>org.apache.karaf.jaas</groupId>
> +        <artifactId>org.apache.karaf.jaas.boot</artifactId>
> +        <type>jar</type>
> +    </dependency>
>  </plugin-artifact>
>
> Modified:
> geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml
> (original)
> +++
> geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml
> Mon Apr 11 08:56:25 2011
> @@ -32,6 +32,11 @@
>         <type>jar</type>
>     </dependency>
>     <dependency>
> +        <groupId>org.apache.felix</groupId>
> +        <artifactId>org.apache.felix.gogo.runtime</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
>         <groupId>org.apache.geronimo.bundles</groupId>
>         <artifactId>jaxb-impl</artifactId>
>         <type>jar</type>
> @@ -127,6 +132,26 @@
>         <type>jar</type>
>     </dependency>
>     <dependency>
> +        <groupId>org.apache.karaf</groupId>
> +        <artifactId>org.apache.karaf.util</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
> +        <groupId>org.apache.karaf.jaas</groupId>
> +        <artifactId>org.apache.karaf.jaas.boot</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
> +        <groupId>org.apache.karaf.jaas</groupId>
> +        <artifactId>org.apache.karaf.jaas.config</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
> +        <groupId>org.apache.karaf.jaas</groupId>
> +        <artifactId>org.apache.karaf.jaas.modules</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
>         <groupId>org.apache.karaf.shell</groupId>
>         <artifactId>org.apache.karaf.shell.console</artifactId>
>         <type>jar</type>
> @@ -186,4 +211,14 @@
>         <artifactId>pax-logging-api</artifactId>
>         <type>jar</type>
>     </dependency>
> +    <dependency>
> +        <groupId>org.osgi</groupId>
> +        <artifactId>org.osgi.compendium</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
> +        <groupId>org.osgi</groupId>
> +        <artifactId>org.osgi.core</artifactId>
> +        <type>jar</type>
> +    </dependency>
>  </plugin-artifact>
>
> Modified: geronimo/server/trunk/framework/configs/karaf-framework/pom.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/pom.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> --- geronimo/server/trunk/framework/configs/karaf-framework/pom.xml
> (original)
> +++ geronimo/server/trunk/framework/configs/karaf-framework/pom.xml Mon Apr
> 11 08:56:25 2011
> @@ -38,11 +38,11 @@
>         <depends.maven.plugin.version>1.0</depends.maven.plugin.version>
>         <easymock.version>2.4</easymock.version>
>         <felix.compendium.version>1.2.0</felix.compendium.version>
> -        <felix.fileinstall.version>3.0.2</felix.fileinstall.version>
> +        <felix.fileinstall.version>3.1.10</felix.fileinstall.version>
>         <felix.osgi.version>1.4.0</felix.osgi.version>
>         <felix.plugin.version>2.1.0</felix.plugin.version>
>         <felix.prefs.version>1.0.4</felix.prefs.version>
> -        <felix.metatype.version>1.0.2</felix.metatype.version>
> +        <felix.metatype.version>1.0.2</felix.metatype.version>
>         <jansi.version>1.2</jansi.version>
>         <junit.version>4.7_1</junit.version>
>         <log4j.version>1.2.16</log4j.version>
> @@ -50,7 +50,7 @@
>         <mina.version>2.0.0-RC1</mina.version>
>         <pax.exam.version>1.2.2</pax.exam.version>
>         <pax.runner.version>1.5.0</pax.runner.version>
> -        <sshd.version>0.4.0</sshd.version>
> +        <sshd.version>0.5.0</sshd.version>
>     </properties>
>
>     <dependencyManagement>
> @@ -89,6 +89,7 @@
>                     </exclusion>
>                </exclusions>
>             </dependency>
> +
>
>             <dependency>
>                 <groupId>org.apache.felix</groupId>
> @@ -105,7 +106,7 @@
>                     </exclusion>
>                </exclusions>
>             </dependency>
> -
> +
>             <dependency>
>                 <groupId>org.apache.geronimo.framework</groupId>
>                 <artifactId>geronimo-rmi-loader</artifactId>
> @@ -167,6 +168,18 @@
>             </dependency>
>
>             <dependency>
> +                <groupId>org.apache.aries.proxy</groupId>
> +                <artifactId>org.apache.aries.proxy</artifactId>
> +                <version>${aries.proxy.version}</version>
> +                <exclusions>
> +                    <exclusion>
> +                       <groupId>org.apache.aries.testsupport</groupId>
> +        <artifactId>org.apache.aries.testsupport.unit</artifactId>
> +                    </exclusion>
> +                </exclusions>
> +            </dependency>
> +
> +            <dependency>
>                 <groupId>org.apache.karaf.deployer</groupId>
>
> <artifactId>org.apache.karaf.deployer.blueprint</artifactId>
>                 <version>${karaf.version}</version>
>
> Modified:
> geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties
> (original)
> +++
> geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties
> Mon Apr 11 08:56:25 2011
> @@ -30,11 +30,11 @@ org/apache/geronimo/framework/geronimo-p
>
>  org/apache/felix/org.apache.felix.configadmin/${felix.configadmin.version}/org.apache.felix.configadmin-${felix.configadmin.version}.jar=8
>
>  org/apache/felix/org.apache.felix.prefs/${felix.prefs.version}/org.apache.felix.prefs-${felix.prefs.version}.jar=10
>
>  org/apache/felix/org.apache.felix.fileinstall/${felix.fileinstall.version}/org.apache.felix.fileinstall-${felix.fileinstall.version}.jar=11
> -
>  #
>  # The rest of the services..
>  #
>
>  org/apache/aries/org.apache.aries.util/${aries.blueprint.version}/org.apache.aries.util-${aries.blueprint.version}.jar=20
>
> +org/apache/aries/proxy/org.apache.aries.proxy/${aries.proxy.version}/org.apache.aries.proxy-${aries.proxy.version}.jar=20
>
>  org/apache/aries/blueprint/org.apache.aries.blueprint/${aries.blueprint.version}/org.apache.aries.blueprint-${aries.blueprint.version}.jar=20
>
>
>  org/apache/geronimo/framework/geronimo-shell/${pom.version}/geronimo-shell-${pom.version}.jar=30
> @@ -48,6 +48,7 @@ org/apache/karaf/shell/org.apache.karaf.
>
>  org/apache/karaf/shell/org.apache.karaf.shell.commands/${karaf.version}/org.apache.karaf.shell.commands-${karaf.version}.jar=30
>
>  org/apache/karaf/shell/org.apache.karaf.shell.obr/${karaf.version}/org.apache.karaf.shell.obr-${karaf.version}.jar=30
>
>  org/apache/karaf/jaas/org.apache.karaf.jaas.config/${karaf.version}/org.apache.karaf.jaas.config-${karaf.version}.jar=30
>
> +org/apache/karaf/jaas/org.apache.karaf.jaas.modules/${karaf.version}/org.apache.karaf.jaas.modules-${karaf.version}.jar=30
>
>
>  #org/apache/karaf/features/org.apache.karaf.features.core/${karaf.version}/org.apache.karaf.features.core-${karaf.version}.jar=30
>
>  #org/apache/karaf/features/org.apache.karaf.features.command/${karaf.version}/org.apache.karaf.features.command-${karaf.version}.jar=30
>
> Modified:
> geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml
> (original)
> +++
> geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml
> Mon Apr 11 08:56:25 2011
> @@ -17,11 +17,6 @@
>         <type>jar</type>
>     </dependency>
>     <dependency>
> -        <groupId>commons-collections</groupId>
> -        <artifactId>commons-collections</artifactId>
> -        <type>jar</type>
> -    </dependency>
> -    <dependency>
>         <groupId>commons-lang</groupId>
>         <artifactId>commons-lang</artifactId>
>         <type>jar</type>
> @@ -37,6 +32,21 @@
>         <type>jar</type>
>     </dependency>
>     <dependency>
> +        <groupId>org.apache.aries.proxy</groupId>
> +        <artifactId>org.apache.aries.proxy</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
> +        <groupId>org.apache.aries.proxy</groupId>
> +        <artifactId>org.apache.aries.proxy.api</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
> +        <groupId>org.apache.aries.proxy</groupId>
> +        <artifactId>org.apache.aries.proxy.impl</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
>         <groupId>org.apache.felix</groupId>
>         <artifactId>org.apache.felix.bundlerepository</artifactId>
>         <type>jar</type>
> @@ -58,6 +68,11 @@
>     </dependency>
>     <dependency>
>         <groupId>org.apache.felix</groupId>
> +        <artifactId>org.apache.felix.gogo.runtime</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
> +        <groupId>org.apache.felix</groupId>
>         <artifactId>org.apache.felix.metatype</artifactId>
>         <type>jar</type>
>     </dependency>
> @@ -197,6 +212,11 @@
>         <type>jar</type>
>     </dependency>
>     <dependency>
> +        <groupId>org.apache.karaf</groupId>
> +        <artifactId>org.apache.karaf.util</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
>         <groupId>org.apache.karaf.deployer</groupId>
>         <artifactId>org.apache.karaf.deployer.blueprint</artifactId>
>         <type>jar</type>
> @@ -232,6 +252,11 @@
>         <type>jar</type>
>     </dependency>
>     <dependency>
> +        <groupId>org.apache.karaf.jaas</groupId>
> +        <artifactId>org.apache.karaf.jaas.modules</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
>         <groupId>org.apache.karaf.shell</groupId>
>         <artifactId>org.apache.karaf.shell.commands</artifactId>
>         <type>jar</type>
> @@ -371,4 +396,9 @@
>         <artifactId>org.osgi.core</artifactId>
>         <type>jar</type>
>     </dependency>
> +    <dependency>
> +        <groupId>org.slf4j</groupId>
> +        <artifactId>slf4j-api</artifactId>
> +        <type>jar</type>
> +    </dependency>
>  </plugin-artifact>
>
> Modified:
> geronimo/server/trunk/framework/configs/rmi-naming/src/main/history/dependencies.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/rmi-naming/src/main/history/dependencies.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/framework/configs/rmi-naming/src/main/history/dependencies.xml
> (original)
> +++
> geronimo/server/trunk/framework/configs/rmi-naming/src/main/history/dependencies.xml
> Mon Apr 11 08:56:25 2011
> @@ -32,6 +32,11 @@
>         <type>jar</type>
>     </dependency>
>     <dependency>
> +        <groupId>org.apache.aries.proxy</groupId>
> +        <artifactId>org.apache.aries.proxy.api</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
>         <groupId>org.apache.geronimo.framework</groupId>
>         <artifactId>geronimo-blueprint</artifactId>
>         <type>jar</type>
>
> Modified:
> geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml
> (original)
> +++
> geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml
> Mon Apr 11 08:56:25 2011
> @@ -32,6 +32,11 @@
>         <type>jar</type>
>     </dependency>
>     <dependency>
> +        <groupId>org.apache.felix</groupId>
> +        <artifactId>org.apache.felix.gogo.runtime</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
>         <groupId>org.apache.geronimo.bundles</groupId>
>         <artifactId>jaxb-impl</artifactId>
>         <type>jar</type>
> @@ -127,6 +132,26 @@
>         <type>jar</type>
>     </dependency>
>     <dependency>
> +        <groupId>org.apache.karaf</groupId>
> +        <artifactId>org.apache.karaf.util</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
> +        <groupId>org.apache.karaf.jaas</groupId>
> +        <artifactId>org.apache.karaf.jaas.boot</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
> +        <groupId>org.apache.karaf.jaas</groupId>
> +        <artifactId>org.apache.karaf.jaas.config</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
> +        <groupId>org.apache.karaf.jaas</groupId>
> +        <artifactId>org.apache.karaf.jaas.modules</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
>         <groupId>org.apache.karaf.shell</groupId>
>         <artifactId>org.apache.karaf.shell.console</artifactId>
>         <type>jar</type>
> @@ -186,4 +211,14 @@
>         <artifactId>pax-logging-api</artifactId>
>         <type>jar</type>
>     </dependency>
> +    <dependency>
> +        <groupId>org.osgi</groupId>
> +        <artifactId>org.osgi.compendium</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
> +        <groupId>org.osgi</groupId>
> +        <artifactId>org.osgi.core</artifactId>
> +        <type>jar</type>
> +    </dependency>
>  </plugin-artifact>
>
> Modified:
> geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/StreamConsoleReader.java
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/StreamConsoleReader.java?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/StreamConsoleReader.java
> (original)
> +++
> geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/StreamConsoleReader.java
> Mon Apr 11 08:56:25 2011
> @@ -39,7 +39,7 @@ public class StreamConsoleReader impleme
>
>     protected PrintWriter console;
>
> -    private jline.ConsoleReader jlineConsoleReader;
> +    private jline.console.ConsoleReader jlineConsoleReader;
>
>     private boolean jlineConsoleEnabled = true;
>
> @@ -49,7 +49,7 @@ public class StreamConsoleReader impleme
>
>     public StreamConsoleReader(InputStream in, PrintWriter out) {
>         try {
> -            jlineConsoleReader = new jline.ConsoleReader(in, out);
> +            jlineConsoleReader = new jline.console.ConsoleReader(in, out);
>         } catch (IOException e) {
>             logger.warn("Fail to create jline console, some features like
> password mask will be disabled", e);
>             jlineConsoleEnabled = false;
> @@ -66,7 +66,7 @@ public class StreamConsoleReader impleme
>     @Override
>     public void printNewline() throws IOException {
>         if (jlineConsoleEnabled) {
> -            jlineConsoleReader.printNewline();
> +            ((ConsoleReader) jlineConsoleReader).printNewline();
>         } else {
>             console.println();
>         }
> @@ -82,7 +82,7 @@ public class StreamConsoleReader impleme
>     @Override
>     public void printString(String s) throws IOException {
>         if (jlineConsoleEnabled) {
> -            jlineConsoleReader.printString(s);
> +            ((ConsoleReader) jlineConsoleReader).printString(s);
>         } else {
>             console.print(s);
>         }
> @@ -98,8 +98,8 @@ public class StreamConsoleReader impleme
>     @Override
>     public void println(String s) throws IOException {
>         if (jlineConsoleEnabled) {
> -            jlineConsoleReader.printString(s);
> -            jlineConsoleReader.printNewline();
> +            ((ConsoleReader) jlineConsoleReader).printString(s);
> +            ((ConsoleReader) jlineConsoleReader).printNewline();
>         } else {
>             console.println(s);
>             console.println();
> @@ -148,7 +148,7 @@ public class StreamConsoleReader impleme
>     @Override
>     public void flushConsole() throws IOException {
>         if (jlineConsoleEnabled) {
> -            jlineConsoleReader.flushConsole();
> +            ((ConsoleReader) jlineConsoleReader).flushConsole();
>         } else {
>             console.flush();
>         }
>
> Modified:
> geronimo/server/trunk/framework/modules/geronimo-pax-logging/pom.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-pax-logging/pom.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> --- geronimo/server/trunk/framework/modules/geronimo-pax-logging/pom.xml
> (original)
> +++ geronimo/server/trunk/framework/modules/geronimo-pax-logging/pom.xml
> Mon Apr 11 08:56:25 2011
> @@ -100,7 +100,7 @@
>                         </Import-Package>
>                         <Export-Package>
>                             org.apache.geronimo.logging,
> -
>  org.ops4j.pax.logging.spi;provider=paxlogging;version="1.5.3"
> +
>  org.ops4j.pax.logging.spi;provider=paxlogging;version=${pax.logging.version}
>                         </Export-Package>
>
> <Bundle-Activator>org.apache.geronimo.logging.impl.LoggingServiceActivator</Bundle-Activator>
>                         <Include-Resource>
>
> Modified: geronimo/server/trunk/framework/modules/geronimo-security/pom.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/pom.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> --- geronimo/server/trunk/framework/modules/geronimo-security/pom.xml
> (original)
> +++ geronimo/server/trunk/framework/modules/geronimo-security/pom.xml Mon
> Apr 11 08:56:25 2011
> @@ -68,7 +68,7 @@
>         <dependency>
>             <groupId>org.apache.karaf.jaas</groupId>
>             <artifactId>org.apache.karaf.jaas.boot</artifactId>
> -            <scope>provided</scope>
> +            <!--<scope>provided</scope>-->
>         </dependency>
>
>         <dependency>
>
> Modified:
> geronimo/server/trunk/framework/modules/geronimo-shell-base/pom.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-shell-base/pom.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> --- geronimo/server/trunk/framework/modules/geronimo-shell-base/pom.xml
> (original)
> +++ geronimo/server/trunk/framework/modules/geronimo-shell-base/pom.xml Mon
> Apr 11 08:56:25 2011
> @@ -58,8 +58,8 @@
>         <dependency>
>             <groupId>org.apache.karaf.shell</groupId>
>             <artifactId>org.apache.karaf.shell.console</artifactId>
> -        </dependency>
> -
> +        </dependency>
> +
>         <dependency>
>             <groupId>org.apache.aries.blueprint</groupId>
>             <artifactId>org.apache.aries.blueprint</artifactId>
>
> Modified:
> geronimo/server/trunk/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/deploy/ConnectCommand.java
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/deploy/ConnectCommand.java?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/deploy/ConnectCommand.java
> (original)
> +++
> geronimo/server/trunk/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/deploy/ConnectCommand.java
> Mon Apr 11 08:56:25 2011
> @@ -31,7 +31,7 @@ import org.apache.geronimo.deployment.cl
>  import
> org.apache.geronimo.deployment.plugin.factories.BaseDeploymentFactory;
>  import org.apache.geronimo.kernel.Kernel;
>  import org.apache.geronimo.shell.BaseCommandSupport;
> -import org.osgi.service.command.CommandSession;
> +import org.apache.felix.service.command.CommandSession;
>
>  /**
>  * @version $Rev$ $Date$
>
> Modified:
> geronimo/server/trunk/framework/modules/geronimo-shell-diagnose/pom.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-shell-diagnose/pom.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> --- geronimo/server/trunk/framework/modules/geronimo-shell-diagnose/pom.xml
> (original)
> +++ geronimo/server/trunk/framework/modules/geronimo-shell-diagnose/pom.xml
> Mon Apr 11 08:56:25 2011
> @@ -37,6 +37,18 @@
>         </dependency>
>
>         <dependency>
> +                <groupId>org.apache.aries.proxy</groupId>
> +                <artifactId>org.apache.aries.proxy</artifactId>
> +                <version>${aries.proxy.version}</version>
> +                <exclusions>
> +                    <exclusion>
> +                       <groupId>org.apache.aries.testsupport</groupId>
> +        <artifactId>org.apache.aries.testsupport.unit</artifactId>
> +                    </exclusion>
> +                </exclusions>
> +            </dependency>
> +
> +        <dependency>
>             <groupId>org.apache.aries.blueprint</groupId>
>             <artifactId>org.apache.aries.blueprint</artifactId>
>         </dependency>
> @@ -55,7 +67,7 @@
>                 <configuration>
>                     <instructions>
>                         <Import-Package>
> -                            org.osgi.service.command;version="0.4.0",
> +
>  org.apache.felix.service.command;version="0.4.0",
>                             org.eclipse.*;resolution:=optional,
>                             *
>                         </Import-Package>
>
> Modified:
> geronimo/server/trunk/plugingroups/console-jetty/src/main/history/dependencies.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/console-jetty/src/main/history/dependencies.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/plugingroups/console-jetty/src/main/history/dependencies.xml
> (original)
> +++
> geronimo/server/trunk/plugingroups/console-jetty/src/main/history/dependencies.xml
> Mon Apr 11 08:56:25 2011
> @@ -28,11 +28,6 @@
>     </dependency>
>     <dependency>
>         <groupId>org.apache.geronimo.plugins</groupId>
> -        <artifactId>osgi-console-jetty</artifactId>
> -        <type>car</type>
> -    </dependency>
> -    <dependency>
> -        <groupId>org.apache.geronimo.plugins</groupId>
>         <artifactId>plugin-console-jetty</artifactId>
>         <type>car</type>
>     </dependency>
>
> Modified:
> geronimo/server/trunk/plugingroups/console-tomcat/src/main/history/dependencies.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/console-tomcat/src/main/history/dependencies.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/plugingroups/console-tomcat/src/main/history/dependencies.xml
> (original)
> +++
> geronimo/server/trunk/plugingroups/console-tomcat/src/main/history/dependencies.xml
> Mon Apr 11 08:56:25 2011
> @@ -28,11 +28,6 @@
>     </dependency>
>     <dependency>
>         <groupId>org.apache.geronimo.plugins</groupId>
> -        <artifactId>osgi-console-tomcat</artifactId>
> -        <type>car</type>
> -    </dependency>
> -    <dependency>
> -        <groupId>org.apache.geronimo.plugins</groupId>
>         <artifactId>plugin-console-tomcat</artifactId>
>         <type>car</type>
>     </dependency>
>
> Modified:
> geronimo/server/trunk/plugingroups/eba-jetty/src/main/history/dependencies.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/eba-jetty/src/main/history/dependencies.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/plugingroups/eba-jetty/src/main/history/dependencies.xml
> (original)
> +++
> geronimo/server/trunk/plugingroups/eba-jetty/src/main/history/dependencies.xml
> Mon Apr 11 08:56:25 2011
> @@ -8,6 +8,11 @@
>     </module-id>
>     <dependency>
>         <groupId>org.apache.geronimo.configs</groupId>
> +        <artifactId>aries</artifactId>
> +        <type>car</type>
> +    </dependency>
> +    <dependency>
> +        <groupId>org.apache.geronimo.configs</groupId>
>         <artifactId>aries-deployer</artifactId>
>         <type>car</type>
>     </dependency>
>
> Modified:
> geronimo/server/trunk/plugingroups/webservices-axis2/src/main/history/dependencies.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/webservices-axis2/src/main/history/dependencies.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/plugingroups/webservices-axis2/src/main/history/dependencies.xml
> (original)
> +++
> geronimo/server/trunk/plugingroups/webservices-axis2/src/main/history/dependencies.xml
> Mon Apr 11 08:56:25 2011
> @@ -16,4 +16,14 @@
>         <artifactId>axis2-deployer</artifactId>
>         <type>car</type>
>     </dependency>
> +    <dependency>
> +        <groupId>org.apache.geronimo.configs</groupId>
> +        <artifactId>axis2-ejb-deployer</artifactId>
> +        <type>car</type>
> +    </dependency>
> +    <dependency>
> +        <groupId>org.apache.geronimo.configs</groupId>
> +        <artifactId>jaxws-tools</artifactId>
> +        <type>car</type>
> +    </dependency>
>  </plugin-artifact>
>
> Modified:
> geronimo/server/trunk/plugins/aries/aries-deployer/src/main/history/dependencies.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/aries-deployer/src/main/history/dependencies.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/plugins/aries/aries-deployer/src/main/history/dependencies.xml
> (original)
> +++
> geronimo/server/trunk/plugins/aries/aries-deployer/src/main/history/dependencies.xml
> Mon Apr 11 08:56:25 2011
> @@ -277,6 +277,11 @@
>         <type>jar</type>
>     </dependency>
>     <dependency>
> +        <groupId>org.apache.karaf.jaas</groupId>
> +        <artifactId>org.apache.karaf.jaas.boot</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
>         <groupId>org.apache.openejb</groupId>
>         <artifactId>openejb-jee</artifactId>
>         <type>jar</type>
>
> Modified:
> geronimo/server/trunk/plugins/aries/aries/src/main/history/dependencies.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/aries/src/main/history/dependencies.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/plugins/aries/aries/src/main/history/dependencies.xml
> (original)
> +++
> geronimo/server/trunk/plugins/aries/aries/src/main/history/dependencies.xml
> Mon Apr 11 08:56:25 2011
> @@ -52,6 +52,11 @@
>         <type>jar</type>
>     </dependency>
>     <dependency>
> +        <groupId>org.apache.aries.proxy</groupId>
> +        <artifactId>org.apache.aries.proxy.api</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
>         <groupId>org.apache.felix</groupId>
>         <artifactId>org.apache.felix.bundlerepository</artifactId>
>         <type>jar</type>
> @@ -292,6 +297,11 @@
>         <type>jar</type>
>     </dependency>
>     <dependency>
> +        <groupId>org.apache.karaf.jaas</groupId>
> +        <artifactId>org.apache.karaf.jaas.boot</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
>         <groupId>org.apache.openejb</groupId>
>         <artifactId>openejb-jee</artifactId>
>         <type>jar</type>
>
> Modified: geronimo/server/trunk/plugins/aries/geronimo-aries/pom.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/geronimo-aries/pom.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> --- geronimo/server/trunk/plugins/aries/geronimo-aries/pom.xml (original)
> +++ geronimo/server/trunk/plugins/aries/geronimo-aries/pom.xml Mon Apr 11
> 08:56:25 2011
> @@ -40,6 +40,10 @@
>             <version>${project.version}</version>
>         </dependency>
>         <dependency>
> +                <groupId>org.apache.aries</groupId>
> +                <artifactId>org.apache.aries.util</artifactId>
> +            </dependency>
> +        <dependency>
>             <groupId>org.apache.aries.application</groupId>
>             <artifactId>org.apache.aries.application.utils</artifactId>
>         </dependency>
>
> Modified: geronimo/server/trunk/plugins/aries/pom.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/pom.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> --- geronimo/server/trunk/plugins/aries/pom.xml (original)
> +++ geronimo/server/trunk/plugins/aries/pom.xml Mon Apr 11 08:56:25 2011
> @@ -45,6 +45,11 @@
>
>     <dependencyManagement>
>         <dependencies>
> +        <dependency>
> +                <groupId>org.apache.aries</groupId>
> +                <artifactId>org.apache.aries.util</artifactId>
> +                <version>0.2-incubating</version>
> +            </dependency>
>             <dependency>
>                 <groupId>org.apache.aries.application</groupId>
>                 <artifactId>org.apache.aries.application.utils</artifactId>
>
> Modified:
> geronimo/server/trunk/plugins/axis/axis/src/main/history/dependencies.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis/axis/src/main/history/dependencies.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/plugins/axis/axis/src/main/history/dependencies.xml
> (original)
> +++
> geronimo/server/trunk/plugins/axis/axis/src/main/history/dependencies.xml
> Mon Apr 11 08:56:25 2011
> @@ -8,6 +8,11 @@
>     </module-id>
>     <dependency>
>         <groupId>commons-logging</groupId>
> +        <artifactId>commons-logging</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
> +        <groupId>commons-logging</groupId>
>         <artifactId>commons-logging-api</artifactId>
>         <type>jar</type>
>     </dependency>
>
> Modified:
> geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml
> (original)
> +++
> geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml
> Mon Apr 11 08:56:25 2011
> @@ -13,7 +13,7 @@
>     </dependency>
>     <dependency>
>         <groupId>org.apache.geronimo.bundles</groupId>
> -        <artifactId>axiom-api</artifactId>
> +        <artifactId>axiom-all</artifactId>
>         <type>jar</type>
>     </dependency>
>     <dependency>
> @@ -23,17 +23,17 @@
>     </dependency>
>     <dependency>
>         <groupId>org.apache.geronimo.bundles</groupId>
> -        <artifactId>httpcore</artifactId>
> +        <artifactId>axis2-saaj</artifactId>
>         <type>jar</type>
>     </dependency>
>     <dependency>
>         <groupId>org.apache.geronimo.bundles</groupId>
> -        <artifactId>scannotation</artifactId>
> +        <artifactId>httpcore</artifactId>
>         <type>jar</type>
>     </dependency>
>     <dependency>
>         <groupId>org.apache.geronimo.bundles</groupId>
> -        <artifactId>woden-impl-dom</artifactId>
> +        <artifactId>scannotation</artifactId>
>         <type>jar</type>
>     </dependency>
>     <dependency>
> @@ -122,6 +122,11 @@
>         <type>jar</type>
>     </dependency>
>     <dependency>
> +        <groupId>org.apache.karaf.jaas</groupId>
> +        <artifactId>org.apache.karaf.jaas.boot</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
>         <groupId>org.apache.neethi</groupId>
>         <artifactId>neethi</artifactId>
>         <type>jar</type>
> @@ -177,13 +182,13 @@
>         <type>jar</type>
>     </dependency>
>     <dependency>
> -        <groupId>org.apache.ws.commons.axiom</groupId>
> -        <artifactId>axiom-dom</artifactId>
> +        <groupId>org.apache.woden</groupId>
> +        <artifactId>woden-impl-commons</artifactId>
>         <type>jar</type>
>     </dependency>
>     <dependency>
> -        <groupId>org.apache.ws.commons.axiom</groupId>
> -        <artifactId>axiom-impl</artifactId>
> +        <groupId>org.apache.woden</groupId>
> +        <artifactId>woden-impl-dom</artifactId>
>         <type>jar</type>
>     </dependency>
>     <dependency>
> @@ -206,4 +211,9 @@
>         <artifactId>xbean-reflect</artifactId>
>         <type>jar</type>
>     </dependency>
> +    <dependency>
> +        <groupId>org.osgi</groupId>
> +        <artifactId>org.osgi.compendium</artifactId>
> +        <type>jar</type>
> +    </dependency>
>  </plugin-artifact>
>
> Modified:
> geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml
> (original)
> +++
> geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml
> Mon Apr 11 08:56:25 2011
> @@ -27,6 +27,11 @@
>         <type>jar</type>
>     </dependency>
>     <dependency>
> +        <groupId>org.apache.aries.proxy</groupId>
> +        <artifactId>org.apache.aries.proxy.api</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
>         <groupId>org.apache.bval</groupId>
>         <artifactId>org.apache.bval.bundle</artifactId>
>         <type>jar</type>
> @@ -242,6 +247,11 @@
>         <type>jar</type>
>     </dependency>
>     <dependency>
> +        <groupId>org.apache.karaf.jaas</groupId>
> +        <artifactId>org.apache.karaf.jaas.boot</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
>         <groupId>org.apache.myfaces.core</groupId>
>         <artifactId>myfaces-bundle</artifactId>
>         <type>jar</type>
>
> Modified:
> geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/history/dependencies.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/history/dependencies.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/history/dependencies.xml
> (original)
> +++
> geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/history/dependencies.xml
> Mon Apr 11 08:56:25 2011
> @@ -117,6 +117,11 @@
>         <type>jar</type>
>     </dependency>
>     <dependency>
> +        <groupId>org.apache.karaf.jaas</groupId>
> +        <artifactId>org.apache.karaf.jaas.boot</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
>         <groupId>org.apache.openwebbeans</groupId>
>         <artifactId>openwebbeans-impl</artifactId>
>         <type>jar</type>
>
> Modified:
> geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> --- geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml
> (original)
> +++ geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml
> Mon Apr 11 08:56:25 2011
> @@ -18,7 +18,7 @@
>     </dependency>
>     <dependency>
>         <groupId>org.apache.geronimo.bundles</groupId>
> -        <artifactId>axiom-api</artifactId>
> +        <artifactId>axiom-all</artifactId>
>         <type>jar</type>
>     </dependency>
>     <dependency>
> @@ -82,11 +82,6 @@
>         <type>jar</type>
>     </dependency>
>     <dependency>
> -        <groupId>org.apache.ws.commons.axiom</groupId>
> -        <artifactId>axiom-impl</artifactId>
> -        <type>jar</type>
> -    </dependency>
> -    <dependency>
>         <groupId>org.apache.ws.commons.schema</groupId>
>         <artifactId>XmlSchema</artifactId>
>         <type>jar</type>
>
> Modified:
> geronimo/server/trunk/plugins/hotdeploy/hot-deployer/src/main/history/dependencies.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/hotdeploy/hot-deployer/src/main/history/dependencies.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/plugins/hotdeploy/hot-deployer/src/main/history/dependencies.xml
> (original)
> +++
> geronimo/server/trunk/plugins/hotdeploy/hot-deployer/src/main/history/dependencies.xml
> Mon Apr 11 08:56:25 2011
> @@ -7,6 +7,11 @@
>         <type>car</type>
>     </module-id>
>     <dependency>
> +        <groupId>org.apache.felix</groupId>
> +        <artifactId>org.apache.felix.gogo.runtime</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
>         <groupId>org.apache.geronimo.configs</groupId>
>         <artifactId>j2ee-deployer</artifactId>
>         <type>car</type>
> @@ -32,6 +37,21 @@
>         <type>jar</type>
>     </dependency>
>     <dependency>
> +        <groupId>org.apache.karaf</groupId>
> +        <artifactId>org.apache.karaf.util</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
> +        <groupId>org.apache.karaf.jaas</groupId>
> +        <artifactId>org.apache.karaf.jaas.config</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
> +        <groupId>org.apache.karaf.jaas</groupId>
> +        <artifactId>org.apache.karaf.jaas.modules</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
>         <groupId>org.apache.karaf.shell</groupId>
>         <artifactId>org.apache.karaf.shell.console</artifactId>
>         <type>jar</type>
>
> Modified:
> geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/history/dependencies.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/history/dependencies.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/history/dependencies.xml
> (original)
> +++
> geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/history/dependencies.xml
> Mon Apr 11 08:56:25 2011
> @@ -76,4 +76,9 @@
>         <artifactId>xbean-bundleutils</artifactId>
>         <type>jar</type>
>     </dependency>
> +    <dependency>
> +        <groupId>org.apache.xbean</groupId>
> +        <artifactId>xbean-finder</artifactId>
> +        <type>jar</type>
> +    </dependency>
>  </plugin-artifact>
>
> Modified:
> geronimo/server/trunk/plugins/j2ee/javaee-builder-support/src/main/history/dependencies.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/javaee-builder-support/src/main/history/dependencies.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/plugins/j2ee/javaee-builder-support/src/main/history/dependencies.xml
> (original)
> +++
> geronimo/server/trunk/plugins/j2ee/javaee-builder-support/src/main/history/dependencies.xml
> Mon Apr 11 08:56:25 2011
> @@ -132,6 +132,11 @@
>         <type>jar</type>
>     </dependency>
>     <dependency>
> +        <groupId>org.apache.karaf.jaas</groupId>
> +        <artifactId>org.apache.karaf.jaas.boot</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
>         <groupId>org.apache.openejb</groupId>
>         <artifactId>openejb-jee</artifactId>
>         <type>jar</type>
>
> Modified:
> geronimo/server/trunk/plugins/j2ee/jsr88-jar-configurer/src/main/history/dependencies.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/jsr88-jar-configurer/src/main/history/dependencies.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/plugins/j2ee/jsr88-jar-configurer/src/main/history/dependencies.xml
> (original)
> +++
> geronimo/server/trunk/plugins/j2ee/jsr88-jar-configurer/src/main/history/dependencies.xml
> Mon Apr 11 08:56:25 2011
> @@ -317,6 +317,11 @@
>         <type>jar</type>
>     </dependency>
>     <dependency>
> +        <groupId>org.apache.karaf.jaas</groupId>
> +        <artifactId>org.apache.karaf.jaas.boot</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
>         <groupId>org.apache.openejb</groupId>
>         <artifactId>openejb-jee</artifactId>
>         <type>jar</type>
>
> Modified:
> geronimo/server/trunk/plugins/j2ee/jsr88-rar-configurer/src/main/history/dependencies.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/jsr88-rar-configurer/src/main/history/dependencies.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/plugins/j2ee/jsr88-rar-configurer/src/main/history/dependencies.xml
> (original)
> +++
> geronimo/server/trunk/plugins/j2ee/jsr88-rar-configurer/src/main/history/dependencies.xml
> Mon Apr 11 08:56:25 2011
> @@ -302,6 +302,11 @@
>         <type>jar</type>
>     </dependency>
>     <dependency>
> +        <groupId>org.apache.karaf.jaas</groupId>
> +        <artifactId>org.apache.karaf.jaas.boot</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
>         <groupId>org.apache.openejb</groupId>
>         <artifactId>openejb-jee</artifactId>
>         <type>jar</type>
>
> Modified:
> geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/src/main/history/dependencies.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/src/main/history/dependencies.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/src/main/history/dependencies.xml
> (original)
> +++
> geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/src/main/history/dependencies.xml
> Mon Apr 11 08:56:25 2011
> @@ -272,6 +272,11 @@
>         <type>jar</type>
>     </dependency>
>     <dependency>
> +        <groupId>org.apache.karaf.jaas</groupId>
> +        <artifactId>org.apache.karaf.jaas.boot</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
>         <groupId>org.apache.openejb</groupId>
>         <artifactId>openejb-jee</artifactId>
>         <type>jar</type>
>
> Modified:
> geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/pom.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/pom.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> --- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/pom.xml
> (original)
> +++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/pom.xml
> Mon Apr 11 08:56:25 2011
> @@ -61,7 +61,7 @@
>                 <configuration>
>                     <instructions>
>                         <Import-Package>
> -                            org.osgi.service.command;version="0.4.0",
> +
>  org.apache.felix.service.command;version="0.4.0",
>                             *
>                         </Import-Package>
>                     </instructions>
>
> Modified:
> geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/src/main/history/dependencies.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/src/main/history/dependencies.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/src/main/history/dependencies.xml
> (original)
> +++
> geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/src/main/history/dependencies.xml
> Mon Apr 11 08:56:25 2011
> @@ -1,5 +1,5 @@
>  <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
> -<plugin-artifact xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3"
> xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2">
> +<plugin-artifact xmlns:ns2="
> http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="
> http://geronimo.apache.org/xml/ns/plugins-1.3">
>     <module-id>
>         <groupId>org.apache.geronimo.configs</groupId>
>         <artifactId>jaxws-sun-tools</artifactId>
> @@ -32,6 +32,11 @@
>         <type>jar</type>
>     </dependency>
>     <dependency>
> +        <groupId>org.apache.felix</groupId>
> +        <artifactId>org.apache.felix.gogo.runtime</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
>         <groupId>org.apache.geronimo.configs</groupId>
>         <artifactId>jaxws-deployer</artifactId>
>         <type>car</type>
> @@ -42,6 +47,21 @@
>         <type>jar</type>
>     </dependency>
>     <dependency>
> +        <groupId>org.apache.karaf</groupId>
> +        <artifactId>org.apache.karaf.util</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
> +        <groupId>org.apache.karaf.jaas</groupId>
> +        <artifactId>org.apache.karaf.jaas.config</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
> +        <groupId>org.apache.karaf.jaas</groupId>
> +        <artifactId>org.apache.karaf.jaas.modules</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
>         <groupId>org.apache.karaf.shell</groupId>
>         <artifactId>org.apache.karaf.shell.console</artifactId>
>         <type>jar</type>
>
> Modified:
> geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml
> (original)
> +++
> geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml
> Mon Apr 11 08:56:25 2011
> @@ -137,6 +137,11 @@
>         <type>jar</type>
>     </dependency>
>     <dependency>
> +        <groupId>org.apache.xbean</groupId>
> +        <artifactId>xbean-finder</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
>         <groupId>org.apache.yoko</groupId>
>         <artifactId>yoko-spec-corba</artifactId>
>         <type>jar</type>
>
> Modified:
> geronimo/server/trunk/plugins/tomcat/tomcat7/src/main/history/dependencies.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat7/src/main/history/dependencies.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/plugins/tomcat/tomcat7/src/main/history/dependencies.xml
> (original)
> +++
> geronimo/server/trunk/plugins/tomcat/tomcat7/src/main/history/dependencies.xml
> Mon Apr 11 08:56:25 2011
> @@ -57,6 +57,11 @@
>         <type>jar</type>
>     </dependency>
>     <dependency>
> +        <groupId>org.apache.geronimo.ext.tomcat</groupId>
> +        <artifactId>util</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
>         <groupId>org.apache.geronimo.framework</groupId>
>         <artifactId>geronimo-deployment</artifactId>
>         <type>jar</type>
>
> Modified:
> geronimo/server/trunk/plugins/wab/web-extender/src/main/history/dependencies.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/wab/web-extender/src/main/history/dependencies.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/plugins/wab/web-extender/src/main/history/dependencies.xml
> (original)
> +++
> geronimo/server/trunk/plugins/wab/web-extender/src/main/history/dependencies.xml
> Mon Apr 11 08:56:25 2011
> @@ -102,6 +102,11 @@
>         <type>jar</type>
>     </dependency>
>     <dependency>
> +        <groupId>org.apache.karaf.jaas</groupId>
> +        <artifactId>org.apache.karaf.jaas.boot</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
>         <groupId>org.apache.openejb</groupId>
>         <artifactId>openejb-jee</artifactId>
>         <type>jar</type>
>
> Modified:
> geronimo/server/trunk/plugins/wink/wink/src/main/history/dependencies.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/wink/wink/src/main/history/dependencies.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/plugins/wink/wink/src/main/history/dependencies.xml
> (original)
> +++
> geronimo/server/trunk/plugins/wink/wink/src/main/history/dependencies.xml
> Mon Apr 11 08:56:25 2011
> @@ -82,6 +82,11 @@
>         <type>jar</type>
>     </dependency>
>     <dependency>
> +        <groupId>org.apache.karaf.jaas</groupId>
> +        <artifactId>org.apache.karaf.jaas.boot</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
>         <groupId>org.apache.openejb</groupId>
>         <artifactId>openejb-jee</artifactId>
>         <type>jar</type>
>
> Modified: geronimo/server/trunk/pom.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> --- geronimo/server/trunk/pom.xml (original)
> +++ geronimo/server/trunk/pom.xml Mon Apr 11 08:56:25 2011
> @@ -85,7 +85,7 @@
>         <jaxbImplVersion>2.2.3_1-SNAPSHOT</jaxbImplVersion>
>
>
> <monitoringConsoleVersion>${project.version}</monitoringConsoleVersion>
> -        <pax.logging.version>1.5.3</pax.logging.version>
> +        <pax.logging.version>1.6.1</pax.logging.version>
>         <woodstoxVersion>3.2.9_1</woodstoxVersion>
>         <sxcVersion>0.7.3_1</sxcVersion>
>         <yokoVersion>1.2-SNAPSHOT</yokoVersion>
> @@ -139,12 +139,13 @@
>
>         <!-- OSGI properties -->
>
> <felix.bundlerepository.version>1.6.4</felix.bundlerepository.version>
> -        <karaf.version>2.1.2</karaf.version>
> -        <karaf.osgi.version>2.1.2</karaf.osgi.version>
> -        <aries.blueprint.version>0.2-incubating</aries.blueprint.version>
> -        <aries.jmx.version>0.2-incubating</aries.jmx.version>
> -        <aries.util.version>0.2-incubating</aries.util.version>
> -        <aries.jndi.version>0.2-incubating</aries.jndi.version>
> +        <karaf.version>2.2.1-SNAPSHOT</karaf.version>
> +        <karaf.osgi.version>2.2.1.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>
> +        <aries.proxy.version>0.3</aries.proxy.version>
>     </properties>
>
>     <dependencyManagement>
> @@ -648,7 +649,8 @@
>             <dependency>
>                 <groupId>org.slf4j</groupId>
>                 <artifactId>slf4j-api</artifactId>
> -                <version>1.5.5</version>
> +                <!--<version>1.5.5</version>-->
> +                <version>1.6.0</version>
>             </dependency>
>
>             <dependency>
> @@ -1732,7 +1734,7 @@ only found in cxf
>
> <artifactId>org.apache.felix.gogo.runtime</artifactId>
>                     </exclusion>
>                     <exclusion>
> -                        <groupId>jline</groupId>
> +                        <groupId>org.sonatype.jline</groupId>
>                         <artifactId>jline</artifactId>
>                     </exclusion>
>                     <exclusion>
> @@ -1748,14 +1750,38 @@ only found in cxf
>
>             <dependency>
>                 <groupId>org.apache.karaf.jaas</groupId>
> +                <artifactId>org.apache.karaf.jaas.modules</artifactId>
> +                <version>${karaf.version}</version>
> +            </dependency>
> +
> +            <dependency>
> +                <groupId>org.apache.karaf.jaas</groupId>
>                 <artifactId>org.apache.karaf.jaas.boot</artifactId>
>                 <version>${karaf.version}</version>
>             </dependency>
> +
> +             <dependency>
> +                <groupId>org.apache.aries.application</groupId>
> +
>  <artifactId>org.apache.aries.application.utils</artifactId>
> +                <version>${aries.util.version}</version>
> +                <exclusions>
> +                    <exclusion>
> +                       <groupId>org.apache.aries.testsupport</groupId>
> +        <artifactId>org.apache.aries.testsupport.unit</artifactId>
> +                    </exclusion>
> +                </exclusions>
> +            </dependency>
>
>             <dependency>
>                 <groupId>org.apache.aries</groupId>
>                 <artifactId>org.apache.aries.util</artifactId>
>                 <version>${aries.util.version}</version>
> +                 <exclusions>
> +                    <exclusion>
> +                       <groupId>org.apache.aries.testsupport</groupId>
> +        <artifactId>org.apache.aries.testsupport.unit</artifactId>
> +                    </exclusion>
> +                </exclusions>
>             </dependency>
>
>             <dependency>
> @@ -1783,6 +1809,18 @@ only found in cxf
>             </dependency>
>
>             <dependency>
> +                <groupId>org.apache.aries.proxy</groupId>
> +                <artifactId>org.apache.aries.proxy</artifactId>
> +                <version>${aries.proxy.version}</version>
> +                <exclusions>
> +                    <exclusion>
> +                       <groupId>org.apache.aries.testsupport</groupId>
> +        <artifactId>org.apache.aries.testsupport.unit</artifactId>
> +                    </exclusion>
> +                </exclusions>
> +            </dependency>
> +
> +            <dependency>
>                 <groupId>org.apache.aries.blueprint</groupId>
>                 <artifactId>org.apache.aries.blueprint</artifactId>
>                 <version>${aries.blueprint.version}</version>
> @@ -1791,8 +1829,14 @@ only found in cxf
>                         <groupId>org.slf4j</groupId>
>                         <artifactId>slf4j-api</artifactId>
>                     </exclusion>
> +                    <exclusion>
> +                       <groupId>org.apache.aries.testsupport</groupId>
> +        <artifactId>org.apache.aries.testsupport.unit</artifactId>
> +                    </exclusion>
>                 </exclusions>
>             </dependency>
> +
> +
>
>         </dependencies>
>     </dependencyManagement>
>
>
>

Mime
View raw message