You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2012/10/02 03:17:28 UTC
svn commit: r1392704 - in /karaf/branches/karaf-2.3.x: ./
assemblies/apache-karaf/src/main/filtered-resources/bin/
assemblies/apache-karaf/src/main/filtered-resources/etc/
assemblies/apache-karaf/src/main/filtered-resources/minimal/
assemblies/features...
Author: gnodet
Date: Tue Oct 2 01:17:27 2012
New Revision: 1392704
URL: http://svn.apache.org/viewvc?rev=1392704&view=rev
Log:
[KARAF-1868] Upgrade aries bundles to 1.0.1 (blueprint-core, jmx-core, transaction-manager, jpa-container-context)
Modified:
karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/bin/admin
karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/bin/admin.bat
karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/etc/startup.properties
karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/minimal/startup.properties
karaf/branches/karaf-2.3.x/assemblies/features/enterprise/src/main/resources/features.xml
karaf/branches/karaf-2.3.x/assemblies/features/standard/src/main/resources/features.xml
karaf/branches/karaf-2.3.x/pom.xml
Modified: karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/bin/admin
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/bin/admin?rev=1392704&r1=1392703&r2=1392704&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/bin/admin (original)
+++ karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/bin/admin Tue Oct 2 01:17:27 2012
@@ -315,7 +315,7 @@ init() {
run() {
- CLASSPATH=${KARAF_HOME}/system/org/apache/karaf/admin/org.apache.karaf.admin.command/${project.version}/org.apache.karaf.admin.command-${project.version}.jar:${KARAF_HOME}/system/org/apache/karaf/admin/org.apache.karaf.admin.core/${project.version}/org.apache.karaf.admin.core-${project.version}.jar:${KARAF_HOME}/system/org/apache/karaf/shell/org.apache.karaf.shell.console/${project.version}/org.apache.karaf.shell.console-${project.version}.jar:${KARAF_HOME}/system/org/apache/aries/blueprint/org.apache.aries.blueprint/${aries.blueprint.version}/org.apache.aries.blueprint-${aries.blueprint.version}.jar:${KARAF_HOME}/system/org/ops4j/pax/logging/pax-logging-api/${pax.logging.version}/pax-logging-api-${pax.logging.version}.jar:${KARAF_HOME}/system/org/apache/felix/org.apache.felix.framework/${felix.framework.version}/org.apache.felix.framework-${felix.framework.version}.jar
+ CLASSPATH=${KARAF_HOME}/system/org/apache/karaf/admin/org.apache.karaf.admin.command/${project.version}/org.apache.karaf.admin.command-${project.version}.jar:${KARAF_HOME}/system/org/apache/karaf/admin/org.apache.karaf.admin.core/${project.version}/org.apache.karaf.admin.core-${project.version}.jar:${KARAF_HOME}/system/org/apache/karaf/shell/org.apache.karaf.shell.console/${project.version}/org.apache.karaf.shell.console-${project.version}.jar:${KARAF_HOME}/system/org/apache/aries/blueprint/org.apache.aries.blueprint.api/${aries.blueprint.api.version}/org.apache.aries.blueprint.api-${aries.blueprint.api.version}.jar:${KARAF_HOME}/system/org/apache/aries/blueprint/org.apache.aries.blueprint.core/${aries.blueprint.core.version}/org.apache.aries.blueprint.core-${aries.blueprint.core.version}.jar:${KARAF_HOME}/system/org/apache/aries/blueprint/org.apache.aries.blueprint.cm/${aries.blueprint.cm.version}/org.apache.aries.blueprint.cm-${aries.blueprint.cm.version}.jar:${KARAF_H
OME}/system/org/ops4j/pax/logging/pax-logging-api/${pax.logging.version}/pax-logging-api-${pax.logging.version}.jar:${KARAF_HOME}/system/org/apache/felix/org.apache.felix.framework/${felix.framework.version}/org.apache.felix.framework-${felix.framework.version}.jar
if $cygwin; then
KARAF_HOME=`cygpath --path --windows "$KARAF_HOME"`
Modified: karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/bin/admin.bat
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/bin/admin.bat?rev=1392704&r1=1392703&r2=1392704&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/bin/admin.bat (original)
+++ karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/bin/admin.bat Tue Oct 2 01:17:27 2012
@@ -111,7 +111,7 @@ if "%KARAF_DEBUG%" == "" goto :KARAF_DEB
call :warn Enabling Java debug options: %JAVA_DEBUG_OPTS%
:KARAF_DEBUG_END
-set CLASSPATH=%KARAF_HOME%\system\org\apache\karaf\admin\org.apache.karaf.admin.command\${project.version}\org.apache.karaf.admin.command-${project.version}.jar;%KARAF_HOME%\system\org\apache\karaf\admin\org.apache.karaf.admin.core\${project.version}\org.apache.karaf.admin.core-${project.version}.jar;%KARAF_HOME%\system\org\apache\karaf\shell\org.apache.karaf.shell.console\${project.version}\org.apache.karaf.shell.console-${project.version}.jar;%KARAF_HOME%\system\org\apache\aries\blueprint\org.apache.aries.blueprint\${aries.blueprint.version}\org.apache.aries.blueprint-${aries.blueprint.version}.jar;%KARAF_HOME%\system\org\ops4j\pax\logging\pax-logging-api\${pax.logging.version}\pax-logging-api-${pax.logging.version}.jar;%KARAF_HOME%\system\org\apache\felix\org.apache.felix.framework\${felix.framework.version}\org.apache.felix.framework-${felix.framework.version}.jar
+set CLASSPATH=%KARAF_HOME%\system\org\apache\karaf\admin\org.apache.karaf.admin.command\${project.version}\org.apache.karaf.admin.command-${project.version}.jar;%KARAF_HOME%\system\org\apache\karaf\admin\org.apache.karaf.admin.core\${project.version}\org.apache.karaf.admin.core-${project.version}.jar;%KARAF_HOME%\system\org\apache\karaf\shell\org.apache.karaf.shell.console\${project.version}\org.apache.karaf.shell.console-${project.version}.jar;%KARAF_HOME%\system\org\apache\aries\blueprint\org.apache.aries.blueprint.api\${aries.blueprint.api.version}\org.apache.aries.blueprint.api-${aries.blueprint.api.version}.jar;%KARAF_HOME%\system\org\apache\aries\blueprint\org.apache.aries.blueprint.core\${aries.blueprint.core.version}\org.apache.aries.blueprint.core-${aries.blueprint.core.version}.jar;%KARAF_HOME%\system\org\apache\aries\blueprint\org.apache.aries.blueprint.cm\${aries.blueprint.cm.version}\org.apache.aries.blueprint.cm-${aries.blueprint.cm.version}.jar;%KARAF_HOME%\sy
stem\org\ops4j\pax\logging\pax-logging-api\${pax.logging.version}\pax-logging-api-${pax.logging.version}.jar;%KARAF_HOME%\system\org\apache\felix\org.apache.felix.framework\${felix.framework.version}\org.apache.felix.framework-${felix.framework.version}.jar
:EXECUTE
if "%SHIFT%" == "true" SET ARGS=%2 %3 %4 %5 %6 %7 %8
Modified: karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/etc/startup.properties
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/etc/startup.properties?rev=1392704&r1=1392703&r2=1392704&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/etc/startup.properties (original)
+++ karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/etc/startup.properties Tue Oct 2 01:17:27 2012
@@ -38,8 +38,8 @@ org/apache/aries/org.apache.aries.util/$
org/apache/aries/proxy/org.apache.aries.proxy.api/${aries.proxy.api.version}/org.apache.aries.proxy.api-${aries.proxy.api.version}.jar=20
org/apache/aries/proxy/org.apache.aries.proxy.impl/${aries.proxy.version}/org.apache.aries.proxy.impl-${aries.proxy.version}.jar=20
org/apache/aries/blueprint/org.apache.aries.blueprint.api/${aries.blueprint.api.version}/org.apache.aries.blueprint.api-${aries.blueprint.api.version}.jar=20
-org/apache/aries/blueprint/org.apache.aries.blueprint.core/${aries.blueprint.version}/org.apache.aries.blueprint.core-${aries.blueprint.version}.jar=20
-org/apache/aries/blueprint/org.apache.aries.blueprint.cm/${aries.blueprint.version}/org.apache.aries.blueprint.cm-${aries.blueprint.version}.jar=20
+org/apache/aries/blueprint/org.apache.aries.blueprint.core/${aries.blueprint.core.version}/org.apache.aries.blueprint.core-${aries.blueprint.core.version}.jar=20
+org/apache/aries/blueprint/org.apache.aries.blueprint.cm/${aries.blueprint.cm.version}/org.apache.aries.blueprint.cm-${aries.blueprint.cm.version}.jar=20
org/apache/karaf/shell/org.apache.karaf.shell.console/${project.version}/org.apache.karaf.shell.console-${project.version}.jar=25
@@ -62,9 +62,9 @@ org/apache/karaf/diagnostic/org.apache.k
org/apache/karaf/management/org.apache.karaf.management.server/${project.version}/org.apache.karaf.management.server-${project.version}.jar=30
org/apache/aries/jmx/org.apache.aries.jmx.api/${aries.jmx.api.version}/org.apache.aries.jmx.api-${aries.jmx.api.version}.jar=30
-org/apache/aries/jmx/org.apache.aries.jmx.core/${aries.jmx.version}/org.apache.aries.jmx.core-${aries.jmx.version}.jar=30
-org/apache/aries/jmx/org.apache.aries.jmx.blueprint.api/${aries.jmx.version}/org.apache.aries.jmx.blueprint.api-${aries.jmx.version}.jar=30
-org/apache/aries/jmx/org.apache.aries.jmx.blueprint.core/${aries.jmx.version}/org.apache.aries.jmx.blueprint.core-${aries.jmx.version}.jar=30
+org/apache/aries/jmx/org.apache.aries.jmx.core/${aries.jmx.core.version}/org.apache.aries.jmx.core-${aries.jmx.core.version}.jar=30
+org/apache/aries/jmx/org.apache.aries.jmx.blueprint.api/${aries.jmx.blueprint.api.version}/org.apache.aries.jmx.blueprint.api-${aries.jmx.blueprint.api.version}.jar=30
+org/apache/aries/jmx/org.apache.aries.jmx.blueprint.core/${aries.jmx.blueprint.core.version}/org.apache.aries.jmx.blueprint.core-${aries.jmx.blueprint.core.version}.jar=30
org/apache/karaf/admin/org.apache.karaf.admin.core/${project.version}/org.apache.karaf.admin.core-${project.version}.jar=30
org/apache/karaf/admin/org.apache.karaf.admin.command/${project.version}/org.apache.karaf.admin.command-${project.version}.jar=30
Modified: karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/minimal/startup.properties
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/minimal/startup.properties?rev=1392704&r1=1392703&r2=1392704&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/minimal/startup.properties (original)
+++ karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/minimal/startup.properties Tue Oct 2 01:17:27 2012
@@ -38,14 +38,13 @@ org/apache/aries/org.apache.aries.util/$
org/apache/aries/proxy/org.apache.aries.proxy.api/${aries.proxy.api.version}/org.apache.aries.proxy.api-${aries.proxy.api.version}.jar=20
org/apache/aries/proxy/org.apache.aries.proxy.impl/${aries.proxy.version}/org.apache.aries.proxy.impl-${aries.proxy.version}.jar=20
org/apache/aries/blueprint/org.apache.aries.blueprint.api/${aries.blueprint.api.version}/org.apache.aries.blueprint.api-${aries.blueprint.api.version}.jar=20
-org/apache/aries/blueprint/org.apache.aries.blueprint.core/${aries.blueprint.version}/org.apache.aries.blueprint.core-${aries.blueprint.version}.jar=20
-org/apache/aries/blueprint/org.apache.aries.blueprint.cm/${aries.blueprint.version}/org.apache.aries.blueprint.cm-${aries.blueprint.version}.jar=20
+org/apache/aries/blueprint/org.apache.aries.blueprint.core/${aries.blueprint.core.version}/org.apache.aries.blueprint.core-${aries.blueprint.core.version}.jar=20
+org/apache/aries/blueprint/org.apache.aries.blueprint.cm/${aries.blueprint.cm.version}/org.apache.aries.blueprint.cm-${aries.blueprint.cm.version}.jar=20
org/apache/karaf/shell/org.apache.karaf.shell.console/${project.version}/org.apache.karaf.shell.console-${project.version}.jar=25
org/apache/karaf/shell/org.apache.karaf.shell.osgi/${project.version}/org.apache.karaf.shell.osgi-${project.version}.jar=30
org/apache/karaf/shell/org.apache.karaf.shell.log/${project.version}/org.apache.karaf.shell.log-${project.version}.jar=30
-org/apache/karaf/shell/org.apache.karaf.shell.log/${project.version}/org.apache.karaf.shell.log-${project.version}.jar=30
org/apache/karaf/shell/org.apache.karaf.shell.packages/${project.version}/org.apache.karaf.shell.packages-${project.version}.jar=30
org/apache/karaf/shell/org.apache.karaf.shell.commands/${project.version}/org.apache.karaf.shell.commands-${project.version}.jar=30
org/apache/karaf/shell/org.apache.karaf.shell.dev/${project.version}/org.apache.karaf.shell.dev-${project.version}.jar=30
@@ -58,6 +57,6 @@ org/apache/karaf/features/org.apache.kar
org/apache/karaf/management/org.apache.karaf.management.server/${project.version}/org.apache.karaf.management.server-${project.version}.jar=30
org/apache/aries/jmx/org.apache.aries.jmx.api/${aries.jmx.api.version}/org.apache.aries.jmx.api-${aries.jmx.api.version}.jar=30
-org/apache/aries/jmx/org.apache.aries.jmx.core/${aries.jmx.version}/org.apache.aries.jmx.core-${aries.jmx.version}.jar=30
-org/apache/aries/jmx/org.apache.aries.jmx.blueprint.api/${aries.jmx.version}/org.apache.aries.jmx.blueprint.api-${aries.jmx.version}.jar=30
-org/apache/aries/jmx/org.apache.aries.jmx.blueprint.core/${aries.jmx.version}/org.apache.aries.jmx.blueprint.core-${aries.jmx.version}.jar=30
+org/apache/aries/jmx/org.apache.aries.jmx.core/${aries.jmx.core.version}/org.apache.aries.jmx.core-${aries.jmx.core.version}.jar=30
+org/apache/aries/jmx/org.apache.aries.jmx.blueprint.api/${aries.jmx.blueprint.api.version}/org.apache.aries.jmx.blueprint.api-${aries.jmx.blueprint.api.version}.jar=30
+org/apache/aries/jmx/org.apache.aries.jmx.blueprint.core/${aries.jmx.blueprint.core.version}/org.apache.aries.jmx.blueprint.core-${aries.jmx.blueprint.core.version}.jar=30
Modified: karaf/branches/karaf-2.3.x/assemblies/features/enterprise/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/assemblies/features/enterprise/src/main/resources/features.xml?rev=1392704&r1=1392703&r2=1392704&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/assemblies/features/enterprise/src/main/resources/features.xml (original)
+++ karaf/branches/karaf-2.3.x/assemblies/features/enterprise/src/main/resources/features.xml Tue Oct 2 01:17:27 2012
@@ -22,10 +22,17 @@
<feature name="transaction" description="OSGi Transaction Manager" version="${aries.transaction.version}" resolver="(obr)">
<details>JTA implementation provided by Apache Aries Transaction ${aries.transaction.version}</details>
+ <config name="org.apache.aries.transaction">
+ aries.transaction.recoverable = true
+ aries.transaction.timeout = 600
+ aries.transaction.howl.logFileDir = ${karaf.data}/txlog
+ aries.transaction.howl.maxLogFiles = 2
+ aries.transaction.howl.maxBlocksPerFile = 512
+ aries.transaction.howl.bufferSizeKBytes = 4
+ </config>
<bundle dependency="true" start-level="30">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
- <bundle start-level="30">mvn:org.apache.aries.transaction/org.apache.aries.transaction.blueprint/${aries.transaction.version}</bundle>
- <bundle start-level="30">mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/${aries.transaction.version}</bundle>
- <bundle start-level="30">mvn:org.apache.aries.transaction/org.apache.aries.transaction.wrappers/${aries.transaction.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.aries.transaction/org.apache.aries.transaction.blueprint/${aries.transaction.blueprint.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/${aries.transaction.manager.version}</bundle>
</feature>
<feature name="jpa" description="OSGi Persistence Container" version="${aries.jpa.version}" resolver="(obr)">
@@ -34,9 +41,9 @@
<bundle dependency="true" start-level="30">mvn:org.apache.geronimo.specs/geronimo-jpa_2.0_spec/${geronimo.jpa-spec.version}</bundle>
<bundle start-level="30">mvn:org.apache.aries/org.apache.aries.util/${aries.util.version}</bundle>
<bundle start-level="30">mvn:org.apache.aries.jpa/org.apache.aries.jpa.api/${aries.jpa.api.version}</bundle>
- <bundle start-level="30">mvn:org.apache.aries.jpa/org.apache.aries.jpa.blueprint.aries/${aries.jpa.version}</bundle>
- <bundle start-level="30">mvn:org.apache.aries.jpa/org.apache.aries.jpa.container/${aries.jpa.version}</bundle>
- <bundle start-level="30">mvn:org.apache.aries.jpa/org.apache.aries.jpa.container.context/${aries.jpa.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.aries.jpa/org.apache.aries.jpa.blueprint.aries/${aries.jpa.blueprint.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.aries.jpa/org.apache.aries.jpa.container/${aries.jpa.container.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.aries.jpa/org.apache.aries.jpa.container.context/${aries.jpa.container.context.version}</bundle>
</feature>
<feature name="jndi" description="OSGi Service Registry JNDI access" version="${aries.jndi.version}" resolver="(obr)">
@@ -53,8 +60,8 @@
<details>Support of the Aries EBA archives</details>
<!-- pre-requisites -->
<bundle dependency="true" start-level="20">mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.api/${aries.blueprint.api.version}</bundle>
- <bundle dependency="true" start-level="20">mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.core/${aries.blueprint.version}</bundle>
- <bundle dependency="true" start-level="20">mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.cm/${aries.blueprint.version}</bundle>
+ <bundle dependency="true" start-level="20">mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.core/${aries.blueprint.core.version}</bundle>
+ <bundle dependency="true" start-level="20">mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.cm/${aries.blueprint.cm.version}</bundle>
<bundle dependency="true" start-level="20">mvn:org.apache.aries.proxy/org.apache.aries.proxy.api/${aries.proxy.api.version}</bundle>
<bundle dependency="true" start-level="20">mvn:org.apache.aries.proxy/org.apache.aries.proxy.impl/${aries.proxy.version}</bundle>
<bundle dependency="true" start-level="20">mvn:org.apache.aries/org.apache.aries.util/${aries.util.version}</bundle>
Modified: karaf/branches/karaf-2.3.x/assemblies/features/standard/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/assemblies/features/standard/src/main/resources/features.xml?rev=1392704&r1=1392703&r2=1392704&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/assemblies/features/standard/src/main/resources/features.xml (original)
+++ karaf/branches/karaf-2.3.x/assemblies/features/standard/src/main/resources/features.xml Tue Oct 2 01:17:27 2012
@@ -29,7 +29,9 @@
<bundle start-level="20">mvn:org.apache.aries/org.apache.aries.util/${aries.util.version}</bundle>
<bundle start-level="20">mvn:org.apache.aries.proxy/org.apache.aries.proxy.api/${aries.proxy.api.version}</bundle>
<bundle start-level="20">mvn:org.apache.aries.proxy/org.apache.aries.proxy.impl/${aries.proxy.version}</bundle>
- <bundle start-level="20">mvn:org.apache.aries.blueprint/org.apache.aries.blueprint/${aries.blueprint.version}</bundle>
+ <bundle start-level="20">mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.api/${aries.blueprint.api.version}</bundle>
+ <bundle start-level="20">mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.core/${aries.blueprint.core.version}</bundle>
+ <bundle start-level="20">mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.cm/${aries.blueprint.cm.version}</bundle>
<bundle start-level="30">mvn:org.apache.karaf.shell/org.apache.karaf.shell.console/${project.version}</bundle>
<bundle start-level="30">mvn:org.apache.karaf.shell/org.apache.karaf.shell.osgi/${project.version}</bundle>
<bundle start-level="30">mvn:org.apache.karaf.shell/org.apache.karaf.shell.log/${project.version}</bundle>
@@ -44,9 +46,9 @@
<bundle start-level="30">mvn:org.apache.karaf.features/org.apache.karaf.features.management/${project.version}</bundle>
<bundle start-level="30">mvn:org.apache.karaf.management/org.apache.karaf.management.server/${project.version}</bundle>
<bundle start-level="30">mvn:org.apache.aries.jmx/org.apache.aries.jmx.api/${aries.jmx.api.version}</bundle>
- <bundle start-level="30">mvn:org.apache.aries.jmx/org.apache.aries.jmx.core/${aries.jmx.version}</bundle>
- <bundle start-level="30">mvn:org.apache.aries.jmx/org.apache.aries.jmx.blueprint.api/${aries.jmx.version}</bundle>
- <bundle start-level="30">mvn:org.apache.aries.jmx/org.apache.aries.jmx.blueprint.core/${aries.jmx.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.aries.jmx/org.apache.aries.jmx.core/${aries.jmx.core.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.aries.jmx/org.apache.aries.jmx.blueprint.api/${aries.jmx.blueprint.api.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.aries.jmx/org.apache.aries.jmx.blueprint.core/${aries.jmx.blueprint.core.version}</bundle>
</feature>
<feature name="spring" description="Spring 2 support" version="${spring2.version}" resolver="(obr)">
@@ -267,9 +269,9 @@
<feature name="management" description="Provide a JMX MBeanServer and a set of MBeans in Karaf" version="${project.version}">
<bundle start-level="30">mvn:org.apache.karaf.management/org.apache.karaf.management.server/${project.version}</bundle>
<bundle start-level="30">mvn:org.apache.aries.jmx/org.apache.aries.jmx.api/${aries.jmx.api.version}</bundle>
- <bundle start-level="30">mvn:org.apache.aries.jmx/org.apache.aries.jmx.core/${aries.jmx.version}</bundle>
- <bundle start-level="30">mvn:org.apache.aries.jmx/org.apache.aries.jmx.blueprint.api/${aries.jmx.version}</bundle>
- <bundle start-level="30">mvn:org.apache.aries.jmx/org.apache.aries.jmx.blueprint.core/${aries.jmx.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.aries.jmx/org.apache.aries.jmx.core/${aries.jmx.core.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.aries.jmx/org.apache.aries.jmx.blueprint.api/${aries.jmx.blueprint.api.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.aries.jmx/org.apache.aries.jmx.blueprint.core/${aries.jmx.blueprint.core.version}</bundle>
<bundle start-level="30">mvn:org.apache.karaf.management.mbeans/org.apache.karaf.management.mbeans.system/${project.version}</bundle>
<bundle start-level="30">mvn:org.apache.karaf.management.mbeans/org.apache.karaf.management.mbeans.bundles/${project.version}</bundle>
<bundle start-level="30">mvn:org.apache.karaf.management.mbeans/org.apache.karaf.management.mbeans.services/${project.version}</bundle>
Modified: karaf/branches/karaf-2.3.x/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/pom.xml?rev=1392704&r1=1392703&r2=1392704&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/pom.xml Tue Oct 2 01:17:27 2012
@@ -140,17 +140,28 @@
<aries.application.version>1.0.0</aries.application.version>
<aries.application.api.version>1.0.0</aries.application.api.version>
<aries.application.management.version>1.0.0</aries.application.management.version>
- <aries.blueprint.version>1.0.0</aries.blueprint.version>
+ <aries.blueprint.version>1.0.1</aries.blueprint.version>
<aries.blueprint.api.version>1.0.0</aries.blueprint.api.version>
+ <aries.blueprint.core.version>1.0.1</aries.blueprint.core.version>
+ <aries.blueprint.cm.version>1.0.0</aries.blueprint.cm.version>
<aries.jmx.api.version>1.0.0</aries.jmx.api.version>
- <aries.jmx.version>1.0.0</aries.jmx.version>
- <aries.jpa.version>1.0.0</aries.jpa.version>
+ <aries.jmx.core.version>1.0.1</aries.jmx.core.version>
+ <aries.jmx.blueprint.api.version>1.0.0</aries.jmx.blueprint.api.version>
+ <aries.jmx.blueprint.core.version>1.0.0</aries.jmx.blueprint.core.version>
+ <aries.jmx.core.version>1.0.1</aries.jmx.core.version>
+ <aries.jpa.version>1.0.1</aries.jpa.version>
<aries.jpa.api.version>1.0.0</aries.jpa.api.version>
+ <aries.jpa.container.version>1.0.0</aries.jpa.container.version>
+ <aries.jpa.container.context.version>1.0.1</aries.jpa.container.context.version>
+ <aries.jpa.blueprint.version>1.0.0</aries.jpa.blueprint.version>
<aries.jndi.version>1.0.0</aries.jndi.version>
<aries.jndi.api.version>1.0.0</aries.jndi.api.version>
<aries.proxy.version>1.0.0</aries.proxy.version>
<aries.proxy.api.version>1.0.0</aries.proxy.api.version>
- <aries.transaction.version>1.0.0</aries.transaction.version>
+ <aries.transaction.version>1.0.1</aries.transaction.version>
+ <aries.transaction.manager.version>1.0.1</aries.transaction.manager.version>
+ <aries.transaction.blueprint.version>1.0.0</aries.transaction.blueprint.version>
+ <aries.transaction.jdbc.version>1.0.0</aries.transaction.jdbc.version>
<aries.util.version>1.0.0</aries.util.version>
<jansi.version>1.9</jansi.version>
<jline.version>2.9</jline.version>
@@ -1004,12 +1015,12 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.core</artifactId>
- <version>${aries.blueprint.version}</version>
+ <version>${aries.blueprint.core.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.cm</artifactId>
- <version>${aries.blueprint.version}</version>
+ <version>${aries.blueprint.cm.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.proxy</groupId>
@@ -1034,17 +1045,17 @@
<dependency>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.core</artifactId>
- <version>${aries.jmx.version}</version>
+ <version>${aries.jmx.core.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.blueprint.api</artifactId>
- <version>${aries.jmx.version}</version>
+ <version>${aries.jmx.blueprint.api.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.blueprint.core</artifactId>
- <version>${aries.jmx.version}</version>
+ <version>${aries.jmx.blueprint.core.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.jndi</groupId>
@@ -1122,6 +1133,11 @@
<version>${xbean.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-blueprint</artifactId>
+ <version>${xbean.version}</version>
+ </dependency>
+ <dependency>
<groupId>tanukisoft</groupId>
<artifactId>wrapper</artifactId>
<version>${jsw.version}</version>