You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2012/01/09 19:34:10 UTC
svn commit: r1229285 - in /openejb/trunk/openejb/osgi:
apache-karafee/src/main/descriptors/
apache-karafee/src/main/filtered-resources/etc/ openejb-core-osgi/
openejb-core-osgi/src/main/java/org/apache/openejb/core/osgi/impl/
Author: rmannibucau
Date: Mon Jan 9 18:34:09 2012
New Revision: 1229285
URL: http://svn.apache.org/viewvc?rev=1229285&view=rev
Log:
minor config for karaf
Added:
openejb/trunk/openejb/osgi/apache-karafee/src/main/filtered-resources/etc/config.properties
Modified:
openejb/trunk/openejb/osgi/apache-karafee/src/main/descriptors/bin.xml
openejb/trunk/openejb/osgi/apache-karafee/src/main/filtered-resources/etc/jre.properties
openejb/trunk/openejb/osgi/openejb-core-osgi/pom.xml
openejb/trunk/openejb/osgi/openejb-core-osgi/src/main/java/org/apache/openejb/core/osgi/impl/Deployer.java
Modified: openejb/trunk/openejb/osgi/apache-karafee/src/main/descriptors/bin.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/osgi/apache-karafee/src/main/descriptors/bin.xml?rev=1229285&r1=1229284&r2=1229285&view=diff
==============================================================================
--- openejb/trunk/openejb/osgi/apache-karafee/src/main/descriptors/bin.xml (original)
+++ openejb/trunk/openejb/osgi/apache-karafee/src/main/descriptors/bin.xml Mon Jan 9 18:34:09 2012
@@ -32,6 +32,7 @@
<exclude>**/demos/**</exclude>
<exclude>bin/**</exclude>
<exclude>etc/custom.properties</exclude>
+ <exclude>etc/config.properties</exclude>
<exclude>etc/system.properties</exclude>
<exclude>etc/users.properties</exclude>
<exclude>etc/org.apache.karaf.features.cfg</exclude>
Added: openejb/trunk/openejb/osgi/apache-karafee/src/main/filtered-resources/etc/config.properties
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/osgi/apache-karafee/src/main/filtered-resources/etc/config.properties?rev=1229285&view=auto
==============================================================================
--- openejb/trunk/openejb/osgi/apache-karafee/src/main/filtered-resources/etc/config.properties (added)
+++ openejb/trunk/openejb/osgi/apache-karafee/src/main/filtered-resources/etc/config.properties Mon Jan 9 18:34:09 2012
@@ -0,0 +1,97 @@
+################################################################################
+#
+# 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 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
+#
+${includes} = jre.properties custom.properties
+
+#
+# Framework selection properties
+#
+karaf.framework=felix
+
+#
+# Location of the OSGi frameworks
+#
+karaf.framework.equinox=${karaf.default.repository}/org/eclipse/osgi/3.6.2.R36x_v20110210/osgi-3.6.2.R36x_v20110210.jar
+karaf.framework.felix=${karaf.default.repository}/org/apache/felix/org.apache.felix.framework/3.0.9/org.apache.felix.framework-3.0.9.jar
+
+#
+# Framework config properties.
+#
+org.osgi.framework.system.packages=org.osgi.framework; version=1.5.0, \
+ org.osgi.framework.launch; version=1.0.0, \
+ org.osgi.framework.hooks.service; version=1.0.0, \
+ org.osgi.service.packageadmin; version=1.2.0, \
+ org.osgi.service.startlevel; version=1.1.0, \
+ org.osgi.service.url; version=1.0.0, \
+ org.osgi.util.tracker; version=1.4.0, \
+ org.apache.karaf.jaas.boot; version=2.2.4, \
+ org.apache.karaf.version; version=2.2.4, \
+ ${jre-${java.specification.version}}
+
+org.osgi.framework.system.packages.extra=
+
+# javax.transaction is needed to avoid class loader constraint violation when using javax.sql
+org.osgi.framework.bootdelegation=org.apache.karaf.jaas.boot,!com.sun.xml.internal.bind.*,sun.*,com.sun.*,javax.transaction,javax.transaction.*
+
+# OSGi Execution Environment
+org.osgi.framework.executionenvironment=J2SE-1.7,J2SE-1.6,J2SE-1.5,J2SE-1.4,J2SE-1.3,J2SE-1.2
+
+# Set the parent classloader for the bundle to the classloader that loads the Framework (i.e. everything in lib/*.jar)
+org.osgi.framework.bundle.parent=framework
+
+# To enable the use of the startup.properties file to control the start level:
+karaf.auto.start=startup.properties
+
+org.osgi.framework.startlevel.beginning=100
+karaf.startlevel.bundle=60
+
+karaf.shutdown.port.file=${karaf.data}/port
+
+#
+# FileMonitor properties
+#
+felix.fileinstall.dir = ${karaf.base}/etc
+felix.fileinstall.filter = .*\\.cfg
+felix.fileinstall.poll = 1000
+felix.fileinstall.noInitialDelay = true
+
+#
+# Delay for writing the framework state to disk in equinox
+# must be >= 1000 and <= 1800000
+#
+eclipse.stateSaveDelayInterval = 1000
+
+#
+# OBR Repository list
+# This property will be modified by the obr:addUrl and obr:removeUrl commands.
+#
+obr.repository.url =
Modified: openejb/trunk/openejb/osgi/apache-karafee/src/main/filtered-resources/etc/jre.properties
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/osgi/apache-karafee/src/main/filtered-resources/etc/jre.properties?rev=1229285&r1=1229284&r2=1229285&view=diff
==============================================================================
--- openejb/trunk/openejb/osgi/apache-karafee/src/main/filtered-resources/etc/jre.properties (original)
+++ openejb/trunk/openejb/osgi/apache-karafee/src/main/filtered-resources/etc/jre.properties Mon Jan 9 18:34:09 2012
@@ -17,6 +17,7 @@
#
################################################################################
jre-1.6= \
+ sun.misc,\
javax.accessibility, \
javax.activation, \
javax.activity, \
@@ -97,12 +98,6 @@ jre-1.6= \
javax.tools, \
javax.transaction; javax.transaction.xa; partial=true; mandatory:=partial, \
javax.xml, \
- javax.xml.bind, \
- javax.xml.bind.annotation, \
- javax.xml.bind.annotation.adapters, \
- javax.xml.bind.attachment, \
- javax.xml.bind.helpers, \
- javax.xml.bind.util, \
javax.xml.crypto, \
javax.xml.crypto.dom, \
javax.xml.crypto.dsig, \
Modified: openejb/trunk/openejb/osgi/openejb-core-osgi/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/osgi/openejb-core-osgi/pom.xml?rev=1229285&r1=1229284&r2=1229285&view=diff
==============================================================================
--- openejb/trunk/openejb/osgi/openejb-core-osgi/pom.xml (original)
+++ openejb/trunk/openejb/osgi/openejb-core-osgi/pom.xml Mon Jan 9 18:34:09 2012
@@ -139,6 +139,7 @@
javax.enterprise.event,
javax.enterprise.inject,
javax.enterprise.inject.spi,
+ javax.enterprise.util,
javax.inject,
javax.interceptor,
javax.jms;resolution:=optional,
Modified: openejb/trunk/openejb/osgi/openejb-core-osgi/src/main/java/org/apache/openejb/core/osgi/impl/Deployer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/osgi/openejb-core-osgi/src/main/java/org/apache/openejb/core/osgi/impl/Deployer.java?rev=1229285&r1=1229284&r2=1229285&view=diff
==============================================================================
--- openejb/trunk/openejb/osgi/openejb-core-osgi/src/main/java/org/apache/openejb/core/osgi/impl/Deployer.java (original)
+++ openejb/trunk/openejb/osgi/openejb-core-osgi/src/main/java/org/apache/openejb/core/osgi/impl/Deployer.java Mon Jan 9 18:34:09 2012
@@ -292,6 +292,10 @@ public class Deployer implements BundleL
}
}
+ /**
+ * using dynamic imports can be too tricky when this class is often enough.
+ * Note: user can stil refine the version he needs...but manually.
+ */
private static class OSGIClassLoader extends ClassLoader {
private final Bundle backingBundle;
private final Bundle fallbackBundle;