Author: gertv
Date: Thu Apr 7 08:34:04 2011
New Revision: 1089774
URL: http://svn.apache.org/viewvc?rev=1089774&view=rev
Log:
SMX4-798: Ensure OBR support is available before boot features are installed
Added:
servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/etc/startup.properties
servicemix/smx4/nmr/trunk/assembly/src/main/scripts/
servicemix/smx4/nmr/trunk/assembly/src/main/scripts/DefineProperties.scala
Modified:
servicemix/smx4/nmr/trunk/assembly/pom.xml
servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/unix-bin.xml
servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/windows-bin.xml
servicemix/smx4/nmr/trunk/pom.xml
Modified: servicemix/smx4/nmr/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/pom.xml?rev=1089774&r1=1089773&r2=1089774&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/assembly/pom.xml Thu Apr 7 08:34:04 2011
@@ -32,6 +32,10 @@
<packaging>pom</packaging>
<name>Apache ServiceMix :: NMR :: Assembly</name>
+ <properties>
+ <asm.bundle.version>3.3_1</asm.bundle.version>
+ </properties>
+
<dependencies>
<!-- Karaf (distribution and features) -->
@@ -48,6 +52,12 @@
<classifier>features</classifier>
</dependency>
+ <!-- Scala (used for scripting) -->
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-library</artifactId>
+ </dependency>
+
</dependencies>
<build>
@@ -60,8 +70,28 @@
</includes>
</resource>
</resources>
+
<plugins>
<plugin>
+ <groupId>org.scala-tools</groupId>
+ <artifactId>maven-scala-plugin</artifactId>
+ <version>2.15.0</version>
+ <executions>
+ <execution>
+ <id>add-features-to-startup</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>script</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <keepGeneratedScript>true</keepGeneratedScript>
+
<scriptFile>${project.basedir}/src/main/scripts/DefineProperties.scala</scriptFile>
+ <includeScopes>plugin</includeScopes>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>
@@ -149,6 +179,7 @@
<descriptor>file:${basedir}/target/classes/features.xml</descriptor>
</descriptors>
<features>
+ <feature>obr</feature>
<feature>nmr</feature>
<feature>nmr-audit</feature>
<feature>jbi</feature>
Modified: servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/unix-bin.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/unix-bin.xml?rev=1089774&r1=1089773&r2=1089774&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/unix-bin.xml
(original)
+++ servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/unix-bin.xml Thu
Apr 7 08:34:04 2011
@@ -35,6 +35,7 @@
<exclude>etc/org.ops4j.pax.logging.cfg</exclude>
<exclude>etc/custom.properties</exclude>
<exclude>etc/users.properties</exclude>
+ <exclude>etc/startup.properties</exclude>
<exclude>LICENSE</exclude>
<exclude>NOTICE</exclude>
<exclude>README</exclude>
Modified:
servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/windows-bin.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/windows-bin.xml?rev=1089774&r1=1089773&r2=1089774&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/windows-bin.xml
(original)
+++ servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/windows-bin.xml Thu
Apr 7 08:34:04 2011
@@ -35,6 +35,7 @@
<exclude>etc/org.ops4j.pax.logging.cfg</exclude>
<exclude>etc/custom.properties</exclude>
<exclude>etc/users.properties</exclude>
+ <exclude>etc/startup.properties</exclude>
<exclude>LICENSE</exclude>
<exclude>NOTICE</exclude>
<exclude>README</exclude>
Added:
servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/etc/startup.properties
URL:
http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/etc/startup.properties?rev=1089774&view=auto
==============================================================================
---
servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/etc/startup.properties
(added)
+++
servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/etc/startup.properties
Thu Apr 7 08:34:04 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.
+#
+################################################################################
+
+# This file allows you to control the start level of each bundle.
+#
+
+#
+# Startup core services like logging
+#
+org/ops4j/pax/url/pax-url-mvn/${pax.url.version}/pax-url-mvn-${pax.url.version}.jar=5
+org/ops4j/pax/url/pax-url-wrap/${pax.url.version}/pax-url-wrap-${pax.url.version}.jar=5
+org/ops4j/pax/logging/pax-logging-api/${pax.logging.version}/pax-logging-api-${pax.logging.version}.jar=8
+org/ops4j/pax/logging/pax-logging-service/${pax.logging.version}/pax-logging-service-${pax.logging.version}.jar=8
+org/apache/felix/org.apache.felix.configadmin/${felix.configadmin.version}/org.apache.felix.configadmin-${felix.configadmin.version}.jar=10
+org/apache/felix/org.apache.felix.bundlerepository/${felix.bundlerepository.version}/org.apache.felix.bundlerepository-${felix.bundlerepository.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/servicemix/bundles/org.apache.servicemix.bundles.asm/${asm.bundle.version}/org.apache.servicemix.bundles.asm-${asm.bundle.version}.jar=20
+org/apache/aries/org.apache.aries.util/${aries.util.version}/org.apache.aries.util-${aries.util.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/karaf/shell/org.apache.karaf.shell.console/${karaf.version}/org.apache.karaf.shell.console-${karaf.version}.jar=30
+org/apache/karaf/shell/org.apache.karaf.shell.osgi/${karaf.version}/org.apache.karaf.shell.osgi-${karaf.version}.jar=30
+org/apache/karaf/shell/org.apache.karaf.shell.log/${karaf.version}/org.apache.karaf.shell.log-${karaf.version}.jar=30
+org/apache/karaf/shell/org.apache.karaf.shell.packages/${karaf.version}/org.apache.karaf.shell.packages-${karaf.version}.jar=30
+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.dev/${karaf.version}/org.apache.karaf.shell.dev-${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/jaas/org.apache.karaf.jaas.command/${karaf.version}/org.apache.karaf.jaas.command-${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.obr/${karaf.version}/org.apache.karaf.features.obr-${karaf.version}.jar=30
+org/apache/karaf/features/org.apache.karaf.features.command/${karaf.version}/org.apache.karaf.features.command-${karaf.version}.jar=30
+org/apache/karaf/features/org.apache.karaf.features.management/${karaf.version}/org.apache.karaf.features.management-${karaf.version}.jar=30
+
+org/apache/karaf/diagnostic/org.apache.karaf.diagnostic.core/${karaf.version}/org.apache.karaf.diagnostic.core-${karaf.version}.jar=30
+org/apache/karaf/diagnostic/org.apache.karaf.diagnostic.common/${karaf.version}/org.apache.karaf.diagnostic.common-${karaf.version}.jar=30
+org/apache/karaf/diagnostic/org.apache.karaf.diagnostic.command/${karaf.version}/org.apache.karaf.diagnostic.command-${karaf.version}.jar=30
+org/apache/karaf/diagnostic/org.apache.karaf.diagnostic.management/${karaf.version}/org.apache.karaf.diagnostic.management-${karaf.version}.jar=30
+
+org/apache/karaf/org.apache.karaf.management/${karaf.version}/org.apache.karaf.management-${karaf.version}.jar=30
+org/apache/aries/jmx/org.apache.aries.jmx/${aries.jmx.version}/org.apache.aries.jmx-${aries.jmx.version}.jar=30
+org/apache/aries/jmx/org.apache.aries.jmx.blueprint/${aries.jmx.version}/org.apache.aries.jmx.blueprint-${aries.jmx.version}.jar=30
+
+org/apache/karaf/admin/org.apache.karaf.admin.core/${karaf.version}/org.apache.karaf.admin.core-${karaf.version}.jar=30
+org/apache/karaf/admin/org.apache.karaf.admin.command/${karaf.version}/org.apache.karaf.admin.command-${karaf.version}.jar=30
+org/apache/karaf/admin/org.apache.karaf.admin.management/${karaf.version}/org.apache.karaf.admin.management-${karaf.version}.jar=30
+
+org/apache/mina/mina-core/${mina.version}/mina-core-${mina.version}.jar=30
+org/apache/sshd/sshd-core/${sshd.version}/sshd-core-${sshd.version}.jar=30
+org/apache/karaf/shell/org.apache.karaf.shell.ssh/${karaf.version}/org.apache.karaf.shell.ssh-${karaf.version}.jar=30
+
+org/apache/karaf/deployer/org.apache.karaf.deployer.spring/${karaf.version}/org.apache.karaf.deployer.spring-${karaf.version}.jar=30
+org/apache/karaf/deployer/org.apache.karaf.deployer.blueprint/${karaf.version}/org.apache.karaf.deployer.blueprint-${karaf.version}.jar=30
+org/apache/karaf/deployer/org.apache.karaf.deployer.features/${karaf.version}/org.apache.karaf.deployer.features-${karaf.version}.jar=30
+org/apache/karaf/deployer/org.apache.karaf.deployer.kar/${karaf.version}/org.apache.karaf.deployer.kar-${karaf.version}.jar=30
+org/apache/karaf/deployer/org.apache.karaf.deployer.wrap/${karaf.version}/org.apache.karaf.deployer.wrap-${karaf.version}.jar=30
Added:
servicemix/smx4/nmr/trunk/assembly/src/main/scripts/DefineProperties.scala
URL:
http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/src/main/scripts/DefineProperties.scala?rev=1089774&view=auto
==============================================================================
--- servicemix/smx4/nmr/trunk/assembly/src/main/scripts/DefineProperties.scala
(added)
+++ servicemix/smx4/nmr/trunk/assembly/src/main/scripts/DefineProperties.scala
Thu Apr 7 08:34:04 2011
@@ -0,0 +1,55 @@
+/*
+* 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.
+*/
+import org.apache.maven.model.Dependency
+
+import scala.collection.JavaConversions._
+
+def versionOf(group: String, artifact: String) = {
+ project.getDependencyManagement().getDependencies().find { item =>
+ val dependency = item.asInstanceOf[Dependency]
+ group == dependency.getGroupId() && artifact == dependency.getArtifactId()
+ } match {
+ case Some(value) => value.asInstanceOf[Dependency].getVersion()
+ case None => throw new RuntimeException("Version for artifact %s:%s could
not be found".format(group, artifact))
+ }
+}
+
+def set(key: String, value: String) = {
+ log.info("- %s = %s".format(key, value))
+ project.getProperties().put(key, value)
+}
+
+log.info("----------------------------------------------------------------------")
+log.info("Setting version properties based on dependency management
information:")
+
+set("aries.blueprint.version", versionOf("org.apache.aries.blueprint",
"org.apache.aries.blueprint"))
+set("aries.jmx.version", versionOf("org.apache.aries.jmx",
"org.apache.aries.jmx"))
+set("aries.proxy.version", versionOf("org.apache.aries.proxy",
"org.apache.aries.proxy"))
+set("aries.util.version", versionOf("org.apache.aries",
"org.apache.aries.util"))
+
+set("felix.configadmin.version", versionOf("org.apache.felix",
"org.apache.felix.configadmin"))
+set("felix.bundlerepository.version", versionOf("org.apache.felix",
"org.apache.felix.bundlerepository"))
+set("felix.fileinstall.version", versionOf("org.apache.felix",
"org.apache.felix.fileinstall"))
+
+set("mina.version", versionOf("org.apache.mina", "mina-core"))
+
+set("pax.logging.version", versionOf("org.ops4j.pax.logging",
"pax-logging-api"))
+set("pax.url.version", versionOf("org.ops4j.pax.url", "pax-url-mvn"))
+
+set("sshd.version", versionOf("org.apache.sshd", "sshd-core"))
+
+log.info("----------------------------------------------------------------------")
\ No newline at end of file
Modified: servicemix/smx4/nmr/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/pom.xml?rev=1089774&r1=1089773&r2=1089774&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/pom.xml Thu Apr 7 08:34:04 2011
@@ -99,6 +99,7 @@
<jencks.version>2.2</jencks.version>
<junit.version>4.7</junit.version>
<lucene.version>2.4.1</lucene.version>
+ <scala.version>2.8.1</scala.version>
<slf4j.version>1.6.1</slf4j.version>
<woodstox.version>4.0.8</woodstox.version>
<woodstox.stax2-api.version>3.0.2</woodstox.stax2-api.version>
@@ -189,6 +190,13 @@
<classifier>installer</classifier>
</dependency>
+ <!-- Scala -->
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-library</artifactId>
+ <version>${scala.version}</version>
+ </dependency>
+
<!-- ServiceMix Samples -->
<dependency>
<groupId>org.apache.servicemix.samples.wsdl-first</groupId>
