geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r1221374 [4/4] - in /geronimo/server/trunk: ./ framework/ framework/assemblies/geronimo-framework/ framework/configs/karaf-framework/ framework/configs/rmi-naming/ framework/configs/rmi-naming/src/main/history/ framework/features/ framework...
Date Tue, 20 Dec 2011 18:03:35 GMT
Added: geronimo/server/trunk/framework/features/framework/src/main/distribution/text/etc/hotbundles-config/org.apache.felix.fileinstall-deploy.cfg
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/framework/src/main/distribution/text/etc/hotbundles-config/org.apache.felix.fileinstall-deploy.cfg?rev=1221374&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/framework/src/main/distribution/text/etc/hotbundles-config/org.apache.felix.fileinstall-deploy.cfg (added)
+++ geronimo/server/trunk/framework/features/framework/src/main/distribution/text/etc/hotbundles-config/org.apache.felix.fileinstall-deploy.cfg Tue Dec 20 18:03:33 2011
@@ -0,0 +1,22 @@
+################################################################################
+#
+#    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.
+#
+################################################################################
+
+felix.fileinstall.dir     = ${karaf.base}/hotbundles
+felix.fileinstall.tmpdir  = ${karaf.base}/repository/generated-bundles
+felix.fileinstall.poll    = 1000

Added: geronimo/server/trunk/framework/features/framework/src/main/distribution/text/etc/java.util.logging.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/framework/src/main/distribution/text/etc/java.util.logging.properties?rev=1221374&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/framework/src/main/distribution/text/etc/java.util.logging.properties (added)
+++ geronimo/server/trunk/framework/features/framework/src/main/distribution/text/etc/java.util.logging.properties Tue Dec 20 18:03:33 2011
@@ -0,0 +1,23 @@
+################################################################################
+#
+#    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.
+#
+################################################################################
+
+# Empty java.util.logging.properties to prevent the log to stderr, so that
+# all logs will be delegated to pax logging JUL handler only
+
+

Propchange: geronimo/server/trunk/framework/features/framework/src/main/distribution/text/etc/java.util.logging.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/features/framework/src/main/distribution/text/etc/java.util.logging.properties
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/features/framework/src/main/distribution/text/etc/java.util.logging.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/framework/features/framework/src/main/distribution/text/etc/org.apache.karaf.log.cfg
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/framework/src/main/distribution/text/etc/org.apache.karaf.log.cfg?rev=1221374&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/framework/src/main/distribution/text/etc/org.apache.karaf.log.cfg (added)
+++ geronimo/server/trunk/framework/features/framework/src/main/distribution/text/etc/org.apache.karaf.log.cfg Tue Dec 20 18:03:33 2011
@@ -0,0 +1,22 @@
+################################################################################
+#
+#    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.
+#
+################################################################################
+
+#
+size = 500
+pattern = %d{ABSOLUTE} | %-5.5p | %-16.16t | %-32.32c{1} | %-32.32C %4L | %X{bundle.id} - %X{bundle.name} - %X{bundle.version} | %m%n

Added: geronimo/server/trunk/framework/features/framework/src/main/distribution/text/etc/org.apache.karaf.shell.cfg
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/framework/src/main/distribution/text/etc/org.apache.karaf.shell.cfg?rev=1221374&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/framework/src/main/distribution/text/etc/org.apache.karaf.shell.cfg (added)
+++ geronimo/server/trunk/framework/features/framework/src/main/distribution/text/etc/org.apache.karaf.shell.cfg Tue Dec 20 18:03:33 2011
@@ -0,0 +1,40 @@
+################################################################################
+#
+#    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.
+#
+################################################################################
+
+#
+# These properties are used to configure karafs ssh shell.
+#
+
+#
+# Via sshPort and sshHost you define at which address you can login into karaf.
+#
+sshPort=8101
+sshHost=0.0.0.0
+sshRole=org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal:admin
+
+#
+# sshRealm defines which jaas domain to use for password authentication.
+#
+sshRealm=geronimo-admin
+
+#
+# The location of the hostKey file defines where the private/public key of the server
+# could be found. If no file is at the defined location it will be ignored.
+#
+hostKey=${karaf.base}/etc/host.key

Added: geronimo/server/trunk/framework/features/framework/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/framework/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg?rev=1221374&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/framework/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg (added)
+++ geronimo/server/trunk/framework/features/framework/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg Tue Dec 20 18:03:33 2011
@@ -0,0 +1,77 @@
+################################################################################
+#
+#    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.
+#
+################################################################################
+
+#
+# If set to true, the following property will not allow any certificate to be used
+# when accessing maven repositories through SSL
+#
+#org.ops4j.pax.url.mvn.certificateCheck=
+
+#
+# Path to the local maven settings file.
+# The repositories defined in this file will be automatically added to the list
+# of default repositories if the 'org.ops4j.pax.url.mvn.repositories' property
+# below is not set.
+# The following locations are checked for the existence of the settings.xml file
+#   * 1. looks for the specified url
+#   * 2. if not found looks for ${user.home}/.m2/settings.xml
+#   * 3. if not found looks for ${maven.home}/conf/settings.xml
+#   * 4. if not found looks for ${M2_HOME}/conf/settings.xml
+#
+#org.ops4j.pax.url.mvn.settings=
+
+#
+# Path to the local maven repository which is used to avoid downloading
+# artifacts when they already exist locally.
+# The value of this property will be extracted from the settings.xml file
+# above, or defaulted to:
+#     System.getProperty( "user.home" ) + "/.m2/repository"
+#
+#org.ops4j.pax.url.mvn.localRepository=
+
+#
+# Comma separated list of repositories scanned when resolving an artifact.
+# Those repositories will be checked before iterating through the
+#    below list of repositories and even before the local repository
+# A repository url can be appended with zero or more of the following flags:
+#    @snapshots  : the repository contains snaphots
+#    @noreleases : the repository does not contain any released artifacts
+#
+# The following property value will add the system folder as a repo.
+#
+org.ops4j.pax.url.mvn.defaultRepositories=file:${karaf.home}/repository@snapshots
+
+#
+# Comma separated list of repositories scanned when resolving an artifact.
+# The default list includes the following repositories:
+#    http://repo1.maven.org/maven2
+#    http://repository.ops4j.org/maven2
+# To add repositories to the default ones, prepend '+' to the list of repositories
+# to add.
+# A repository url can be appended with zero or more of the following flags:
+#    @snapshots  : the repository contains snaphots
+#    @noreleases : the repository does not contain any released artifacts
+#
+#org.ops4j.pax.url.mvn.repositories= \
+#    http://repo1.maven.org/maven2, \
+#    http://repository.apache.org/content/groups/snapshots-group@snapshots@noreleases, \
+#    http://repository.ops4j.org/maven2, \
+#    http://svn.apache.org/repos/asf/servicemix/m2-repo, \
+#    http://repository.springsource.com/maven/bundles/release, \
+#    http://repository.springsource.com/maven/bundles/external

Added: geronimo/server/trunk/framework/features/framework/src/main/distribution/text/etc/shell.init.script
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/framework/src/main/distribution/text/etc/shell.init.script?rev=1221374&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/framework/src/main/distribution/text/etc/shell.init.script (added)
+++ geronimo/server/trunk/framework/features/framework/src/main/distribution/text/etc/shell.init.script Tue Dec 20 18:03:33 2011
@@ -0,0 +1,26 @@
+//
+// 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.
+//
+// This script is run each time a shell is created.
+// You can define here closures or variables that will be available
+// in each session.
+//
+
+ld = { log:display $args } ;
+lde = { log:display-exception $args } ;
+la = { osgi:list -t 0 $args } ;

Added: geronimo/server/trunk/framework/features/framework/src/main/distribution/text/etc/system.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/framework/src/main/distribution/text/etc/system.properties?rev=1221374&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/framework/src/main/distribution/text/etc/system.properties (added)
+++ geronimo/server/trunk/framework/features/framework/src/main/distribution/text/etc/system.properties Tue Dec 20 18:03:33 2011
@@ -0,0 +1,93 @@
+################################################################################
+#
+#    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.
+#
+################################################################################
+
+
+# Log level when the pax-logging service is not available
+# This level will only be used while the pax-logging service bundle
+# is not fully available.
+# To change log levels, please refer to the org.ops4j.pax.logging.cfg file
+# instead.
+org.ops4j.pax.logging.DefaultServiceLog.level=ERROR
+
+#
+# Name of this karaf instance.
+#
+karaf.name=root
+
+#
+# Default repository where bundles will be loaded from before using
+# other maven repositories.  For the full maven configuration, see
+# the org.ops4j.pax.url.mvn.cfg file.
+#
+karaf.default.repository=repository
+
+#
+# Location of a shell script that will be run when starting a shell
+# session.  This script can be used to create aliases and define
+# additional commands.
+#
+karaf.shell.init.script=${karaf.home}/etc/shell.init.script
+
+#
+# Set this empty property to avoid errors when validating xml documents.
+#
+xml.catalog.files=
+
+#
+# Suppress the bell in the console when hitting backspace too many times
+# for example
+#
+jline.nobell=true
+
+#
+# Print stack trackes in Karaf shell
+# 
+# karaf.printStackTraces = true
+
+### Set OpenEJB LogFactory implementation
+openejb.log.factory=org.apache.openejb.util.PaxLogStreamFactory
+
+#
+# List of directories to remove when starting server with -clean option.
+#
+geronimo.cleanDirectoryList=${karaf.base}/var/catalina/work
+
+#
+# Debug level for Felix
+#
+#felix.log.level=4
+
+#
+# Debug options for Equinox 
+#
+#osgi.debug=${karaf.home}/etc/equinox-debug.properties
+
+
+#
+# Allows applications that assume TCCL to be a URLClassLoader to still run ok, default is true.
+#
+org.apache.geronimo.equinox.useURLClassLoader=true
+
+
+#
+# org.apache.catalina.STRICT_SERVLET_COMPLIANCE is false by default. 
+# You can override this by uncommenting the following line.
+# See: http://tomcat.apache.org/tomcat-7.0-doc/config/systemprops.html#Specification
+#
+#org.apache.catalina.STRICT_SERVLET_COMPLIANCE=true

Propchange: geronimo/server/trunk/framework/features/framework/src/main/distribution/text/etc/system.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/features/framework/src/main/distribution/text/etc/system.properties
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/features/framework/src/main/distribution/text/etc/system.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/framework/features/framework/src/main/distribution/text/hotbundles/README.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/framework/src/main/distribution/text/hotbundles/README.txt?rev=1221374&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/framework/src/main/distribution/text/hotbundles/README.txt (added)
+++ geronimo/server/trunk/framework/features/framework/src/main/distribution/text/hotbundles/README.txt Tue Dec 20 18:03:33 2011
@@ -0,0 +1 @@
+OSGi bundles put to current directory will be deployed to geronimo automatically. 
\ No newline at end of file

Propchange: geronimo/server/trunk/framework/features/framework/src/main/distribution/text/hotbundles/README.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/features/framework/src/main/distribution/text/hotbundles/README.txt
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/features/framework/src/main/distribution/text/hotbundles/README.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/framework/features/framework/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/framework/src/main/history/dependencies.xml?rev=1221374&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/framework/src/main/history/dependencies.xml (added)
+++ geronimo/server/trunk/framework/features/framework/src/main/history/dependencies.xml Tue Dec 20 18:03:33 2011
@@ -0,0 +1,414 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<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.framework</groupId>
+        <artifactId>karaf-framework</artifactId>
+        <version>3.0-beta-1-SNAPSHOT</version>
+        <type>car</type>
+    </module-id>
+    <dependency>
+        <groupId>asm</groupId>
+        <artifactId>asm-all</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>commons-cli</groupId>
+        <artifactId>commons-cli</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>commons-lang</groupId>
+        <artifactId>commons-lang</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.aries</groupId>
+        <artifactId>org.apache.aries.util</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.aries.jmx</groupId>
+        <artifactId>org.apache.aries.jmx</artifactId>
+        <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.commons</groupId>
+        <artifactId>commons-jexl</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>org.apache.felix.bundlerepository</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>org.apache.felix.configadmin</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>org.apache.felix.fileinstall</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>org.apache.felix.framework</artifactId>
+        <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.felix</groupId>
+        <artifactId>org.apache.felix.metatype</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>org.apache.felix.prefs</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.bundles</groupId>
+        <artifactId>jaxb-impl</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.bundles</groupId>
+        <artifactId>woodstox-core-asl</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.ext.aries.blueprint</groupId>
+        <artifactId>org.apache.aries.blueprint</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-bundle-recorder</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-cli</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-common</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-crypto</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-deploy-config</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-deploy-jsr88</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-deploy-tool</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-deployment</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-kernel</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-main</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-obr</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-pax-logging</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-plugin</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-service-builder</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-shell</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-shell-base</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-shell-diagnose</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-system</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-activation_1.1_spec</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-jaxb_2.2_spec</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-osgi-registry</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-servlet_3.0_spec</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-stax-api_1.2_spec</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.karaf</groupId>
+        <artifactId>org.apache.karaf.management</artifactId>
+        <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>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.karaf.deployer</groupId>
+        <artifactId>org.apache.karaf.deployer.features</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.karaf.features</groupId>
+        <artifactId>org.apache.karaf.features.command</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.karaf.features</groupId>
+        <artifactId>org.apache.karaf.features.core</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.karaf.features</groupId>
+        <artifactId>org.apache.karaf.features.management</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.commands</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.karaf.shell</groupId>
+        <artifactId>org.apache.karaf.shell.config</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.karaf.shell</groupId>
+        <artifactId>org.apache.karaf.shell.console</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.karaf.shell</groupId>
+        <artifactId>org.apache.karaf.shell.log</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.karaf.shell</groupId>
+        <artifactId>org.apache.karaf.shell.obr</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.karaf.shell</groupId>
+        <artifactId>org.apache.karaf.shell.osgi</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.karaf.shell</groupId>
+        <artifactId>org.apache.karaf.shell.packages</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.karaf.shell</groupId>
+        <artifactId>org.apache.karaf.shell.ssh</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.mina</groupId>
+        <artifactId>mina-core</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.ant</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.cglib</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.xmlresolver</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.xpp3</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.xstream</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.sshd</groupId>
+        <artifactId>sshd-core</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.xbean</groupId>
+        <artifactId>xbean-bundleutils</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.xbean</groupId>
+        <artifactId>xbean-finder</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.xbean</groupId>
+        <artifactId>xbean-reflect</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.yoko</groupId>
+        <artifactId>yoko-rmi-spec</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.yoko</groupId>
+        <artifactId>yoko-spec-corba</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.codehaus.woodstox</groupId>
+        <artifactId>stax2-api</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.eclipse.osgi</groupId>
+        <artifactId>org.eclipse.osgi</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.ops4j.pax.logging</groupId>
+        <artifactId>pax-logging-api</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.ops4j.pax.url</groupId>
+        <artifactId>pax-url-mvn</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.ops4j.pax.url</groupId>
+        <artifactId>pax-url-wrap</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>

Propchange: geronimo/server/trunk/framework/features/framework/src/main/history/dependencies.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/features/framework/src/main/history/dependencies.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/features/framework/src/main/history/dependencies.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/framework/features/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/pom.xml?rev=1221374&view=auto
==============================================================================
--- geronimo/server/trunk/framework/features/pom.xml (added)
+++ geronimo/server/trunk/framework/features/pom.xml Tue Dec 20 18:03:33 2011
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    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.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>framework</artifactId>
+        <version>3.0-beta-1-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.framework.features</groupId>
+    <artifactId>features</artifactId>
+    <name>Geronimo Framework, Features</name>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>framework</module>
+    </modules>
+
+<!--
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                &lt;!&ndash; Install as extention to allow 'car' packaging to be used. &ndash;&gt;
+                <extensions>true</extensions>
+                <configuration>
+                    <systemProperties>
+                        <geronimo.build.car>true</geronimo.build.car>
+                    </systemProperties>
+                    <archive>
+                        &lt;!&ndash; Do not include META-INF/maven to avoid long file problems on windows &ndash;&gt;
+                        <addMavenDescriptor>false</addMavenDescriptor>
+                    </archive>
+                    <osiApproved>true</osiApproved>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                        <useTransitiveDependencies>true</useTransitiveDependencies>
+                    </useMavenDependencies>
+                    <warnOnDependencyChange>${warnOnDependencyChange}</warnOnDependencyChange>
+                    <logDependencyChanges>${logDependencyChanges}</logDependencyChanges>
+                    <overwriteChangedDependencies>${overwriteChangedDependencies}</overwriteChangedDependencies>
+                    <commonInstance>
+                        <plugin-artifact>
+                            <geronimo-version>${geronimoVersion}</geronimo-version>
+                            <jvm-version>1.6</jvm-version>
+                            &lt;!&ndash;<source-repository>http://www.geronimoplugins.com/repository/geronimo-2.1</source-repository>&ndash;&gt;
+                            <source-repository>${pluginSrcRepoLocal}</source-repository>
+                            <source-repository>${pluginSrcRepoCentral}</source-repository>
+                            <source-repository>${pluginSrcRepoApacheSnapshots}</source-repository>
+                            <artifact-alias key="${project.groupId}/${project.artifactId}//car">${project.groupId}/${project.artifactId}/${project.version}/car</artifact-alias>
+                        </plugin-artifact>
+                    </commonInstance>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+-->
+
+    <profiles>
+        <profile>
+            <id>all-subprojects</id>
+            <!-- use for things like versions:set and perhaps release when build has to run on all projects -->
+            <modules>
+                <module>geronimo-gbean-deployer/src/it/j2ee-system-it1</module>
+                <module>geronimo-gbean-deployer/src/it/j2ee-system-it2</module>
+                <module>geronimo-gbean-deployer/src/it/metadatageneration-it3</module>
+                <module>geronimo-gbean-deployer/src/it/metadatageneration-it4</module>
+            </modules>
+        </profile>
+    </profiles>
+
+</project>

Propchange: geronimo/server/trunk/framework/features/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/features/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/features/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/server/trunk/framework/modules/geronimo-blueprint/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-blueprint/pom.xml?rev=1221374&r1=1221373&r2=1221374&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-blueprint/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-blueprint/pom.xml Tue Dec 20 18:03:33 2011
@@ -33,9 +33,13 @@
     <description>Classes to adapt blueprint to geronimo</description>
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.ext.aries.blueprint</groupId>
+            <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.aries.proxy</groupId>
+            <artifactId>org.apache.aries.proxy</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>

Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundle.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundle.java?rev=1221374&r1=1221373&r2=1221374&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundle.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundle.java Tue Dec 20 18:03:33 2011
@@ -212,7 +212,22 @@ public class MockBundle implements Bundl
         return null;
     }
 
+    @Override
+    public <A> A adapt(Class<A> aClass) {
+        return null;
+    }
+
+    @Override
+    public File getDataFile(String s) {
+        return null;
+    }
+
     public void setBundleContext(BundleContext bundleContext) {
         this.bundleContext = bundleContext;
     }
+
+    @Override
+    public int compareTo(Bundle bundle) {
+        return 0;
+    }
 }

Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundleContext.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundleContext.java?rev=1221374&r1=1221373&r2=1221374&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundleContext.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundleContext.java Tue Dec 20 18:03:33 2011
@@ -22,6 +22,7 @@ package org.apache.geronimo.kernel.osgi;
 
 import java.io.InputStream;
 import java.io.File;
+import java.util.Collection;
 import java.util.Dictionary;
 import java.util.Map;
 import java.util.HashMap;
@@ -155,6 +156,11 @@ public class MockBundleContext implement
     public void removeFrameworkListener(FrameworkListener frameworkListener) {
     }
 
+    @Override
+    public <S> ServiceRegistration<S> registerService(Class<S> sClass, S s, Dictionary<String, ?> stringDictionary) {
+        return null;
+    }
+
     public ServiceRegistration registerService(String[] strings, Object o, Dictionary dictionary) {
         return null;
     }
@@ -177,6 +183,16 @@ public class MockBundleContext implement
         return serviceReferences.get(s);
     }
 
+    @Override
+    public <S> ServiceReference<S> getServiceReference(Class<S> sClass) {
+        return null;
+    }
+
+    @Override
+    public <S> Collection<ServiceReference<S>> getServiceReferences(Class<S> sClass, String s) throws InvalidSyntaxException {
+        return null;
+    }
+
     public Object getService(ServiceReference serviceReference) {
         return ((MockServiceReference)serviceReference).service;
     }
@@ -193,6 +209,11 @@ public class MockBundleContext implement
         return null;
     }
 
+    @Override
+    public Bundle getBundle(String s) {
+        return null;
+    }
+
     private Artifact getArtifactByLocation(String location) {
         Artifact configId = locations.get(location);
         if (configId == null) {

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=1221374&r1=1221373&r2=1221374&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-shell-base/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-shell-base/pom.xml Tue Dec 20 18:03:33 2011
@@ -60,7 +60,7 @@
         </dependency>        
       
         <dependency>
-            <groupId>org.apache.geronimo.ext.aries.blueprint</groupId>
+            <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint</artifactId>
         </dependency>
     </dependencies>

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=1221374&r1=1221373&r2=1221374&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-shell-diagnose/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-shell-diagnose/pom.xml Tue Dec 20 18:03:33 2011
@@ -48,7 +48,7 @@
             </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.ext.aries.blueprint</groupId>
+            <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint</artifactId>
         </dependency>
         

Modified: geronimo/server/trunk/framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/pom.xml?rev=1221374&r1=1221373&r2=1221374&view=diff
==============================================================================
--- geronimo/server/trunk/framework/pom.xml (original)
+++ geronimo/server/trunk/framework/pom.xml Tue Dec 20 18:03:33 2011
@@ -34,13 +34,14 @@
     <packaging>pom</packaging>
     
     <properties>        
-        <felix.configadmin.version>1.2.4</felix.configadmin.version>        
-        <felix.framework.version>3.0.2</felix.framework.version>       
-        <pax.url.version>1.1.2</pax.url.version>        
+        <!--<felix.configadmin.version>1.2.4</felix.configadmin.version>        -->
+        <!--<felix.framework.version>3.0.2</felix.framework.version>       -->
+        <!--<pax.url.version>1.1.2</pax.url.version>        -->
     </properties>
     
     <dependencyManagement>
         <dependencies>
+<!--
             <dependency>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>org.apache.felix.framework</artifactId>
@@ -71,7 +72,7 @@
                         <artifactId>org.osgi.core</artifactId>
                     </exclusion>
                     <exclusion>
-                        <!-- see FELIX-2179  -->
+                        &lt;!&ndash; see FELIX-2179  &ndash;&gt;
                         <groupId>junit</groupId>
                         <artifactId>junit</artifactId>
                     </exclusion>
@@ -115,6 +116,7 @@
                 <artifactId>pax-url-wrap</artifactId>
                 <version>${pax.url.version}</version>
             </dependency>
+-->
 
             <dependency>
                 <groupId>org.apache.geronimo.bundles</groupId>
@@ -183,6 +185,7 @@
             <modules>
                 <module>modules</module>
                 <module>buildsupport</module>
+                <module>features</module>
                 <module>configs</module>
                 <module>plugingroups</module>
                 <module>assemblies</module>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=1221374&r1=1221373&r2=1221374&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Tue Dec 20 18:03:33 2011
@@ -150,17 +150,24 @@
         <!-- OSGI properties -->
         <equinox.version>3.7.1.R37x_v20110808_1106</equinox.version>    
         <felix.bundlerepository.version>1.6.6</felix.bundlerepository.version>
-        <karaf.version>2.2.1</karaf.version>
-        <karaf.osgi.version>2.2.1</karaf.osgi.version>
-        <aries.blueprint.version>0.3.0.1</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>
+        <karaf.version>3.0.0-SNAPSHOT</karaf.version>
+        <karaf.osgi.version>3.0.0-SNAPSHOT</karaf.osgi.version>
+        <aries.blueprint.version>0.4</aries.blueprint.version>
+        <aries.jmx.version>0.3.1-SNAPSHOT</aries.jmx.version>
+        <aries.util.version>0.4</aries.util.version>
+        <aries.jndi.version>0.3.1-SNAPSHOT</aries.jndi.version>
+        <aries.proxy.version>0.4</aries.proxy.version>
     </properties>
 
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>org.apache.karaf</groupId>
+                <artifactId>karaf</artifactId>
+                <version>${karaf.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
 
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
@@ -254,7 +261,7 @@
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-jaxb_2.2_spec</artifactId>
-                <version>1.0.1</version>
+                <version>1.1-SNAPSHOT</version>
             </dependency>
 
             <dependency>
@@ -1691,7 +1698,7 @@ only found in cxf
             <dependency>
                 <groupId>org.osgi</groupId>
                 <artifactId>org.osgi.core</artifactId>
-                <version>4.2.0</version>
+                <version>4.3.0</version>
             </dependency>
 
             <dependency>
@@ -1832,21 +1839,25 @@ only found in cxf
                 </exclusions> 
             </dependency>
             
-            <dependency>
-                <groupId>org.apache.geronimo.ext.aries.blueprint</groupId>
-                <artifactId>org.apache.aries.blueprint</artifactId>
-                <version>${aries.blueprint.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <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>
+            <!--<dependency>-->
+                <!--<groupId>org.apache.geronimo.ext.aries.blueprint</groupId>-->
+                <!--<artifactId>org.apache.aries.blueprint</artifactId>-->
+                <!--<version>${aries.blueprint.version}</version>-->
+                <!--<exclusions>-->
+                    <!--<exclusion>-->
+                        <!--<groupId>org.slf4j</groupId>-->
+                        <!--<artifactId>slf4j-api</artifactId>-->
+                    <!--</exclusion>-->
+                    <!--<exclusion>-->
+                        <!--<groupId>org.apache.aries.testsupport</groupId>-->
+                        <!--<artifactId>org.apache.aries.testsupport.unit</artifactId>-->
+                    <!--</exclusion>-->
+                    <!--<exclusion>-->
+                        <!--<groupId>commons-logging</groupId>-->
+                        <!--<artifactId>commons-logging</artifactId>-->
+                    <!--</exclusion>-->
+                <!--</exclusions>-->
+            <!--</dependency>-->
             
             <dependency>
                 <groupId>org.apache.juddi</groupId>
@@ -2251,10 +2262,20 @@ only found in cxf
                         </execution>
                     </executions>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.karaf.tooling</groupId>
+                    <artifactId>karaf-maven-plugin</artifactId>
+                    <version>3.0.0-SNAPSHOT</version>
+                    <extensions>true</extensions>
+                </plugin>
             </plugins>
         </pluginManagement>
         <plugins>
             <plugin>
+                <groupId>org.apache.karaf.tooling</groupId>
+                <artifactId>karaf-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
                 <executions>



Mime
View raw message