Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id E5946200B62 for ; Fri, 12 Aug 2016 10:22:18 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id E41AD160AB0; Fri, 12 Aug 2016 08:22:18 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id B646A160AA6 for ; Fri, 12 Aug 2016 10:22:16 +0200 (CEST) Received: (qmail 90784 invoked by uid 500); 12 Aug 2016 08:22:15 -0000 Mailing-List: contact commits-help@karaf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@karaf.apache.org Delivered-To: mailing list commits@karaf.apache.org Received: (qmail 90774 invoked by uid 99); 12 Aug 2016 08:22:15 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 12 Aug 2016 08:22:15 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B64B5E055E; Fri, 12 Aug 2016 08:22:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ffang@apache.org To: commits@karaf.apache.org Date: Fri, 12 Aug 2016 08:22:16 -0000 Message-Id: In-Reply-To: <1ffbf729462e4c4bb594251578329449@git.apache.org> References: <1ffbf729462e4c4bb594251578329449@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/3] karaf git commit: [KARAF-4653]enable to build and run Karaf with JAVA9 archived-at: Fri, 12 Aug 2016 08:22:19 -0000 [KARAF-4653]enable to build and run Karaf with JAVA9 Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/551421a4 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/551421a4 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/551421a4 Branch: refs/heads/master Commit: 551421a4bfad375faa41eda9926bd6dbed56f05f Parents: 320454a Author: Freeman Fang Authored: Thu Mar 24 13:51:53 2016 +0800 Committer: Freeman Fang Committed: Fri Aug 12 16:13:37 2016 +0800 ---------------------------------------------------------------------- archetypes/blueprint/pom.xml | 2 +- .../main/resources/archetype-resources/pom.xml | 11 +- archetypes/bundle/pom.xml | 12 +- .../main/resources/archetype-resources/pom.xml | 10 + assemblies/apache-karaf/pom.xml | 4 +- .../resources/etc/config.properties | 2 + .../resources/etc/jre.properties | 196 +++++++++++++++++++ .../base/src/main/resources/resources/bin/karaf | 60 ++++-- .../resources/resources/lib/endorsed/README | 23 --- .../enterprise/src/main/feature/feature.xml | 2 +- assemblies/features/pom.xml | 2 +- event/pom.xml | 2 +- .../features/internal/model/Conditional.java | 2 +- .../karaf/features/internal/model/Content.java | 7 +- .../karaf/features/internal/model/Feature.java | 8 +- .../karaf/features/internal/model/Features.java | 7 +- .../features/internal/service/Deployer.java | 3 +- http/pom.xml | 2 +- .../itests/BundleSshCommandSecurityTest.java | 2 + .../karaf/itests/ConditionalFeaturesTest.java | 4 + .../itests/ConfigSshCommandSecurityTest.java | 2 + .../itests/FeatureSshCommandSecurityTest.java | 3 + .../org/apache/karaf/itests/FeatureTest.java | 5 +- .../java/org/apache/karaf/itests/HttpTest.java | 7 +- .../apache/karaf/itests/ImportServiceTest.java | 4 +- .../org/apache/karaf/itests/InstanceTest.java | 24 ++- .../itests/JaasSshCommandSecurityTest.java | 2 + .../java/org/apache/karaf/itests/JmsTest.java | 8 +- .../java/org/apache/karaf/itests/JndiTest.java | 5 +- .../karaf/itests/KarSshCommandSecurityTest.java | 3 + .../apache/karaf/itests/KarafTestSupport.java | 52 ++++- .../java/org/apache/karaf/itests/ObrTest.java | 4 +- .../karaf/itests/ShellCommandSecurityTest.java | 1 + .../apache/karaf/itests/SshKeyFormatTest.java | 1 + .../karaf/itests/SystemCommandSecurityTest.java | 1 + .../java/org/apache/karaf/itests/WebTest.java | 5 +- .../org/apache/karaf/itests/WrapperTest.java | 13 +- .../itests/features/EnterpriseFeaturesTest.java | 5 +- .../itests/features/PaxCdiFeaturesTest.java | 3 + .../itests/features/Spring3FeaturesTest.java | 5 +- .../itests/features/Spring40FeaturesTest.java | 4 +- .../itests/features/Spring41FeaturesTest.java | 4 +- .../itests/features/Spring42FeaturesTest.java | 3 + .../itests/features/StandardFeaturesTest.java | 28 +-- .../resources/etc/org.ops4j.pax.logging.cfg | 35 +--- jaas/jasypt/pom.xml | 2 +- jdbc/pom.xml | 2 +- jms/core/pom.xml | 2 +- jndi/pom.xml | 2 +- jpa/hibernate/pom.xml | 2 +- .../test-karaf-home/etc/config.properties | 2 + .../test-karaf-home/etc/jre.properties | 195 ++++++++++++++++++ management/pom.xml | 2 +- obr/pom.xml | 2 +- pom.xml | 31 ++- scheduler/pom.xml | 2 +- scr/examples/component-factory/pom.xml | 2 +- scr/examples/managed-service/pom.xml | 2 +- scr/examples/service/pom.xml | 2 +- scr/pom.xml | 2 +- service/guard/pom.xml | 2 +- service/pom.xml | 2 +- services/coordinator/pom.xml | 2 +- services/eventadmin/pom.xml | 2 +- services/staticcm/pom.xml | 2 +- tooling/karaf-maven-plugin/pom.xml | 25 ++- .../src/it/test-aggregate-features/pom.xml | 12 +- .../src/it/test-assembly-prop-edits/pom.xml | 4 +- .../src/it/test-assembly/pom.xml | 4 +- .../src/it/test-basic-generation/pom.xml | 10 + .../it/test-check-dependencies-failure/pom.xml | 12 +- .../src/it/test-check-dependencies/pom.xml | 12 +- .../src/it/test-feature-dependencies/pom.xml | 12 +- .../transitive/pom.xml | 30 ++- .../it/test-include-project-artifact/pom.xml | 12 +- .../src/it/test-input-file/pom.xml | 10 + .../src/it/test-recursive/pom.xml | 12 +- .../src/it/test-rename-main-feature/pom.xml | 11 ++ .../src/it/test-run-bundle/pom.xml | 15 +- .../karaf-maven-plugin/src/it/test-run/pom.xml | 4 +- .../src/it/test-type-classifier/pom.xml | 11 ++ .../src/main/resources/config.properties | 195 ++++++++++++++++++ web/pom.xml | 2 +- 83 files changed, 1075 insertions(+), 168 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/551421a4/archetypes/blueprint/pom.xml ---------------------------------------------------------------------- diff --git a/archetypes/blueprint/pom.xml b/archetypes/blueprint/pom.xml index 922c0bf..74e20ec 100644 --- a/archetypes/blueprint/pom.xml +++ b/archetypes/blueprint/pom.xml @@ -85,4 +85,4 @@ - \ No newline at end of file + http://git-wip-us.apache.org/repos/asf/karaf/blob/551421a4/archetypes/blueprint/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/archetypes/blueprint/src/main/resources/archetype-resources/pom.xml b/archetypes/blueprint/src/main/resources/archetype-resources/pom.xml index 916161c..9ca6f61 100644 --- a/archetypes/blueprint/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/blueprint/src/main/resources/archetype-resources/pom.xml @@ -48,7 +48,16 @@ + + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + 256M + + - \ No newline at end of file + http://git-wip-us.apache.org/repos/asf/karaf/blob/551421a4/archetypes/bundle/pom.xml ---------------------------------------------------------------------- diff --git a/archetypes/bundle/pom.xml b/archetypes/bundle/pom.xml index 5f83d54..dff8998 100644 --- a/archetypes/bundle/pom.xml +++ b/archetypes/bundle/pom.xml @@ -60,6 +60,16 @@ org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + 256M + + + + + org.apache.maven.plugins maven-resources-plugin @@ -85,4 +95,4 @@ - \ No newline at end of file + http://git-wip-us.apache.org/repos/asf/karaf/blob/551421a4/archetypes/bundle/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/archetypes/bundle/src/main/resources/archetype-resources/pom.xml b/archetypes/bundle/src/main/resources/archetype-resources/pom.xml index 8cde00c..0a8badc 100644 --- a/archetypes/bundle/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/bundle/src/main/resources/archetype-resources/pom.xml @@ -67,6 +67,16 @@ + + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + 256M + + + http://git-wip-us.apache.org/repos/asf/karaf/blob/551421a4/assemblies/apache-karaf/pom.xml ---------------------------------------------------------------------- diff --git a/assemblies/apache-karaf/pom.xml b/assemblies/apache-karaf/pom.xml index c5b5987..a07d58b 100644 --- a/assemblies/apache-karaf/pom.xml +++ b/assemblies/apache-karaf/pom.xml @@ -191,15 +191,13 @@ system - xerces-${xerces.version}.jar;url:="wrap:mvn:xerces/xercesImpl/${xerces.version}$Export-Package=org.apache.*;version=${xerces.version}";type:=endorsed;export:=true;delegate:=true - + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${xerces.version};type:=endorsed;export:=true mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxp-api-1.4/${servicemix.specs.version};type:=endorsed;export:=true mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.2/${servicemix.specs.version};type:=endorsed;export:=true mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.2/${servicemix.specs.version};type:=endorsed;export:=true mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${servicemix.specs.version};type:=endorsed;export:=true mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix.specs.version};type:=endorsed;export:=true mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.2/${servicemix.specs.version};type:=endorsed;export:=true - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/${xalan.bundle.version};type:=endorsed;export:=true mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan-serializer/${xalan-serializer.bundle.version};type:=endorsed;export:=true mvn:javax.annotation/javax.annotation-api/1.2;type:=endorsed;export:=true http://git-wip-us.apache.org/repos/asf/karaf/blob/551421a4/assemblies/features/base/src/main/filtered-resources/resources/etc/config.properties ---------------------------------------------------------------------- diff --git a/assemblies/features/base/src/main/filtered-resources/resources/etc/config.properties b/assemblies/features/base/src/main/filtered-resources/resources/etc/config.properties index 5869113..e72b694 100644 --- a/assemblies/features/base/src/main/filtered-resources/resources/etc/config.properties +++ b/assemblies/features/base/src/main/filtered-resources/resources/etc/config.properties @@ -99,6 +99,8 @@ org.osgi.framework.system.capabilities= \ osgi.service;effective:=active;objectClass=org.osgi.service.startlevel.StartLevel, \ osgi.service;effective:=active;objectClass=org.osgi.service.url.URLHandlers +eecap-9= osgi.ee; osgi.ee="OSGi/Minimum"; version:List="1.0,1.1,1.2", \ + osgi.ee; osgi.ee="JavaSE"; version:List="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,9" eecap-1.8= osgi.ee; osgi.ee="OSGi/Minimum"; version:List="1.0,1.1,1.2", \ osgi.ee; osgi.ee="JavaSE"; version:List="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8" eecap-1.7= osgi.ee; osgi.ee="OSGi/Minimum"; version:List="1.0,1.1,1.2", \ http://git-wip-us.apache.org/repos/asf/karaf/blob/551421a4/assemblies/features/base/src/main/filtered-resources/resources/etc/jre.properties ---------------------------------------------------------------------- diff --git a/assemblies/features/base/src/main/filtered-resources/resources/etc/jre.properties b/assemblies/features/base/src/main/filtered-resources/resources/etc/jre.properties index c088de5..75fd93b 100644 --- a/assemblies/features/base/src/main/filtered-resources/resources/etc/jre.properties +++ b/assemblies/features/base/src/main/filtered-resources/resources/etc/jre.properties @@ -542,3 +542,199 @@ jre-1.8= \ org.xml.sax.ext, \ org.xml.sax.helpers, \ com.sun.nio.sctp + +jre-9= \ + javax.accessibility, \ + javax.activation;version="1.1", \ + javax.activity, \ + javax.annotation;version="1.0", \ + javax.annotation.processing;version="1.0", \ + javax.crypto, \ + javax.crypto.interfaces, \ + javax.crypto.spec, \ + javax.imageio, \ + javax.imageio.event, \ + javax.imageio.metadata, \ + javax.imageio.plugins.bmp, \ + javax.imageio.plugins.jpeg, \ + javax.imageio.spi, \ + javax.imageio.stream, \ + javax.jws, \ + javax.jws.soap, \ + javax.lang.model, \ + javax.lang.model.element, \ + javax.lang.model.type, \ + javax.lang.model.util, \ + javax.management, \ + javax.management.loading, \ + javax.management.modelmbean, \ + javax.management.monitor, \ + javax.management.openmbean, \ + javax.management.relation, \ + javax.management.remote, \ + javax.management.remote.rmi, \ + javax.management.timer, \ + javax.naming, \ + javax.naming.directory, \ + javax.naming.event, \ + javax.naming.ldap, \ + javax.naming.spi, \ + javax.net, \ + javax.net.ssl, \ + javax.print, \ + javax.print.attribute, \ + javax.print.attribute.standard, \ + javax.print.event, \ + javax.rmi, \ + javax.rmi.CORBA, \ + javax.rmi.ssl, \ + javax.script, \ + javax.security.auth, \ + javax.security.auth.callback, \ + javax.security.auth.kerberos, \ + javax.security.auth.login, \ + javax.security.auth.spi, \ + javax.security.auth.x500, \ + javax.security.cert, \ + javax.security.sasl, \ + javax.sound.midi, \ + javax.sound.midi.spi, \ + javax.sound.sampled, \ + javax.sound.sampled.spi, \ + javax.sql, \ + javax.sql.rowset, \ + javax.sql.rowset.serial, \ + javax.sql.rowset.spi, \ + javax.swing, \ + javax.swing.border, \ + javax.swing.colorchooser, \ + javax.swing.event, \ + javax.swing.filechooser, \ + javax.swing.plaf, \ + javax.swing.plaf.basic, \ + javax.swing.plaf.metal, \ + javax.swing.plaf.multi, \ + javax.swing.plaf.synth, \ + javax.swing.table, \ + javax.swing.text, \ + javax.swing.text.html, \ + javax.swing.text.html.parser, \ + javax.swing.text.rtf, \ + javax.swing.tree, \ + javax.swing.undo, \ + javax.tools, \ + javax.transaction; javax.transaction.xa; partial=true; mandatory:=partial, \ + javax.xml, \ + javax.xml.bind;version="2.2.1", \ + javax.xml.bind.annotation;version="2.2.1", \ + javax.xml.bind.annotation.adapters;version="2.2.1", \ + javax.xml.bind.attachment;version="2.2.1", \ + javax.xml.bind.helpers;version="2.2.1", \ + javax.xml.bind.util;version="2.2.1", \ + javax.xml.crypto, \ + javax.xml.crypto.dom, \ + javax.xml.crypto.dsig, \ + javax.xml.crypto.dsig.dom, \ + javax.xml.crypto.dsig.keyinfo, \ + javax.xml.crypto.dsig.spec, \ + javax.xml.datatype, \ + javax.xml.namespace, \ + javax.xml.parsers, \ + javax.xml.soap;version="1.3", \ + javax.xml.stream;version="1.2", \ + javax.xml.stream.events;version="1.2", \ + javax.xml.stream.util;version="1.2", \ + javax.xml.transform, \ + javax.xml.transform.dom, \ + javax.xml.transform.sax, \ + javax.xml.transform.stax, \ + javax.xml.transform.stream, \ + javax.xml.validation, \ + javax.xml.ws;version="2.2", \ + javax.xml.ws.handler;version="2.2", \ + javax.xml.ws.handler.soap;version="2.2", \ + javax.xml.ws.http;version="2.2", \ + javax.xml.ws.soap;version="2.2", \ + javax.xml.ws.spi;version="2.2", \ + javax.xml.ws.wsaddressing;version="2.2", \ + javax.xml.ws.spi.http;version="2.2", \ + javax.xml.xpath, \ + javafx.animation, \ + javafx.application, \ + javafx.beans, \ + javafx.beans.binding, \ + javafx.beans.property, \ + javafx.beans.property.adapter, \ + javafx.beans.value, \ + javafx.collections, \ + javafx.concurrent, \ + javafx.css, \ + javafx.embed.swing, \ + javafx.embed.swt, \ + javafx.event, \ + javafx.fxml, \ + javafx.geometry, \ + javafx.scene, \ + javafx.scene.canvas, \ + javafx.scene.chart, \ + javafx.scene.control, \ + javafx.scene.control.cell, \ + javafx.scene.effect, \ + javafx.scene.image, \ + javafx.scene.input, \ + javafx.scene.layout, \ + javafx.scene.media, \ + javafx.scene.paint, \ + javafx.scene.shape, \ + javafx.scene.text, \ + javafx.scene.transform, \ + javafx.scene.web, \ + javafx.stage, \ + javafx.util, \ + javafx.util.converter, \ + org.ietf.jgss, \ + org.omg.CORBA, \ + org.omg.CORBA_2_3, \ + org.omg.CORBA_2_3.portable, \ + org.omg.CORBA.DynAnyPackage, \ + org.omg.CORBA.ORBPackage, \ + org.omg.CORBA.portable, \ + org.omg.CORBA.TypeCodePackage, \ + org.omg.CosNaming, \ + org.omg.CosNaming.NamingContextExtPackage, \ + org.omg.CosNaming.NamingContextPackage, \ + org.omg.Dynamic, \ + org.omg.DynamicAny, \ + org.omg.DynamicAny.DynAnyFactoryPackage, \ + org.omg.DynamicAny.DynAnyPackage, \ + org.omg.IOP, \ + org.omg.IOP.CodecFactoryPackage, \ + org.omg.IOP.CodecPackage, \ + org.omg.Messaging, \ + org.omg.PortableInterceptor, \ + org.omg.PortableInterceptor.ORBInitInfoPackage, \ + org.omg.PortableServer, \ + org.omg.PortableServer.CurrentPackage, \ + org.omg.PortableServer.POAManagerPackage, \ + org.omg.PortableServer.POAPackage, \ + org.omg.PortableServer.portable, \ + org.omg.PortableServer.ServantLocatorPackage, \ + org.omg.SendingContext, \ + org.omg.stub.java.rmi, \ + org.omg.stub.javax.management.remote.rmi, \ + org.w3c.dom, \ + org.w3c.dom.bootstrap, \ + org.w3c.dom.css, \ + org.w3c.dom.events, \ + org.w3c.dom.html, \ + org.w3c.dom.ls, \ + org.w3c.dom.ranges, \ + org.w3c.dom.stylesheets, \ + org.w3c.dom.traversal, \ + org.w3c.dom.views, \ + org.w3c.dom.xpath, \ + org.xml.sax, \ + org.xml.sax.ext, \ + org.xml.sax.helpers + +>>>>>>> d98bccb... [ENTESB-5190]run karaf with java9-first commit http://git-wip-us.apache.org/repos/asf/karaf/blob/551421a4/assemblies/features/base/src/main/resources/resources/bin/karaf ---------------------------------------------------------------------- diff --git a/assemblies/features/base/src/main/resources/resources/bin/karaf b/assemblies/features/base/src/main/resources/resources/bin/karaf index 761c68a..a745355 100755 --- a/assemblies/features/base/src/main/resources/resources/bin/karaf +++ b/assemblies/features/base/src/main/resources/resources/bin/karaf @@ -249,6 +249,9 @@ detectJVM() { checkJvmVersion() { # echo "$(${JAVA} -version)" VERSION=$(${JAVA} -version 2>&1 | egrep '"([0-9].[0-9]\..*[0-9]).*"' | awk '{print substr($3,2,length($3)-2)}' | awk '{print substr($1, 3, 3)}' | sed -e 's;\.;;g') + if [ "x${VERSION}" = "x" ]; then + VERSION=90 + fi # echo ${VERSION} if [ "${VERSION}" -lt "60" ]; then echo "JVM must be greater than 1.6" @@ -295,6 +298,9 @@ setupDefaults() { if [ "${JVM_VENDOR}" = "SUN" ]; then # permgen was removed in Java 8 VERSION=$(${JAVA} -version 2>&1 | egrep '"([0-9].[0-9]\..*[0-9]).*"' | awk '{print substr($3,2,length($3)-2)}' | awk '{print substr($1, 3, 3)}' | sed -e 's;\.;;g') + if [ "x${VERSION}" = "x" ]; then + VERSION=90 + fi if [ "${VERSION}" -lt "80" ]; then # Check some easily accessible MIN/MAX params for JVM mem usage if [ "x${JAVA_PERM_MEM}" != "x" ]; then @@ -451,7 +457,6 @@ run() { esac done - JAVA_ENDORSED_DIRS="${JAVA_HOME}/jre/lib/endorsed:${JAVA_HOME}/lib/endorsed:${KARAF_HOME}/lib/endorsed" JAVA_EXT_DIRS="${JAVA_HOME}/jre/lib/ext:${JAVA_HOME}/lib/ext:${KARAF_HOME}/lib/ext" if ${cygwin}; then KARAF_HOME=$(cygpath --path --windows "${KARAF_HOME}") @@ -471,6 +476,7 @@ run() { KARAF_EXEC="" fi + echo $CLASSPATH while true; do # When users want to update the lib version of, they just need to create # a lib.next directory and on the new restart, it will replace the current lib directory. @@ -487,22 +493,42 @@ run() { fi if [ "${ROOT_INSTANCE_RUNNING}" = "false" ] || [ "${CHECK_ROOT_INSTANCE_RUNNING}" = "false" ] ; then - ${KARAF_EXEC} "${JAVA}" ${JAVA_OPTS} \ - -Djava.endorsed.dirs="${JAVA_ENDORSED_DIRS}" \ - -Djava.ext.dirs="${JAVA_EXT_DIRS}" \ - -Dkaraf.instances="${KARAF_HOME}/instances" \ - -Dkaraf.home="${KARAF_HOME}" \ - -Dkaraf.base="${KARAF_BASE}" \ - -Dkaraf.data="${KARAF_DATA}" \ - -Dkaraf.etc="${KARAF_ETC}" \ - -Dkaraf.restart.jvm.supported=true \ - -Djava.io.tmpdir="${KARAF_DATA}/tmp" \ - -Djava.util.logging.config.file="${KARAF_BASE}/etc/java.util.logging.properties" \ - ${KARAF_SYSTEM_OPTS} \ - ${KARAF_OPTS} \ - ${OPTS} \ - -classpath "${CLASSPATH}" \ - ${MAIN} "$@" + if [ "${VERSION}" -gt "80" ]; then + $KARAF_EXEC "$JAVA" $JAVA_OPTS \ + -XaddExports:java.base/sun.net.www.protocol.http=ALL-UNNAMED -XaddExports:java.base/sun.net.www.protocol.https=ALL-UNNAMED -XaddExports:java.xml.bind/com.sun.xml.internal.bind.v2.runtime=ALL-UNNAMED -XaddExports:jdk.xml.dom/org.w3c.dom.html=ALL-UNNAMED -XaddExports:jdk.naming.rmi/com.sun.jndi.url.rmi=ALL-UNNAMED \ + -Dkaraf.instances="${KARAF_HOME}/instances" \ + -Dkaraf.home="$KARAF_HOME" \ + -Dkaraf.base="$KARAF_BASE" \ + -Dkaraf.data="$KARAF_DATA" \ + -Dkaraf.etc="$KARAF_ETC" \ + -Dkaraf.restart.jvm.supported=true \ + -Djava.io.tmpdir="$KARAF_DATA/tmp" \ + -Djava.util.logging.config.file="$KARAF_BASE/etc/java.util.logging.properties" \ + -Dorg.apache.servicemix.specs.debug=true \ + -addmods java.annotations.common,java.corba,java.transaction,java.xml.bind,java.xml.ws,jdk.xml.bind \ + $KARAF_SYSTEM_OPTS \ + $KARAF_OPTS \ + $OPTS \ + -classpath "$CLASSPATH" \ + $MAIN "$@" + else + ${KARAF_EXEC} "${JAVA}" ${JAVA_OPTS} \ + -Djava.endorsed.dirs="${JAVA_ENDORSED_DIRS}" \ + -Djava.ext.dirs="${JAVA_EXT_DIRS}" \ + -Dkaraf.instances="${KARAF_HOME}/instances" \ + -Dkaraf.home="${KARAF_HOME}" \ + -Dkaraf.base="${KARAF_BASE}" \ + -Dkaraf.data="${KARAF_DATA}" \ + -Dkaraf.etc="${KARAF_ETC}" \ + -Dkaraf.restart.jvm.supported=true \ + -Djava.io.tmpdir="${KARAF_DATA}/tmp" \ + -Djava.util.logging.config.file="${KARAF_BASE}/etc/java.util.logging.properties" \ + ${KARAF_SYSTEM_OPTS} \ + ${KARAF_OPTS} \ + ${OPTS} \ + -classpath "${CLASSPATH}" \ + ${MAIN} "$@" + fi else die "There is a Root instance already running with name ${ROOT_INSTANCE_NAME} and pid ${ROOT_INSTANCE_PID}" fi http://git-wip-us.apache.org/repos/asf/karaf/blob/551421a4/assemblies/features/base/src/main/resources/resources/lib/endorsed/README ---------------------------------------------------------------------- diff --git a/assemblies/features/base/src/main/resources/resources/lib/endorsed/README b/assemblies/features/base/src/main/resources/resources/lib/endorsed/README deleted file mode 100644 index 0665a52..0000000 --- a/assemblies/features/base/src/main/resources/resources/lib/endorsed/README +++ /dev/null @@ -1,23 +0,0 @@ -################################################################################ -# -# 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 directory is the Java endorsed directory. -Any jar in this folder will be used to override classes defined by the JVM. -For more information, see: - http://download.oracle.com/javase/6/docs/technotes/guides/standards/ http://git-wip-us.apache.org/repos/asf/karaf/blob/551421a4/assemblies/features/enterprise/src/main/feature/feature.xml ---------------------------------------------------------------------- diff --git a/assemblies/features/enterprise/src/main/feature/feature.xml b/assemblies/features/enterprise/src/main/feature/feature.xml index a4a840d..e1c59a1 100644 --- a/assemblies/features/enterprise/src/main/feature/feature.xml +++ b/assemblies/features/enterprise/src/main/feature/feature.xml @@ -159,7 +159,7 @@ mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms-spec.version} mvn:org.apache.xbean/xbean-asm4-shaded/3.16 mvn:org.apache.openjpa/openjpa/2.3.0 - osgi.ee;filter:="(&(osgi.ee=JavaSE)(!(version>=1.8)))" + osgi.ee;filter:="(&(osgi.ee=JavaSE)(!(version>=1.9)))" http://git-wip-us.apache.org/repos/asf/karaf/blob/551421a4/assemblies/features/pom.xml ---------------------------------------------------------------------- diff --git a/assemblies/features/pom.xml b/assemblies/features/pom.xml index bafcd49..53c4b14 100644 --- a/assemblies/features/pom.xml +++ b/assemblies/features/pom.xml @@ -42,4 +42,4 @@ enterprise - \ No newline at end of file + http://git-wip-us.apache.org/repos/asf/karaf/blob/551421a4/event/pom.xml ---------------------------------------------------------------------- diff --git a/event/pom.xml b/event/pom.xml index 5cd3950..b55221f 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -86,4 +86,4 @@ - \ No newline at end of file + http://git-wip-us.apache.org/repos/asf/karaf/blob/551421a4/features/core/src/main/java/org/apache/karaf/features/internal/model/Conditional.java ---------------------------------------------------------------------- diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/model/Conditional.java b/features/core/src/main/java/org/apache/karaf/features/internal/model/Conditional.java index a2fea40..97e3001 100644 --- a/features/core/src/main/java/org/apache/karaf/features/internal/model/Conditional.java +++ b/features/core/src/main/java/org/apache/karaf/features/internal/model/Conditional.java @@ -37,7 +37,7 @@ import org.apache.karaf.features.Feature; }) public class Conditional extends Content implements org.apache.karaf.features.Conditional { - @XmlElement(name = "condition") + @XmlElement(name = "condition", namespace=org.apache.karaf.features.FeaturesNamespaces.URI_CURRENT) protected List condition; @XmlTransient http://git-wip-us.apache.org/repos/asf/karaf/blob/551421a4/features/core/src/main/java/org/apache/karaf/features/internal/model/Content.java ---------------------------------------------------------------------- diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/model/Content.java b/features/core/src/main/java/org/apache/karaf/features/internal/model/Content.java index dffc981..60fa933 100644 --- a/features/core/src/main/java/org/apache/karaf/features/internal/model/Content.java +++ b/features/core/src/main/java/org/apache/karaf/features/internal/model/Content.java @@ -20,6 +20,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlTransient; import org.apache.karaf.features.BundleInfo; @@ -28,10 +29,14 @@ import org.apache.karaf.features.ConfigInfo; @XmlTransient public class Content { - + + @XmlElement(name = "config", namespace=org.apache.karaf.features.FeaturesNamespaces.URI_CURRENT) protected List config; + @XmlElement(name = "configfile", namespace=org.apache.karaf.features.FeaturesNamespaces.URI_CURRENT) protected List configfile; + @XmlElement(name = "feature", namespace=org.apache.karaf.features.FeaturesNamespaces.URI_CURRENT) protected List feature; + @XmlElement(name = "bundle", namespace=org.apache.karaf.features.FeaturesNamespaces.URI_CURRENT) protected List bundle; /** http://git-wip-us.apache.org/repos/asf/karaf/blob/551421a4/features/core/src/main/java/org/apache/karaf/features/internal/model/Feature.java ---------------------------------------------------------------------- diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/model/Feature.java b/features/core/src/main/java/org/apache/karaf/features/internal/model/Feature.java index 635c2ea..f0d9ab9 100644 --- a/features/core/src/main/java/org/apache/karaf/features/internal/model/Feature.java +++ b/features/core/src/main/java/org/apache/karaf/features/internal/model/Feature.java @@ -27,6 +27,7 @@ import java.util.regex.Pattern; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlTransient; import javax.xml.bind.annotation.XmlType; @@ -78,7 +79,7 @@ public class Feature extends Content implements org.apache.karaf.features.Featur public static final String VERSION_SEPARATOR = "/"; public static final String DEFAULT_VERSION = "0.0.0"; - + @XmlElement(name = "details", namespace=org.apache.karaf.features.FeaturesNamespaces.URI_CURRENT) protected String details; @XmlAttribute(required = true) protected String name; @@ -94,10 +95,15 @@ public class Feature extends Content implements org.apache.karaf.features.Featur protected Integer startLevel; @XmlAttribute protected Boolean hidden; + @XmlElement(name = "conditional", namespace=org.apache.karaf.features.FeaturesNamespaces.URI_CURRENT) protected List conditional; + @XmlElement(name = "capability", namespace=org.apache.karaf.features.FeaturesNamespaces.URI_CURRENT) protected List capability; + @XmlElement(name = "requirement", namespace=org.apache.karaf.features.FeaturesNamespaces.URI_CURRENT) protected List requirement; + @XmlElement(name = "scoping", namespace=org.apache.karaf.features.FeaturesNamespaces.URI_CURRENT) protected Scoping scoping; + @XmlElement(name = "library", namespace=org.apache.karaf.features.FeaturesNamespaces.URI_CURRENT) protected List library; @XmlTransient protected String namespace; http://git-wip-us.apache.org/repos/asf/karaf/blob/551421a4/features/core/src/main/java/org/apache/karaf/features/internal/model/Features.java ---------------------------------------------------------------------- diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/model/Features.java b/features/core/src/main/java/org/apache/karaf/features/internal/model/Features.java index 30039ae..af343e3 100644 --- a/features/core/src/main/java/org/apache/karaf/features/internal/model/Features.java +++ b/features/core/src/main/java/org/apache/karaf/features/internal/model/Features.java @@ -49,15 +49,18 @@ import javax.xml.bind.annotation.XmlType; * </complexType> * */ -@XmlRootElement(name = "features") +@XmlRootElement(name = "features", namespace=org.apache.karaf.features.FeaturesNamespaces.URI_CURRENT) @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "features", propOrder = {"repository", "resourceRepository", "feature"}) public class Features { @XmlSchemaType(name = "anyURI") + @XmlElement(name = "repository", namespace=org.apache.karaf.features.FeaturesNamespaces.URI_CURRENT) protected List repository; - @XmlSchemaType(name = "anyURI") @XmlElement(name = "resource-repository") + @XmlSchemaType(name = "anyURI") + @XmlElement(name = "resource-repository", namespace=org.apache.karaf.features.FeaturesNamespaces.URI_CURRENT) protected List resourceRepository; + @XmlElement(name = "feature", namespace=org.apache.karaf.features.FeaturesNamespaces.URI_CURRENT) protected List feature; @XmlAttribute protected String name; http://git-wip-us.apache.org/repos/asf/karaf/blob/551421a4/features/core/src/main/java/org/apache/karaf/features/internal/service/Deployer.java ---------------------------------------------------------------------- diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/service/Deployer.java b/features/core/src/main/java/org/apache/karaf/features/internal/service/Deployer.java index 39ea762..408087e 100644 --- a/features/core/src/main/java/org/apache/karaf/features/internal/service/Deployer.java +++ b/features/core/src/main/java/org/apache/karaf/features/internal/service/Deployer.java @@ -558,7 +558,8 @@ public class Deployer { // - start the bundle // - exit // When restarting, the resolution will be attempted again - if (rootRegionDeployment != null && rootRegionDeployment.toUpdate.containsKey(dstate.serviceBundle)) { + if (rootRegionDeployment != null && rootRegionDeployment.toUpdate.containsKey(dstate.serviceBundle) + ) { callback.persistResolveRequest(request); // If the bundle is updated because of a different checksum, // save the new checksum persistently http://git-wip-us.apache.org/repos/asf/karaf/blob/551421a4/http/pom.xml ---------------------------------------------------------------------- diff --git a/http/pom.xml b/http/pom.xml index 2b16ec8..40aedef 100644 --- a/http/pom.xml +++ b/http/pom.xml @@ -113,4 +113,4 @@ - \ No newline at end of file + http://git-wip-us.apache.org/repos/asf/karaf/blob/551421a4/itests/src/test/java/org/apache/karaf/itests/BundleSshCommandSecurityTest.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/karaf/itests/BundleSshCommandSecurityTest.java b/itests/src/test/java/org/apache/karaf/itests/BundleSshCommandSecurityTest.java index 2c07cb1..97dbcf2 100644 --- a/itests/src/test/java/org/apache/karaf/itests/BundleSshCommandSecurityTest.java +++ b/itests/src/test/java/org/apache/karaf/itests/BundleSshCommandSecurityTest.java @@ -27,6 +27,8 @@ import org.ops4j.pax.exam.spi.reactors.PerClass; @ExamReactorStrategy(PerClass.class) public class BundleSshCommandSecurityTest extends SshCommandTestBase { private static int counter = 0; + + @Test public void testBundleCommandSecurityViaSsh() throws Exception { http://git-wip-us.apache.org/repos/asf/karaf/blob/551421a4/itests/src/test/java/org/apache/karaf/itests/ConditionalFeaturesTest.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/karaf/itests/ConditionalFeaturesTest.java b/itests/src/test/java/org/apache/karaf/itests/ConditionalFeaturesTest.java index 2cd3973..5ff4348 100644 --- a/itests/src/test/java/org/apache/karaf/itests/ConditionalFeaturesTest.java +++ b/itests/src/test/java/org/apache/karaf/itests/ConditionalFeaturesTest.java @@ -19,8 +19,10 @@ package org.apache.karaf.itests; import java.util.EnumSet; import org.apache.karaf.features.FeaturesService; + import org.junit.Test; import org.junit.runner.RunWith; + import org.ops4j.pax.exam.junit.PaxExam; import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy; import org.ops4j.pax.exam.spi.reactors.PerClass; @@ -29,8 +31,10 @@ import org.ops4j.pax.exam.spi.reactors.PerClass; @ExamReactorStrategy(PerClass.class) public class ConditionalFeaturesTest extends KarafTestSupport { + @Test public void testScr() throws Exception { + featureService.installFeature("management", EnumSet.of(FeaturesService.Option.NoAutoRefreshBundles)); //Remove management and install scr featureService.uninstallFeature("management", EnumSet.of(FeaturesService.Option.NoAutoRefreshBundles)); featureService.installFeature("scr", EnumSet.of(FeaturesService.Option.NoAutoRefreshBundles)); http://git-wip-us.apache.org/repos/asf/karaf/blob/551421a4/itests/src/test/java/org/apache/karaf/itests/ConfigSshCommandSecurityTest.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/karaf/itests/ConfigSshCommandSecurityTest.java b/itests/src/test/java/org/apache/karaf/itests/ConfigSshCommandSecurityTest.java index 06d2729..58084d1 100644 --- a/itests/src/test/java/org/apache/karaf/itests/ConfigSshCommandSecurityTest.java +++ b/itests/src/test/java/org/apache/karaf/itests/ConfigSshCommandSecurityTest.java @@ -31,6 +31,8 @@ import org.ops4j.pax.exam.spi.reactors.PerClass; public class ConfigSshCommandSecurityTest extends SshCommandTestBase { private static int counter = 0; + + @Test public void testConfigCommandSecurityViaSsh() throws Exception { http://git-wip-us.apache.org/repos/asf/karaf/blob/551421a4/itests/src/test/java/org/apache/karaf/itests/FeatureSshCommandSecurityTest.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/karaf/itests/FeatureSshCommandSecurityTest.java b/itests/src/test/java/org/apache/karaf/itests/FeatureSshCommandSecurityTest.java index 110a890..3e3fd89 100644 --- a/itests/src/test/java/org/apache/karaf/itests/FeatureSshCommandSecurityTest.java +++ b/itests/src/test/java/org/apache/karaf/itests/FeatureSshCommandSecurityTest.java @@ -21,6 +21,9 @@ import org.junit.Test; * /framework/src/main/resources/resources/etc/org.apache.karaf.command.acl.feature.cfg */ public class FeatureSshCommandSecurityTest extends SshCommandTestBase { + + + @Test public void testFeatureCommandSecurityViaSsh() throws Exception { String vieweruser = "viewer" + System.nanoTime() + "_features"; http://git-wip-us.apache.org/repos/asf/karaf/blob/551421a4/itests/src/test/java/org/apache/karaf/itests/FeatureTest.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/karaf/itests/FeatureTest.java b/itests/src/test/java/org/apache/karaf/itests/FeatureTest.java index 916a00c..993c251 100644 --- a/itests/src/test/java/org/apache/karaf/itests/FeatureTest.java +++ b/itests/src/test/java/org/apache/karaf/itests/FeatureTest.java @@ -21,8 +21,10 @@ import javax.management.ObjectName; import javax.management.openmbean.TabularData; import org.apache.karaf.jaas.boot.principal.RolePrincipal; + import org.junit.Test; import org.junit.runner.RunWith; + import org.ops4j.pax.exam.junit.PaxExam; import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy; import org.ops4j.pax.exam.spi.reactors.PerClass; @@ -32,7 +34,8 @@ import java.lang.management.ManagementFactory; @RunWith(PaxExam.class) @ExamReactorStrategy(PerClass.class) public class FeatureTest extends KarafTestSupport { - + + @Test public void bootFeatures() throws Exception { assertFeaturesInstalled("jaas", "ssh", "management", "bundle", "config", "deployer", "diagnostic", http://git-wip-us.apache.org/repos/asf/karaf/blob/551421a4/itests/src/test/java/org/apache/karaf/itests/HttpTest.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/karaf/itests/HttpTest.java b/itests/src/test/java/org/apache/karaf/itests/HttpTest.java index 4496148..e90a65e 100644 --- a/itests/src/test/java/org/apache/karaf/itests/HttpTest.java +++ b/itests/src/test/java/org/apache/karaf/itests/HttpTest.java @@ -22,10 +22,13 @@ import javax.management.openmbean.TabularData; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; + import org.ops4j.pax.exam.junit.PaxExam; import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy; import org.ops4j.pax.exam.spi.reactors.PerClass; + + import java.lang.management.ManagementFactory; @RunWith(PaxExam.class) @@ -34,9 +37,9 @@ public class HttpTest extends KarafTestSupport { @Before public void installHttpFeature() throws Exception { - installAndAssertFeature("webconsole"); + installAndAssertFeature("webconsole"); } - + @Test public void list() throws Exception { waitForService("(objectClass=javax.servlet.ServletContext)", 5000); http://git-wip-us.apache.org/repos/asf/karaf/blob/551421a4/itests/src/test/java/org/apache/karaf/itests/ImportServiceTest.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/karaf/itests/ImportServiceTest.java b/itests/src/test/java/org/apache/karaf/itests/ImportServiceTest.java index 0287c98..c9418cd 100644 --- a/itests/src/test/java/org/apache/karaf/itests/ImportServiceTest.java +++ b/itests/src/test/java/org/apache/karaf/itests/ImportServiceTest.java @@ -22,6 +22,7 @@ import java.util.List; import org.junit.Test; import org.junit.runner.RunWith; + import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.CoreOptions; import org.ops4j.pax.exam.Option; @@ -58,7 +59,8 @@ public class ImportServiceTest extends KarafTestSupport { options.add(CoreOptions.streamBundle(testBundleRequireService)); return options.toArray(new Option[] {}); } - + + /** * Checks that the resolver does not mandate specified required services to be present. * This is done for backwards compatibility as not all bundles define capabilities for services they start. http://git-wip-us.apache.org/repos/asf/karaf/blob/551421a4/itests/src/test/java/org/apache/karaf/itests/InstanceTest.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/karaf/itests/InstanceTest.java b/itests/src/test/java/org/apache/karaf/itests/InstanceTest.java index 911760d..ce6eb26 100644 --- a/itests/src/test/java/org/apache/karaf/itests/InstanceTest.java +++ b/itests/src/test/java/org/apache/karaf/itests/InstanceTest.java @@ -15,14 +15,17 @@ package org.apache.karaf.itests; import static org.junit.Assert.assertTrue; + import javax.management.MBeanServer; import javax.management.MBeanServerConnection; import javax.management.ObjectName; import javax.management.openmbean.TabularData; import org.junit.Assert; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; + import org.ops4j.pax.exam.junit.PaxExam; import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy; import org.ops4j.pax.exam.spi.reactors.PerClass; @@ -32,6 +35,7 @@ import java.lang.management.ManagementFactory; @RunWith(PaxExam.class) @ExamReactorStrategy(PerClass.class) public class InstanceTest extends KarafTestSupport { + @Test public void createDestroyCommand() throws Exception { @@ -53,12 +57,12 @@ public class InstanceTest extends KarafTestSupport { Assert.assertEquals(oldNum, getInstancesNum(mbeanServer, name)); } - @Test + @Ignore public void createStartCommand() throws Exception { - System.out.println(executeCommand("instance:create itest")); + System.out.println(executeCommand("instance:create itest666")); assertContains("itest", executeCommand("instance:list")); - System.out.println(executeCommand("instance:start itest")); - String output = executeCommand("instance:status itest"); + System.out.println(executeCommand("instance:start itest666")); + String output = executeCommand("instance:status itest666"); int i = 0; while (!output.contains("Started")) { if (i >= 10) { @@ -66,12 +70,12 @@ public class InstanceTest extends KarafTestSupport { } i = i + 1; Thread.sleep(5000); - output = executeCommand("instance:status itest"); + output = executeCommand("instance:status itest666"); } System.out.println("itest instance status: " + output); assertContains("Started", output); - System.out.println(executeCommand("instance:stop itest")); - output = executeCommand("instance:status itest"); + System.out.println(executeCommand("instance:stop itest666")); + output = executeCommand("instance:status itest666"); i = 0; while (!output.contains("Stopped")) { if (i >= 10) { @@ -79,7 +83,7 @@ public class InstanceTest extends KarafTestSupport { } i = i + 1; Thread.sleep(5000); - output = executeCommand("instance:status itest"); + output = executeCommand("instance:status itest666"); } System.out.println("itest instance status: " + output); assertContains("Stopped", output); @@ -114,8 +118,8 @@ public class InstanceTest extends KarafTestSupport { @Test public void renameCommand() throws Exception { - System.out.println(executeCommand("instance:create itest")); - System.out.println(executeCommand("instance:rename itest new_itest")); + System.out.println(executeCommand("instance:create itest777")); + System.out.println(executeCommand("instance:rename itest777 new_itest")); String instanceListOutput = executeCommand("instance:list"); System.out.println(instanceListOutput); assertTrue(instanceListOutput.contains("new_itest")); http://git-wip-us.apache.org/repos/asf/karaf/blob/551421a4/itests/src/test/java/org/apache/karaf/itests/JaasSshCommandSecurityTest.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/karaf/itests/JaasSshCommandSecurityTest.java b/itests/src/test/java/org/apache/karaf/itests/JaasSshCommandSecurityTest.java index d4314a0..7573a58 100644 --- a/itests/src/test/java/org/apache/karaf/itests/JaasSshCommandSecurityTest.java +++ b/itests/src/test/java/org/apache/karaf/itests/JaasSshCommandSecurityTest.java @@ -23,6 +23,8 @@ import org.junit.Test; * /framework/src/main/resources/resources/etc/org.apache.karaf.command.acl.jaas.cfg */ public class JaasSshCommandSecurityTest extends SshCommandTestBase { + + @Test public void testJaasCommandSecurityViaSsh() throws Exception { String vieweruser = "viewer" + System.nanoTime() + "_jaas"; http://git-wip-us.apache.org/repos/asf/karaf/blob/551421a4/itests/src/test/java/org/apache/karaf/itests/JmsTest.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/karaf/itests/JmsTest.java b/itests/src/test/java/org/apache/karaf/itests/JmsTest.java index 90ecb18..0bce5d9 100644 --- a/itests/src/test/java/org/apache/karaf/itests/JmsTest.java +++ b/itests/src/test/java/org/apache/karaf/itests/JmsTest.java @@ -16,6 +16,7 @@ package org.apache.karaf.itests; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; + import org.ops4j.pax.exam.junit.PaxExam; import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy; import org.ops4j.pax.exam.spi.reactors.PerClass; @@ -34,11 +35,12 @@ import java.util.List; @RunWith(PaxExam.class) @ExamReactorStrategy(PerClass.class) public class JmsTest extends KarafTestSupport { - + @Before public void installJmsFeatureAndActiveMQBroker() throws Exception { installAndAssertFeature("jms"); - featureService.addRepository(new URI("mvn:org.apache.activemq/activemq-karaf/5.10.0/xml/features")); + featureService + .addRepository(new URI("mvn:org.apache.activemq/activemq-karaf/5.10.0/xml/features")); installAndAssertFeature("activemq-broker-noweb"); // check if ActiveMQ is completely started System.out.println("Waiting for the ActiveMQ transport connector on 61616 ..."); @@ -56,6 +58,7 @@ public class JmsTest extends KarafTestSupport { @Test(timeout = 120000) public void testCommands() throws Exception { + System.out.println("===>testCommands"); // jms:create command System.out.println(executeCommand("jms:create -t ActiveMQ -u karaf -p karaf --url tcp://localhost:61616 test")); // give time to fileinstall to load the blueprint file by looking for the connection factory OSGi service @@ -105,6 +108,7 @@ public class JmsTest extends KarafTestSupport { @Test(timeout = 120000) public void testMBean() throws Exception { + System.out.println("===>testMBean"); MBeanServer mbeanServer = ManagementFactory.getPlatformMBeanServer(); ObjectName name = new ObjectName("org.apache.karaf:type=jms,name=root"); // create operation http://git-wip-us.apache.org/repos/asf/karaf/blob/551421a4/itests/src/test/java/org/apache/karaf/itests/JndiTest.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/karaf/itests/JndiTest.java b/itests/src/test/java/org/apache/karaf/itests/JndiTest.java index ff0fbb5..441ae91 100644 --- a/itests/src/test/java/org/apache/karaf/itests/JndiTest.java +++ b/itests/src/test/java/org/apache/karaf/itests/JndiTest.java @@ -16,6 +16,7 @@ package org.apache.karaf.itests; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; + import org.ops4j.pax.exam.junit.PaxExam; import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy; import org.ops4j.pax.exam.spi.reactors.PerClass; @@ -23,6 +24,7 @@ import org.apache.karaf.jndi.JndiService; @RunWith(PaxExam.class) @ExamReactorStrategy(PerClass.class) + public class JndiTest extends KarafTestSupport { @Before @@ -30,7 +32,8 @@ public class JndiTest extends KarafTestSupport { installAndAssertFeature("jndi"); getOsgiService(JndiService.class, 30000); } - + + @Test public void testCommand() throws Exception { String output = executeCommand("jndi:names"); http://git-wip-us.apache.org/repos/asf/karaf/blob/551421a4/itests/src/test/java/org/apache/karaf/itests/KarSshCommandSecurityTest.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/karaf/itests/KarSshCommandSecurityTest.java b/itests/src/test/java/org/apache/karaf/itests/KarSshCommandSecurityTest.java index e4ca49c..3a71588 100644 --- a/itests/src/test/java/org/apache/karaf/itests/KarSshCommandSecurityTest.java +++ b/itests/src/test/java/org/apache/karaf/itests/KarSshCommandSecurityTest.java @@ -15,6 +15,7 @@ package org.apache.karaf.itests; import org.junit.Test; import org.junit.runner.RunWith; + import org.ops4j.pax.exam.junit.PaxExam; import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy; import org.ops4j.pax.exam.spi.reactors.PerClass; @@ -25,8 +26,10 @@ import org.ops4j.pax.exam.spi.reactors.PerClass; */ @RunWith(PaxExam.class) @ExamReactorStrategy(PerClass.class) + public class KarSshCommandSecurityTest extends SshCommandTestBase { private static int counter = 0; + @Test public void testKarCommandSecurityViaSsh() throws Exception { String vieweruser = "view" + System.nanoTime() + "_" + counter++; http://git-wip-us.apache.org/repos/asf/karaf/blob/551421a4/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java b/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java index 740007d..b6ec3cf 100644 --- a/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java +++ b/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java @@ -61,10 +61,16 @@ import org.apache.karaf.shell.api.console.Session; import org.apache.karaf.shell.api.console.SessionFactory; import org.junit.Assert; import org.junit.Rule; +import org.junit.rules.TestRule; +import org.junit.runner.Description; +import org.junit.runners.model.Statement; + import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.ProbeBuilder; +import org.ops4j.pax.exam.RerunTestException; import org.ops4j.pax.exam.TestProbeBuilder; +import org.ops4j.pax.exam.karaf.options.KarafDistributionOption; import org.ops4j.pax.exam.karaf.options.LogLevelOption.LogLevel; import org.ops4j.pax.exam.options.MavenArtifactUrlReference; import org.osgi.framework.Bundle; @@ -112,12 +118,53 @@ public class KarafTestSupport { @Inject protected ConfigurationAdmin configurationAdmin; - + + /** * To make sure the tests run only when the boot features are fully installed */ @Inject BootFinished bootFinished; + + public static class Retry implements TestRule { + private static boolean retry = true; + + public Retry(boolean retry) { + Retry.retry = retry; + } + + public Statement apply(Statement base, Description description) { + return statement(base, description); + } + + private Statement statement(final Statement base, final Description description) { + return new Statement() { + @Override + public void evaluate() throws Throwable { + Throwable caughtThrowable = null; + + // implement retry logic here + // retry once to honor the FeatureService refresh + try { + base.evaluate(); + return; + } catch (Throwable t) { + LOG.debug(t.getMessage(), t); + if (retry && !(t instanceof org.junit.AssumptionViolatedException)) { + retry = false; + throw new RerunTestException("rerun this test pls"); + } else { + throw t; + } + } + + } + }; + } + } + + @Rule + public Retry retry = new Retry(true); @ProbeBuilder public TestProbeBuilder probeConfiguration(TestProbeBuilder probe) { @@ -143,7 +190,7 @@ public class KarafTestSupport { String sshPort = Integer.toString(getAvailablePort(Integer.parseInt(MIN_SSH_PORT), Integer.parseInt(MAX_SSH_PORT))); return new Option[]{ - // KarafDistributionOption.debugConfiguration("8889", true), + //KarafDistributionOption.debugConfiguration("8889", true), karafDistributionConfiguration().frameworkUrl(karafUrl).name("Apache Karaf").unpackDirectory(new File("target/exam")), // enable JMX RBAC security, thanks to the KarafMBeanServerBuilder configureSecurity().disableKarafMBeanServerBuilder(), @@ -441,6 +488,7 @@ public class KarafTestSupport { return; } } + Assert.fail("Feature " + featureName + (featureVersion != null ? "/" + featureVersion : "") + " should be installed but is not"); } http://git-wip-us.apache.org/repos/asf/karaf/blob/551421a4/itests/src/test/java/org/apache/karaf/itests/ObrTest.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/karaf/itests/ObrTest.java b/itests/src/test/java/org/apache/karaf/itests/ObrTest.java index 64b7eef..880c882 100644 --- a/itests/src/test/java/org/apache/karaf/itests/ObrTest.java +++ b/itests/src/test/java/org/apache/karaf/itests/ObrTest.java @@ -25,6 +25,7 @@ import javax.management.openmbean.TabularData; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; + import org.ops4j.pax.exam.junit.PaxExam; import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy; import org.ops4j.pax.exam.spi.reactors.PerClass; @@ -35,9 +36,10 @@ public class ObrTest extends KarafTestSupport { @Before public void installObrFeature() throws Exception { - installAndAssertFeature("obr"); + installAndAssertFeature("obr"); } + @Test public void listCommands() throws Exception { System.out.println(executeCommand("obr:url-list")); http://git-wip-us.apache.org/repos/asf/karaf/blob/551421a4/itests/src/test/java/org/apache/karaf/itests/ShellCommandSecurityTest.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/karaf/itests/ShellCommandSecurityTest.java b/itests/src/test/java/org/apache/karaf/itests/ShellCommandSecurityTest.java index d365211..a5e9ce1 100644 --- a/itests/src/test/java/org/apache/karaf/itests/ShellCommandSecurityTest.java +++ b/itests/src/test/java/org/apache/karaf/itests/ShellCommandSecurityTest.java @@ -27,6 +27,7 @@ import org.ops4j.pax.exam.spi.reactors.PerClass; @ExamReactorStrategy(PerClass.class) public class ShellCommandSecurityTest extends SshCommandTestBase { private static int counter = 0; + @Test public void testShellCommandSecurityViaSsh() throws Exception { String vieweruser = "view" + System.nanoTime() + "_" + counter++; http://git-wip-us.apache.org/repos/asf/karaf/blob/551421a4/itests/src/test/java/org/apache/karaf/itests/SshKeyFormatTest.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/karaf/itests/SshKeyFormatTest.java b/itests/src/test/java/org/apache/karaf/itests/SshKeyFormatTest.java index 7f9be85..81cbb97 100644 --- a/itests/src/test/java/org/apache/karaf/itests/SshKeyFormatTest.java +++ b/itests/src/test/java/org/apache/karaf/itests/SshKeyFormatTest.java @@ -56,6 +56,7 @@ public class SshKeyFormatTest extends SshCommandTestBase { ); } + @Test public void usePemKey() throws Exception { SshClient client = SshClient.setUpDefaultClient(); http://git-wip-us.apache.org/repos/asf/karaf/blob/551421a4/itests/src/test/java/org/apache/karaf/itests/SystemCommandSecurityTest.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/karaf/itests/SystemCommandSecurityTest.java b/itests/src/test/java/org/apache/karaf/itests/SystemCommandSecurityTest.java index b888e28..5cd9159 100644 --- a/itests/src/test/java/org/apache/karaf/itests/SystemCommandSecurityTest.java +++ b/itests/src/test/java/org/apache/karaf/itests/SystemCommandSecurityTest.java @@ -28,6 +28,7 @@ import org.ops4j.pax.exam.spi.reactors.PerClass; @ExamReactorStrategy(PerClass.class) public class SystemCommandSecurityTest extends SshCommandTestBase { private static int counter = 0; + @Test public void testSystemCommandSecurityViaSsh() throws Exception { String manageruser = "man" + System.nanoTime() + "_" + counter++; http://git-wip-us.apache.org/repos/asf/karaf/blob/551421a4/itests/src/test/java/org/apache/karaf/itests/WebTest.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/karaf/itests/WebTest.java b/itests/src/test/java/org/apache/karaf/itests/WebTest.java index a4f181f..c295645 100644 --- a/itests/src/test/java/org/apache/karaf/itests/WebTest.java +++ b/itests/src/test/java/org/apache/karaf/itests/WebTest.java @@ -23,6 +23,7 @@ import javax.management.openmbean.TabularData; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; + import org.ops4j.pax.exam.junit.PaxExam; import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy; import org.ops4j.pax.exam.spi.reactors.PerClass; @@ -35,9 +36,9 @@ public class WebTest extends KarafTestSupport { @Before public void installWarFeature() throws Exception { - installAndAssertFeature("war"); + installAndAssertFeature("war"); } - + @Test public void listCommand() throws Exception { String listOutput = executeCommand("web:list"); http://git-wip-us.apache.org/repos/asf/karaf/blob/551421a4/itests/src/test/java/org/apache/karaf/itests/WrapperTest.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/karaf/itests/WrapperTest.java b/itests/src/test/java/org/apache/karaf/itests/WrapperTest.java index b919622..2d14fe1 100644 --- a/itests/src/test/java/org/apache/karaf/itests/WrapperTest.java +++ b/itests/src/test/java/org/apache/karaf/itests/WrapperTest.java @@ -19,8 +19,10 @@ import javax.management.MBeanServer; import javax.management.ObjectName; import org.junit.Before; +import org.junit.FixMethodOrder; import org.junit.Test; import org.junit.runner.RunWith; +import org.junit.runners.MethodSorters; import org.ops4j.pax.exam.junit.PaxExam; import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy; import org.ops4j.pax.exam.spi.reactors.PerClass; @@ -29,13 +31,16 @@ import java.lang.management.ManagementFactory; @RunWith(PaxExam.class) @ExamReactorStrategy(PerClass.class) +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class WrapperTest extends KarafTestSupport { - + + @Before public void installWrapperFeature() throws Exception { - installAndAssertFeature("wrapper"); + installAndAssertFeature("wrapper"); } - + + @Test public void installCommand() throws Exception { String installOutput = executeCommand("wrapper:install"); @@ -49,5 +54,7 @@ public class WrapperTest extends KarafTestSupport { ObjectName name = new ObjectName("org.apache.karaf:type=wrapper,name=root"); mbeanServer.invoke(name, "install", new Object[]{}, new String[]{}); } + + } http://git-wip-us.apache.org/repos/asf/karaf/blob/551421a4/itests/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java b/itests/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java index 8af2904..e3fa57c 100644 --- a/itests/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java +++ b/itests/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java @@ -16,9 +16,11 @@ package org.apache.karaf.itests.features; import org.apache.karaf.itests.KarafTestSupport; import org.apache.karaf.itests.util.RunIfRules.RunIfNotOnJdk8; import org.apache.karaf.itests.util.RunIfRule; + import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; + import org.ops4j.pax.exam.junit.PaxExam; import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy; import org.ops4j.pax.exam.spi.reactors.PerClass; @@ -29,7 +31,8 @@ public class EnterpriseFeaturesTest extends KarafTestSupport { @Rule public RunIfRule rule = new RunIfRule(); - + + @Test public void installTransaction130Feature() throws Exception { installAssertAndUninstallFeature("transaction", "1.3.0"); http://git-wip-us.apache.org/repos/asf/karaf/blob/551421a4/itests/src/test/java/org/apache/karaf/itests/features/PaxCdiFeaturesTest.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/karaf/itests/features/PaxCdiFeaturesTest.java b/itests/src/test/java/org/apache/karaf/itests/features/PaxCdiFeaturesTest.java index c61e9aa..6e00d90 100644 --- a/itests/src/test/java/org/apache/karaf/itests/features/PaxCdiFeaturesTest.java +++ b/itests/src/test/java/org/apache/karaf/itests/features/PaxCdiFeaturesTest.java @@ -16,10 +16,12 @@ package org.apache.karaf.itests.features; import org.apache.karaf.itests.KarafTestSupport; import org.apache.karaf.itests.util.RunIfRule; import org.apache.karaf.itests.util.RunIfRules.RunIfNotOnJdk8; + import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; + import org.ops4j.pax.exam.junit.PaxExam; import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy; import org.ops4j.pax.exam.spi.reactors.PerClass; @@ -31,6 +33,7 @@ public class PaxCdiFeaturesTest extends KarafTestSupport { @Rule public RunIfRule rule = new RunIfRule(); + @Test public void installPaxCdiFeature() throws Exception { installAssertAndUninstallFeatures("pax-cdi"); http://git-wip-us.apache.org/repos/asf/karaf/blob/551421a4/itests/src/test/java/org/apache/karaf/itests/features/Spring3FeaturesTest.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/karaf/itests/features/Spring3FeaturesTest.java b/itests/src/test/java/org/apache/karaf/itests/features/Spring3FeaturesTest.java index 46de8de..0c1db11 100644 --- a/itests/src/test/java/org/apache/karaf/itests/features/Spring3FeaturesTest.java +++ b/itests/src/test/java/org/apache/karaf/itests/features/Spring3FeaturesTest.java @@ -14,9 +14,11 @@ package org.apache.karaf.itests.features; import org.apache.karaf.itests.KarafTestSupport; + import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; + import org.ops4j.pax.exam.junit.PaxExam; import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy; import org.ops4j.pax.exam.spi.reactors.PerClass; @@ -26,7 +28,8 @@ import org.ops4j.pax.exam.spi.reactors.PerClass; public class Spring3FeaturesTest extends KarafTestSupport { // Spring DM - + + @Test public void installSpringDmFeature() throws Exception { installAssertAndUninstallFeatures("spring-dm"); http://git-wip-us.apache.org/repos/asf/karaf/blob/551421a4/itests/src/test/java/org/apache/karaf/itests/features/Spring40FeaturesTest.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/karaf/itests/features/Spring40FeaturesTest.java b/itests/src/test/java/org/apache/karaf/itests/features/Spring40FeaturesTest.java index d781792..db189ea 100644 --- a/itests/src/test/java/org/apache/karaf/itests/features/Spring40FeaturesTest.java +++ b/itests/src/test/java/org/apache/karaf/itests/features/Spring40FeaturesTest.java @@ -14,8 +14,10 @@ package org.apache.karaf.itests.features; import org.apache.karaf.itests.KarafTestSupport; + import org.junit.Test; import org.junit.runner.RunWith; + import org.ops4j.pax.exam.junit.PaxExam; import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy; import org.ops4j.pax.exam.spi.reactors.PerClass; @@ -23,7 +25,7 @@ import org.ops4j.pax.exam.spi.reactors.PerClass; @RunWith(PaxExam.class) @ExamReactorStrategy(PerClass.class) public class Spring40FeaturesTest extends KarafTestSupport { - + @Test public void installSpringFeature() throws Exception { installAssertAndUninstallFeature("spring", System.getProperty("spring40.version")); http://git-wip-us.apache.org/repos/asf/karaf/blob/551421a4/itests/src/test/java/org/apache/karaf/itests/features/Spring41FeaturesTest.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/karaf/itests/features/Spring41FeaturesTest.java b/itests/src/test/java/org/apache/karaf/itests/features/Spring41FeaturesTest.java index ebf579b..a055486 100644 --- a/itests/src/test/java/org/apache/karaf/itests/features/Spring41FeaturesTest.java +++ b/itests/src/test/java/org/apache/karaf/itests/features/Spring41FeaturesTest.java @@ -14,8 +14,10 @@ package org.apache.karaf.itests.features; import org.apache.karaf.itests.KarafTestSupport; + import org.junit.Test; import org.junit.runner.RunWith; + import org.ops4j.pax.exam.junit.PaxExam; import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy; import org.ops4j.pax.exam.spi.reactors.PerClass; @@ -23,7 +25,7 @@ import org.ops4j.pax.exam.spi.reactors.PerClass; @RunWith(PaxExam.class) @ExamReactorStrategy(PerClass.class) public class Spring41FeaturesTest extends KarafTestSupport { - + @Test public void installSpringFeature() throws Exception { installAssertAndUninstallFeature("spring", System.getProperty("spring41.version")); http://git-wip-us.apache.org/repos/asf/karaf/blob/551421a4/itests/src/test/java/org/apache/karaf/itests/features/Spring42FeaturesTest.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/karaf/itests/features/Spring42FeaturesTest.java b/itests/src/test/java/org/apache/karaf/itests/features/Spring42FeaturesTest.java index bf5dff5..1a8f31f 100644 --- a/itests/src/test/java/org/apache/karaf/itests/features/Spring42FeaturesTest.java +++ b/itests/src/test/java/org/apache/karaf/itests/features/Spring42FeaturesTest.java @@ -14,8 +14,10 @@ package org.apache.karaf.itests.features; import org.apache.karaf.itests.KarafTestSupport; + import org.junit.Test; import org.junit.runner.RunWith; + import org.ops4j.pax.exam.junit.PaxExam; import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy; import org.ops4j.pax.exam.spi.reactors.PerClass; @@ -23,6 +25,7 @@ import org.ops4j.pax.exam.spi.reactors.PerClass; @RunWith(PaxExam.class) @ExamReactorStrategy(PerClass.class) public class Spring42FeaturesTest extends KarafTestSupport { + @Test public void installSpringFeature() throws Exception { http://git-wip-us.apache.org/repos/asf/karaf/blob/551421a4/itests/src/test/java/org/apache/karaf/itests/features/StandardFeaturesTest.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/karaf/itests/features/StandardFeaturesTest.java b/itests/src/test/java/org/apache/karaf/itests/features/StandardFeaturesTest.java index 4278e0b..16e4aba 100644 --- a/itests/src/test/java/org/apache/karaf/itests/features/StandardFeaturesTest.java +++ b/itests/src/test/java/org/apache/karaf/itests/features/StandardFeaturesTest.java @@ -14,9 +14,10 @@ package org.apache.karaf.itests.features; import org.apache.karaf.itests.KarafTestSupport; -import org.junit.Ignore; + import org.junit.Test; import org.junit.runner.RunWith; + import org.ops4j.pax.exam.junit.PaxExam; import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy; import org.ops4j.pax.exam.spi.reactors.PerClass; @@ -24,9 +25,12 @@ import org.ops4j.pax.exam.spi.reactors.PerClass; @RunWith(PaxExam.class) @ExamReactorStrategy(PerClass.class) public class StandardFeaturesTest extends KarafTestSupport { - + + + @Test public void checkInstalledFeaturesBoot() throws Exception { + System.out.println("===>checkInstalledFeaturesBoot"); assertFeatureInstalled("wrap"); assertFeatureInstalled("aries-blueprint"); assertFeatureInstalled("shell"); @@ -46,23 +50,25 @@ public class StandardFeaturesTest extends KarafTestSupport { assertFeatureInstalled("system"); } - @Test - /** - * Regression test for https://issues.apache.org/jira/browse/KARAF-2566 - * @throws Exception - */ - public void checkInteractionOfHttpAndAriesAnnotationFeature() throws Exception { - installAssertAndUninstallFeatures("aries-annotation", "pax-http"); - installAssertAndUninstallFeatures("pax-http", "aries-annotation"); + @Test + /** + * Regression test for https://issues.apache.org/jira/browse/KARAF-2566 + * + * @throws Exception + */ + public void checkInteractionOfHttpAndAriesAnnotationFeature() throws Exception { + System.out.println("====>checkInteractionOfHttpAndAriesAnnotationFeature"); + installAssertAndUninstallFeatures("aries-annotation", "pax-http"); + installAssertAndUninstallFeatures("pax-http", "aries-annotation"); } @Test - @Ignore("Waiting for KARAF-3181") public void installFrameworkSecurityFeature() throws Exception { installAssertAndUninstallFeatures("framework-security"); } public void installServiceSecurityFeature() throws Exception { + System.out.println("===>installServiceSecurityFeature"); installAssertAndUninstallFeatures("service-security"); } http://git-wip-us.apache.org/repos/asf/karaf/blob/551421a4/itests/src/test/resources/etc/org.ops4j.pax.logging.cfg ---------------------------------------------------------------------- diff --git a/itests/src/test/resources/etc/org.ops4j.pax.logging.cfg b/itests/src/test/resources/etc/org.ops4j.pax.logging.cfg index 3d79f24..48e1069 100644 --- a/itests/src/test/resources/etc/org.ops4j.pax.logging.cfg +++ b/itests/src/test/resources/etc/org.ops4j.pax.logging.cfg @@ -18,23 +18,24 @@ ################################################################################ # Common pattern layout for appenders -log4j2.pattern = %d{ISO8601} | %-5p | %-16t | %-32c{1} | %m%n +log4j2.pattern = %d{ISO8601} | %-5p | %-16t | %-32c{1} | %X{bundle.id} - %X{bundle.name} - %X{bundle.version} | %m%n # Root logger log4j2.rootLogger.level = INFO # uncomment to use asynchronous loggers, which require mvn:com.lmax/disruptor/3.3.2 library #log4j2.rootLogger.type = asyncRoot #log4j2.rootLogger.includeLocation = false -log4j2.rootLogger.appenderRefs = RollingFile, PaxOsgi +log4j2.rootLogger.appenderRefs = RollingFile, PaxOsgi${karaf.log.console:+, Console} log4j2.rootLogger.appenderRef.RollingFile.ref = RollingFile log4j2.rootLogger.appenderRef.PaxOsgi.ref = PaxOsgi +log4j2.rootLogger.appenderRef.Console.ref = Console # Appenders configuration log4j2.appenders = console, rolling, osgi # CONSOLE appender not used by default log4j2.appender.console.type = Console -log4j2.appender.console.name = STDOUT +log4j2.appender.console.name = Console log4j2.appender.console.layout.type = PatternLayout log4j2.appender.console.layout.pattern = ${log4j2.pattern} @@ -57,31 +58,3 @@ log4j2.appender.osgi.type = PaxOsgi log4j2.appender.osgi.name = PaxOsgi log4j2.appender.osgi.filter = * -log4j2.loggers = l00, l01, l02, l03, l04, l05, l06, l07, l08 - -log4j2.logger.l00.name = org.apache.karaf.features.internal -log4j2.logger.l00.level = WARN -log4j2.logger.l01.name = org.apache.karaf.shell.impl.action.osgi -log4j2.logger.l01.level = WARN -log4j2.logger.l02.name = org.apache.aries -log4j2.logger.l02.level = ERROR -log4j2.logger.l03.name = org.eclipse.jetty.jmx -log4j2.logger.l03.level = ERROR -log4j2.logger.l04.name = org.apache.sshd -log4j2.logger.l04.level = ERROR -log4j2.logger.l05.name = org.springframework -log4j2.logger.l05.level = ERROR -log4j2.logger.l06.name = org.ops4j.pax.exam.invoker.junit.internal -log4j2.logger.l06.level = ERROR -log4j2.logger.l07.name = org.apache.felix.fileinstall -log4j2.logger.l07.level = ERROR -log4j2.logger.l08.name = org.ops4j.pax.swissbox.bnd.BndUtils -log4j2.logger.l08.level = ERROR - - -# CONSOLE appender -#log4j.appender.stdout.threshold=DEBUG - -# File appender -#log4j.appender.out.threshold=DEBUG -#log4j.appender.out.append=true http://git-wip-us.apache.org/repos/asf/karaf/blob/551421a4/jaas/jasypt/pom.xml ---------------------------------------------------------------------- diff --git a/jaas/jasypt/pom.xml b/jaas/jasypt/pom.xml index 110be72..ce12473 100644 --- a/jaas/jasypt/pom.xml +++ b/jaas/jasypt/pom.xml @@ -161,4 +161,4 @@ - \ No newline at end of file + http://git-wip-us.apache.org/repos/asf/karaf/blob/551421a4/jdbc/pom.xml ---------------------------------------------------------------------- diff --git a/jdbc/pom.xml b/jdbc/pom.xml index f3f0718..57236cc 100644 --- a/jdbc/pom.xml +++ b/jdbc/pom.xml @@ -103,4 +103,4 @@ - \ No newline at end of file + http://git-wip-us.apache.org/repos/asf/karaf/blob/551421a4/jms/core/pom.xml ---------------------------------------------------------------------- diff --git a/jms/core/pom.xml b/jms/core/pom.xml index 30513fb..a554e4a 100644 --- a/jms/core/pom.xml +++ b/jms/core/pom.xml @@ -112,4 +112,4 @@ - \ No newline at end of file + http://git-wip-us.apache.org/repos/asf/karaf/blob/551421a4/jndi/pom.xml ---------------------------------------------------------------------- diff --git a/jndi/pom.xml b/jndi/pom.xml index ffcad3d..3a8b1ca 100644 --- a/jndi/pom.xml +++ b/jndi/pom.xml @@ -104,4 +104,4 @@ - \ No newline at end of file + http://git-wip-us.apache.org/repos/asf/karaf/blob/551421a4/jpa/hibernate/pom.xml ---------------------------------------------------------------------- diff --git a/jpa/hibernate/pom.xml b/jpa/hibernate/pom.xml index 3fbe4a7..e810fab 100644 --- a/jpa/hibernate/pom.xml +++ b/jpa/hibernate/pom.xml @@ -71,4 +71,4 @@ - \ No newline at end of file + http://git-wip-us.apache.org/repos/asf/karaf/blob/551421a4/main/src/test/resources/test-karaf-home/etc/config.properties ---------------------------------------------------------------------- diff --git a/main/src/test/resources/test-karaf-home/etc/config.properties b/main/src/test/resources/test-karaf-home/etc/config.properties index e178392..36166f6 100755 --- a/main/src/test/resources/test-karaf-home/etc/config.properties +++ b/main/src/test/resources/test-karaf-home/etc/config.properties @@ -64,6 +64,8 @@ org.osgi.framework.system.packages= \ org.osgi.framework.system.capabilities= \ ${eecap-${java.specification.version}} +eecap-9= osgi.ee; osgi.ee="OSGi/Minimum"; version:List="1.0,1.1,1.2", \ + osgi.ee; osgi.ee="JavaSE"; version:List="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,1.9" eecap-1.8= osgi.ee; osgi.ee="OSGi/Minimum"; version:List="1.0,1.1,1.2", \ osgi.ee; osgi.ee="JavaSE"; version:List="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8" eecap-1.7= osgi.ee; osgi.ee="OSGi/Minimum"; version:List="1.0,1.1,1.2", \ http://git-wip-us.apache.org/repos/asf/karaf/blob/551421a4/main/src/test/resources/test-karaf-home/etc/jre.properties ---------------------------------------------------------------------- diff --git a/main/src/test/resources/test-karaf-home/etc/jre.properties b/main/src/test/resources/test-karaf-home/etc/jre.properties index 7c417bf..640d974 100644 --- a/main/src/test/resources/test-karaf-home/etc/jre.properties +++ b/main/src/test/resources/test-karaf-home/etc/jre.properties @@ -542,3 +542,198 @@ jre-1.8= \ org.xml.sax.ext, \ org.xml.sax.helpers, \ com.sun.nio.sctp + +jre-9= \ + javax.accessibility, \ + javax.activation;version="1.1", \ + javax.activity, \ + javax.annotation;version="1.0", \ + javax.annotation.processing;version="1.0", \ + javax.crypto, \ + javax.crypto.interfaces, \ + javax.crypto.spec, \ + javax.imageio, \ + javax.imageio.event, \ + javax.imageio.metadata, \ + javax.imageio.plugins.bmp, \ + javax.imageio.plugins.jpeg, \ + javax.imageio.spi, \ + javax.imageio.stream, \ + javax.jws, \ + javax.jws.soap, \ + javax.lang.model, \ + javax.lang.model.element, \ + javax.lang.model.type, \ + javax.lang.model.util, \ + javax.management, \ + javax.management.loading, \ + javax.management.modelmbean, \ + javax.management.monitor, \ + javax.management.openmbean, \ + javax.management.relation, \ + javax.management.remote, \ + javax.management.remote.rmi, \ + javax.management.timer, \ + javax.naming, \ + javax.naming.directory, \ + javax.naming.event, \ + javax.naming.ldap, \ + javax.naming.spi, \ + javax.net, \ + javax.net.ssl, \ + javax.print, \ + javax.print.attribute, \ + javax.print.attribute.standard, \ + javax.print.event, \ + javax.rmi, \ + javax.rmi.CORBA, \ + javax.rmi.ssl, \ + javax.script, \ + javax.security.auth, \ + javax.security.auth.callback, \ + javax.security.auth.kerberos, \ + javax.security.auth.login, \ + javax.security.auth.spi, \ + javax.security.auth.x500, \ + javax.security.cert, \ + javax.security.sasl, \ + javax.sound.midi, \ + javax.sound.midi.spi, \ + javax.sound.sampled, \ + javax.sound.sampled.spi, \ + javax.sql, \ + javax.sql.rowset, \ + javax.sql.rowset.serial, \ + javax.sql.rowset.spi, \ + javax.swing, \ + javax.swing.border, \ + javax.swing.colorchooser, \ + javax.swing.event, \ + javax.swing.filechooser, \ + javax.swing.plaf, \ + javax.swing.plaf.basic, \ + javax.swing.plaf.metal, \ + javax.swing.plaf.multi, \ + javax.swing.plaf.synth, \ + javax.swing.table, \ + javax.swing.text, \ + javax.swing.text.html, \ + javax.swing.text.html.parser, \ + javax.swing.text.rtf, \ + javax.swing.tree, \ + javax.swing.undo, \ + javax.tools, \ + javax.transaction; javax.transaction.xa; partial=true; mandatory:=partial, \ + javax.xml, \ + javax.xml.bind;version="2.2.1", \ + javax.xml.bind.annotation;version="2.2.1", \ + javax.xml.bind.annotation.adapters;version="2.2.1", \ + javax.xml.bind.attachment;version="2.2.1", \ + javax.xml.bind.helpers;version="2.2.1", \ + javax.xml.bind.util;version="2.2.1", \ + javax.xml.crypto, \ + javax.xml.crypto.dom, \ + javax.xml.crypto.dsig, \ + javax.xml.crypto.dsig.dom, \ + javax.xml.crypto.dsig.keyinfo, \ + javax.xml.crypto.dsig.spec, \ + javax.xml.datatype, \ + javax.xml.namespace, \ + javax.xml.parsers, \ + javax.xml.soap;version="1.3", \ + javax.xml.stream;version="1.2", \ + javax.xml.stream.events;version="1.2", \ + javax.xml.stream.util;version="1.2", \ + javax.xml.transform, \ + javax.xml.transform.dom, \ + javax.xml.transform.sax, \ + javax.xml.transform.stax, \ + javax.xml.transform.stream, \ + javax.xml.validation, \ + javax.xml.ws;version="2.2", \ + javax.xml.ws.handler;version="2.2", \ + javax.xml.ws.handler.soap;version="2.2", \ + javax.xml.ws.http;version="2.2", \ + javax.xml.ws.soap;version="2.2", \ + javax.xml.ws.spi;version="2.2", \ + javax.xml.ws.wsaddressing;version="2.2", \ + javax.xml.ws.spi.http;version="2.2", \ + javax.xml.xpath, \ + javafx.animation, \ + javafx.application, \ + javafx.beans, \ + javafx.beans.binding, \ + javafx.beans.property, \ + javafx.beans.property.adapter, \ + javafx.beans.value, \ + javafx.collections, \ + javafx.concurrent, \ + javafx.css, \ + javafx.embed.swing, \ + javafx.embed.swt, \ + javafx.event, \ + javafx.fxml, \ + javafx.geometry, \ + javafx.scene, \ + javafx.scene.canvas, \ + javafx.scene.chart, \ + javafx.scene.control, \ + javafx.scene.control.cell, \ + javafx.scene.effect, \ + javafx.scene.image, \ + javafx.scene.input, \ + javafx.scene.layout, \ + javafx.scene.media, \ + javafx.scene.paint, \ + javafx.scene.shape, \ + javafx.scene.text, \ + javafx.scene.transform, \ + javafx.scene.web, \ + javafx.stage, \ + javafx.util, \ + javafx.util.converter, \ + org.ietf.jgss, \ + org.omg.CORBA, \ + org.omg.CORBA_2_3, \ + org.omg.CORBA_2_3.portable, \ + org.omg.CORBA.DynAnyPackage, \ + org.omg.CORBA.ORBPackage, \ + org.omg.CORBA.portable, \ + org.omg.CORBA.TypeCodePackage, \ + org.omg.CosNaming, \ + org.omg.CosNaming.NamingContextExtPackage, \ + org.omg.CosNaming.NamingContextPackage, \ + org.omg.Dynamic, \ + org.omg.DynamicAny, \ + org.omg.DynamicAny.DynAnyFactoryPackage, \ + org.omg.DynamicAny.DynAnyPackage, \ + org.omg.IOP, \ + org.omg.IOP.CodecFactoryPackage, \ + org.omg.IOP.CodecPackage, \ + org.omg.Messaging, \ + org.omg.PortableInterceptor, \ + org.omg.PortableInterceptor.ORBInitInfoPackage, \ + org.omg.PortableServer, \ + org.omg.PortableServer.CurrentPackage, \ + org.omg.PortableServer.POAManagerPackage, \ + org.omg.PortableServer.POAPackage, \ + org.omg.PortableServer.portable, \ + org.omg.PortableServer.ServantLocatorPackage, \ + org.omg.SendingContext, \ + org.omg.stub.java.rmi, \ + org.omg.stub.javax.management.remote.rmi, \ + org.w3c.dom, \ + org.w3c.dom.bootstrap, \ + org.w3c.dom.css, \ + org.w3c.dom.events, \ + org.w3c.dom.html, \ + org.w3c.dom.ls, \ + org.w3c.dom.ranges, \ + org.w3c.dom.stylesheets, \ + org.w3c.dom.traversal, \ + org.w3c.dom.views, \ + org.w3c.dom.xpath, \ + org.xml.sax, \ + org.xml.sax.ext, \ + org.xml.sax.helpers +>>>>>>> d98bccb... [ENTESB-5190]run karaf with java9-first commit http://git-wip-us.apache.org/repos/asf/karaf/blob/551421a4/management/pom.xml ---------------------------------------------------------------------- diff --git a/management/pom.xml b/management/pom.xml index 9108907..d17af8f 100644 --- a/management/pom.xml +++ b/management/pom.xml @@ -37,4 +37,4 @@ server - \ No newline at end of file + http://git-wip-us.apache.org/repos/asf/karaf/blob/551421a4/obr/pom.xml ---------------------------------------------------------------------- diff --git a/obr/pom.xml b/obr/pom.xml index 4f746c1..ed00bf4 100644 --- a/obr/pom.xml +++ b/obr/pom.xml @@ -102,4 +102,4 @@ - \ No newline at end of file +