camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject git commit: CAMEL-7017: camel-optoplanner polished. Thanks to Babak.
Date Thu, 28 Nov 2013 08:31:13 GMT
Updated Branches:
  refs/heads/master 0474e37e2 -> 699a32348


CAMEL-7017: camel-optoplanner polished. Thanks to Babak.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/699a3234
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/699a3234
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/699a3234

Branch: refs/heads/master
Commit: 699a32348f91e380c9e72d8c96678f2cd7d946b5
Parents: 0474e37
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Thu Nov 28 09:33:07 2013 +0100
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Thu Nov 28 09:33:21 2013 +0100

----------------------------------------------------------------------
 platforms/karaf/features/src/main/resources/config.properties | 2 ++
 platforms/karaf/features/src/main/resources/features.xml      | 4 +---
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/699a3234/platforms/karaf/features/src/main/resources/config.properties
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/src/main/resources/config.properties b/platforms/karaf/features/src/main/resources/config.properties
index 87d1955..3a7048d 100755
--- a/platforms/karaf/features/src/main/resources/config.properties
+++ b/platforms/karaf/features/src/main/resources/config.properties
@@ -45,7 +45,9 @@ org.osgi.framework.bootdelegation=org.apache.karaf.jaas.boot,sun.*,com.sun.*,jav
 # Standard package set. Note that:
 #   - javax.transaction* is exported with a mandatory attribute
 #   - sun.misc is exported because of the camel-disruptor feature (see the <details>
of it inside features.xml)
+#   - com.sun.tools.xjc is exported because of the camel-optaplanner feature (see the <details>
of it inside features.xml)
 jre-1.6= \
+ com.sun.tools.xjc, \
  javax.accessibility, \
  javax.activation;version="1.1", \
  javax.activity, \

http://git-wip-us.apache.org/repos/asf/camel/blob/699a3234/platforms/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 959d6b8..1e26065 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -770,9 +770,8 @@
     <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javassist/${javassist-bundle-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-ognl/${project.version}</bundle>
   </feature>
-<!-- yet another OSGi import|export package hell
-     [WARNING] No export found to match com.sun.tools.xjc (imported by mvn:org.drools/drools-core/6.0.0.Final)
   <feature name='camel-optaplanner' version='${project.version}' resolver='(obr)' start-level='50'>
+    <details>The camel-optaplanner feature can only run on a SUN JVM. You need to add
the package com.sun.tools.xjc to the java platform packages in the etc/jre.properties file.</details>
     <feature version='${project.version}'>camel-core</feature>
     <bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
     <bundle dependency='true'>mvn:commons-io/commons-io/${commons-io-version}</bundle>
@@ -789,7 +788,6 @@
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-inject/${javax-inject-bundle-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-optaplanner/${project.version}</bundle>
   </feature>
--->
   <feature name='camel-paxlogging' version='${project.version}' resolver='(obr)' start-level='50'>
     <feature version='${project.version}'>camel-core</feature>
     <bundle>mvn:org.apache.camel/camel-paxlogging/${project.version}</bundle>


Mime
View raw message