You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by jb...@apache.org on 2011/02/25 11:53:39 UTC
svn commit: r1074469 - in /servicemix/smx4/features/trunk: RELEASE-NOTES
assembly/pom.xml assembly/src/main/descriptors/unix-bin.xml
assembly/src/main/descriptors/windows-bin.xml
assembly/src/main/distribution/text/etc/config.properties
Author: jbonofre
Date: Fri Feb 25 10:53:38 2011
New Revision: 1074469
URL: http://svn.apache.org/viewvc?rev=1074469&view=rev
Log:
[SMX4-764] Override Apache Felix Framework to 3.0.8 version in the distribution.
Added:
servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/config.properties
Modified:
servicemix/smx4/features/trunk/RELEASE-NOTES
servicemix/smx4/features/trunk/assembly/pom.xml
servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml
Modified: servicemix/smx4/features/trunk/RELEASE-NOTES
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/RELEASE-NOTES?rev=1074469&r1=1074468&r2=1074469&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/RELEASE-NOTES (original)
+++ servicemix/smx4/features/trunk/RELEASE-NOTES Fri Feb 25 10:53:38 2011
@@ -87,6 +87,8 @@ Release Notes - ServiceMix 4 - Version 4
* [SMX4-749] - JBI deployer version range is not up to date
* [SMX4-760] - JAXB API and implementation version mismatch in Camel features descriptor
* [SMX4-761] - cxf-osgi example miss a package import which cause it fail with felix
+* [SMX4-763] - Remove examples/web from the distribution
+* [SMX4-764] - Override Apache Felix Framework version to 3.0.8 in the distribution
** Improvement
* [SMX4-512] - Upgrade to ActiveMQ 5.3.1
Modified: servicemix/smx4/features/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/pom.xml?rev=1074469&r1=1074468&r2=1074469&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/features/trunk/assembly/pom.xml Fri Feb 25 10:53:38 2011
@@ -55,6 +55,14 @@
<groupId>org.apache.karaf.deployer</groupId>
<artifactId>org.apache.karaf.deployer.war</artifactId>
</dependency>
+
+ <!-- Felix -->
+ <!-- SMX4-764 - Override the Felix Framework version to use 3.0.8 -->
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.framework</artifactId>
+ <version>3.0.8</version>
+ </dependency>
<!-- ServiceMix Components -->
<dependency>
Modified: servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml?rev=1074469&r1=1074468&r2=1074469&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml Fri Feb 25 10:53:38 2011
@@ -35,6 +35,11 @@
<exclude>etc/users.properties</exclude>
<exclude>etc/custom.properties</exclude>
<exclude>etc/jre.properties</exclude>
+ <!-- SMX4-764 - Override Felix Framework version -->
+ <!-- begin snippet -->
+ <exclude>etc/config.properties</exclude>
+ <exclude>system/org/apache/felix/org.apache.felix.framework/**</exclude>
+ <!-- end snippet -->
<exclude>LICENSE</exclude>
<exclude>NOTICE</exclude>
<exclude>README</exclude>
@@ -438,6 +443,18 @@
<include>org.apache.servicemix.specs:org.apache.servicemix.specs.stax-api-1.0</include>
</includes>
</dependencySet>
+ <!-- SMX4-764 - Override Felix Framework to 3.0.8 version -->
+ <!-- begin snippet -->
+ <dependencySet>
+ <outputDirectory>/system</outputDirectory>
+ <unpack>false</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputFileNameMapping>org/apache/felix/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <includes>
+ <include>org.apache.felix:org.apache.felix.framework</include>
+ </includes>
+ </dependencySet>
+ <!-- end snippet -->
</dependencySets>
Modified: servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml?rev=1074469&r1=1074468&r2=1074469&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml Fri Feb 25 10:53:38 2011
@@ -35,8 +35,10 @@
<exclude>etc/custom.properties</exclude>
<exclude>etc/jre.properties</exclude>
<!-- SMX4-764 - Override the Felix Framework version -->
+ <!-- begin snippet -->
<exclude>etc/config.properties</exclude>
<exclude>system/org/apache/felix/org.apache.felix.framework/**</exclude>
+ <!-- end snippet -->
<exclude>LICENSE</exclude>
<exclude>NOTICE</exclude>
<exclude>README</exclude>
@@ -433,6 +435,7 @@
</includes>
</dependencySet>
<!-- SMX4-764 - Override the Felix Framework version -->
+ <!-- begin snippet -->
<dependencySet>
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
@@ -442,6 +445,7 @@
<include>org.apache.felix:org.apache.felix.framework</include>
</includes>
</dependencySet>
+ <!-- end snippet -->
</dependencySets>
Added: servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/config.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/config.properties?rev=1074469&view=auto
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/config.properties (added)
+++ servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/config.properties Fri Feb 25 10:53:38 2011
@@ -0,0 +1,88 @@
+################################################################################
+#
+# 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.
+#
+################################################################################
+
+#
+# Properties file inclusions (as a space separated list of relative paths)
+# Included files will override the values specified in this file
+#
+${includes} = jre.properties custom.properties
+
+#
+# Framework selection properties
+#
+karaf.framework=felix
+
+#
+# Location of the OSGi frameworks
+#
+karaf.framework.equinox=${karaf.default.repository}/org/eclipse/osgi/3.6.0.v20100517/osgi-3.6.0.v20100517.jar
+karaf.framework.felix=${karaf.default.repository}/org/apache/felix/org.apache.felix.framework/3.0.8/org.apache.felix.framework-3.0.8.jar
+
+#
+# Framework config properties.
+#
+org.osgi.framework.system.packages=org.osgi.framework; version=1.5.0, \
+ org.osgi.framework.launch; version=1.0.0, \
+ org.osgi.framework.hooks.service; version=1.0.0, \
+ org.osgi.service.packageadmin; version=1.2.0, \
+ org.osgi.service.startlevel; version=1.1.0, \
+ org.osgi.service.url; version=1.0.0, \
+ org.osgi.util.tracker; version=1.4.0, \
+ org.apache.karaf.jaas.boot; version=2.1.3, \
+ org.apache.karaf.version; version=2.1.3, \
+ ${jre-${java.specification.version}}
+
+org.osgi.framework.system.packages.extra=
+
+# javax.transaction is needed to avoid class loader constraint violation when using javax.sql
+org.osgi.framework.bootdelegation=org.apache.karaf.jaas.boot,sun.*,com.sun.*,javax.transaction,javax.transaction.*
+
+# OSGi Execution Environment
+org.osgi.framework.executionenvironment=J2SE-1.5,J2SE-1.4,J2SE-1.3,J2SE-1.2
+
+# Set the parent classloader for the bundle to the classloader that loads the Framework (i.e. everything in lib/*.jar)
+org.osgi.framework.bundle.parent=framework
+
+# To enable the use of the startup.properties file to control the start level:
+karaf.auto.start=startup.properties
+
+org.osgi.framework.startlevel.beginning=100
+karaf.startlevel.bundle=60
+
+karaf.shutdown.port.file=${karaf.data}/port
+
+#
+# FileMonitor properties
+#
+felix.fileinstall.dir = ${karaf.base}/etc
+felix.fileinstall.filter = .*\\.cfg
+felix.fileinstall.poll = 1000
+felix.fileinstall.noInitialDelay = true
+
+#
+# Delay for writing the framework state to disk in equinox
+# must be >= 1000 and <= 1800000
+#
+eclipse.stateSaveDelayInterval = 1000
+
+#
+# OBR Repository list
+# This property will be modified by the obr:addUrl and obr:removeUrl commands.
+#
+obr.repository.url =