>From 60b24d02721183c5441eab273c0827bd38a55418 Mon Sep 17 00:00:00 2001 From: Charles Moulliard Date: Wed, 19 Dec 2012 09:22:11 +0100 Subject: [PATCH] WELD-1287: Add integration test to validate weld osgi on Apache Karaf --- .../osgi/tests/karaf/ContainerTest.java | 11 ++ .../osgi/tests/karaf/WeldOSGIContainerSupport.java | 11 ++ .../environment/osgi/tests/karaf/config.properties | 124 +++++++++++++++++++++ .../environment/osgi/tests/karaf/custom.properties | 30 +++++ 4 files changed, 176 insertions(+) create mode 100644 environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/karaf/ContainerTest.java create mode 100644 environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/karaf/WeldOSGIContainerSupport.java create mode 100644 environments/osgi/tests/tester/src/test/resources/org/jboss/weld/environment/osgi/tests/karaf/config.properties create mode 100644 environments/osgi/tests/tester/src/test/resources/org/jboss/weld/environment/osgi/tests/karaf/custom.properties diff --git a/environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/karaf/ContainerTest.java b/environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/karaf/ContainerTest.java new file mode 100644 index 0000000..d185fa3 --- /dev/null +++ b/environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/karaf/ContainerTest.java @@ -0,0 +1,11 @@ +package org.jboss.weld.environment.osgi.tests.karaf; + +/** + * Created with IntelliJ IDEA. + * User: chmoulli + * Date: 19/12/12 + * Time: 08:53 + * To change this template use File | Settings | File Templates. + */ +public class ContainerTest { +} diff --git a/environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/karaf/WeldOSGIContainerSupport.java b/environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/karaf/WeldOSGIContainerSupport.java new file mode 100644 index 0000000..bbe51a3 --- /dev/null +++ b/environments/osgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/karaf/WeldOSGIContainerSupport.java @@ -0,0 +1,11 @@ +package org.jboss.weld.environment.osgi.tests.karaf; + +/** + * Created with IntelliJ IDEA. + * User: chmoulli + * Date: 19/12/12 + * Time: 09:08 + * To change this template use File | Settings | File Templates. + */ +public class WeldOSGIContainerSupport { +} diff --git a/environments/osgi/tests/tester/src/test/resources/org/jboss/weld/environment/osgi/tests/karaf/config.properties b/environments/osgi/tests/tester/src/test/resources/org/jboss/weld/environment/osgi/tests/karaf/config.properties new file mode 100644 index 0000000..544c508 --- /dev/null +++ b/environments/osgi/tests/tester/src/test/resources/org/jboss/weld/environment/osgi/tests/karaf/config.properties @@ -0,0 +1,124 @@ +################################################################################ +# +# 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. +# +################################################################################ + +# FIXING PAX-EXAM BUG + +# +# This file lists Karaf default settings for this particular version of Karaf. +# For easier maintenance when upgrading Karaf and to better document which +# default values have changed, it is recommended to place any changes to +# these values in a custom.properties file in the same folder as this file. +# Each value specified in custom.properties will override the default value +# here. +# + +# +# Properties file inclusions (as a space separated list of relative paths) +# Included files will override the values specified in this file +# NB: ${includes} properties files are mandatory, it means that Karaf will not start +# if the include file is not found +# +${includes} = jre.properties custom.properties + +# +# Properties file inclusions (as a space separated list of relative paths) +# Included files will override the values specified in this file +# NB: ${optionals} properties files are optionals, it means that Karaf will just +# display a warning message but the bootstrap will be performed +# +# ${optionals} = my.properties + + +# +# Framework selection properties +# +karaf.framework=felix + +# +# Location of the OSGi frameworks +# +karaf.framework.equinox=${karaf.default.repository}/org/eclipse/osgi/3.8.0.v20120529-1548/osgi-3.8.0.v20120529-1548.jar +karaf.framework.felix=${karaf.default.repository}/org/apache/felix/org.apache.felix.framework/4.0.3/org.apache.felix.framework-4.0.3.jar + +# +# Framework config properties. +# +org.osgi.framework.system.packages= \ + org.osgi.framework.startlevel;uses:="org.osgi.framework";version="1.0", \ + org.osgi.framework.wiring;uses:="org.osgi.resource,org.osgi.framework";version="1.1", \ + org.osgi.framework.hooks.bundle;uses:="org.osgi.framework";version="1.1", \ + org.osgi.framework.hooks.service;uses:="org.osgi.framework";version="1.1", \ + org.osgi.framework.hooks.resolver;uses:="org.osgi.framework.wiring";version="1.0", \ + org.osgi.framework.launch;uses:="org.osgi.framework";version="1.1", \ + org.osgi.framework.namespace;uses:="org.osgi.resource";version="1.0", \ + org.osgi.framework;version="1.7",\ + org.osgi.framework.hooks.weaving;uses:="org.osgi.framework.wiring";version="1.0",\ + org.osgi.resource;version="1.0",org.osgi.service.url;version="1.0",\ + org.osgi.service.startlevel;uses:="org.osgi.framework";version="1.1",\ + org.osgi.service.packageadmin;uses:="org.osgi.framework";version="1.2",\ + org.osgi.service.url;version="1.0", \ + org.osgi.util.tracker;uses:="org.osgi.framework";version="1.5.1", \ + org.apache.karaf.jaas.boot;version="2.3.0", \ + org.apache.karaf.jaas.boot.principal;version="2.3.0", \ + org.apache.karaf.version;version="2.3.0", \ + ${jre-${java.specification.version}} + +# Extra packages appended after standard packages +# org.osgi.framework.system.packages.extra= + +# javax.transaction is needed to avoid class loader constraint violation when using javax.sql +org.osgi.framework.bootdelegation=org.apache.karaf.jaas.boot,sun.*,com.sun.*,javax.transaction,javax.transaction.* + +# OSGi Execution Environment +org.osgi.framework.executionenvironment=J2SE-1.7,JavaSE-1.7,J2SE-1.6,JavaSE-1.6,J2SE-1.5,JavaSE-1.5,J2SE-1.4,JavaSE-1.4,J2SE-1.3,JavaSE-1.3,J2SE-1.2,,JavaSE-1.2,CDC-1.1/Foundation-1.1,CDC-1.0/Foundation-1.0,J2ME,OSGi/Minimum-1.1,OSGi/Minimum-1.0 + +# Set the parent classloader for the bundle to the classloader that loads the Framework (i.e. everything in lib/*.jar) +org.osgi.framework.bundle.parent=framework + +# To enable the use of the startup.properties file to control the start level: +karaf.auto.start=startup.properties + +org.osgi.framework.startlevel.beginning=100 +karaf.startlevel.bundle=80 + +karaf.shutdown.port.file=${karaf.data}/port + +# +# FileMonitor properties +# +felix.fileinstall.dir = ${karaf.base}/etc +felix.fileinstall.filter = .*\\.cfg +felix.fileinstall.poll = 1000 +felix.fileinstall.noInitialDelay = true +felix.fileinstall.log.level = 3 + +# +# Delay for writing the framework state to disk in equinox +# must be >= 1000 and <= 1800000 +# +eclipse.stateSaveDelayInterval = 1000 + +# +# OBR Repository list +# This property will be modified by the obr:addUrl and obr:removeUrl commands. +# +obr.repository.url = + +karaf.delay.console=false + diff --git a/environments/osgi/tests/tester/src/test/resources/org/jboss/weld/environment/osgi/tests/karaf/custom.properties b/environments/osgi/tests/tester/src/test/resources/org/jboss/weld/environment/osgi/tests/karaf/custom.properties new file mode 100644 index 0000000..fbdb62a --- /dev/null +++ b/environments/osgi/tests/tester/src/test/resources/org/jboss/weld/environment/osgi/tests/karaf/custom.properties @@ -0,0 +1,30 @@ +################################################################################ +# +# 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. +# +################################################################################ + +# +# All the values specified here will override the default values given +# in config.properties. +# + +karaf.systemBundlesStartLevel=50 + +# +# You can place any customized configuration here. +# + -- 1.7.11.1