You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2014/08/13 09:16:14 UTC
git commit: [KARAF-3161] Add support of Eclipse Luna platform
Repository: karaf-eik
Updated Branches:
refs/heads/master 5fc0d4e96 -> 02880b5a3
[KARAF-3161] Add support of Eclipse Luna platform
Project: http://git-wip-us.apache.org/repos/asf/karaf-eik/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-eik/commit/02880b5a
Tree: http://git-wip-us.apache.org/repos/asf/karaf-eik/tree/02880b5a
Diff: http://git-wip-us.apache.org/repos/asf/karaf-eik/diff/02880b5a
Branch: refs/heads/master
Commit: 02880b5a30dbca4741b8ca20df66b5f00e1ada3d
Parents: 5fc0d4e
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Wed Aug 13 09:15:36 2014 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Wed Aug 13 09:15:36 2014 +0200
----------------------------------------------------------------------
parent/pom.xml | 16 +++++++++-
.../META-INF/MANIFEST.MF | 33 ++++++++++++++++++--
.../core/model/AbstractKarafPlatformModel.java | 3 +-
3 files changed, 46 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf-eik/blob/02880b5a/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index dd2a196..052c600 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -35,7 +35,7 @@
<name>Apache Karaf :: EIK :: Parent</name>
<properties>
- <platform-version-name>kepler</platform-version-name>
+ <platform-version-name>luna</platform-version-name>
<eclipse-site>http://download.eclipse.org/releases/${platform-version-name}</eclipse-site>
<wikitext-site>http://download.eclipse.org/tools/mylyn/update/weekly</wikitext-site>
<swtbot-site>http://download.eclipse.org/technology/swtbot/${platform-version-name}/dev-build/update-site</swtbot-site>
@@ -234,6 +234,20 @@
<profiles>
<profile>
+ <id>platform-luna</id>
+ <activation>
+ <property>
+ <name>platform-version-name</name>
+ <value>luna</value>
+ </property>
+ </activation>
+ <properties>
+ <eclipse-site>http://download.eclipse.org/releases/luna</eclipse-site>
+ <platform-version>[4.4,5)</platform-version>
+ <swtbot-site>http://download.eclipse.org/technology/swtbot/luna/dev-build/update-site</swtbot-site>
+ </properties>
+ </profile>
+ <profile>
<id>platform-kepler</id>
<activation>
<property>
http://git-wip-us.apache.org/repos/asf/karaf-eik/blob/02880b5a/plugins/org.apache.karaf.eik.core/META-INF/MANIFEST.MF
----------------------------------------------------------------------
diff --git a/plugins/org.apache.karaf.eik.core/META-INF/MANIFEST.MF b/plugins/org.apache.karaf.eik.core/META-INF/MANIFEST.MF
index 723932f..1ed1da4 100644
--- a/plugins/org.apache.karaf.eik.core/META-INF/MANIFEST.MF
+++ b/plugins/org.apache.karaf.eik.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Apache Karaf :: EIK :: Plugins :: Core
Bundle-SymbolicName: org.apache.karaf.eik.core;singleton:=true
-Bundle-Version: 3.0.0
+Bundle-Version: 3.0.0.SNAPSHOT
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.1.0,4.0.0)",
org.eclipse.core.resources;bundle-version="[3.0.0,4.0.0)",
@@ -24,5 +24,32 @@ Export-Package: org.apache.karaf.eik.core,
org.apache.karaf.eik.core.shell
Bundle-ActivationPolicy: lazy
Bundle-Activator: org.apache.karaf.eik.core.internal.KarafCorePluginActivator
-Bundle-Vendor: Apache Software Foundation
-
+Bundle-Vendor: The Apache Software Foundation
+Bundle-ClassPath: .,
+ ant-antlr.jar,
+ ant-apache-bcel.jar,
+ ant-apache-bsf.jar,
+ ant-apache-log4j.jar,
+ ant-apache-oro.jar,
+ ant-apache-regexp.jar,
+ ant-apache-resolver.jar,
+ ant-apache-xalan2.jar,
+ ant-commons-logging.jar,
+ ant-commons-net.jar,
+ ant-jai.jar,
+ ant-javamail.jar,
+ ant-jdepend.jar,
+ ant-jmf.jar,
+ ant-jsch.jar,
+ ant-junit.jar,
+ ant-junit4.jar,
+ ant-launcher.jar,
+ ant-netrexx.jar,
+ ant-swing.jar,
+ ant-testutil.jar,
+ ant.jar,
+ junit.jar,
+ pdebuild.jar,
+ jdi.jar,
+ jdimodel.jar,
+ jdom-1.0.jar
http://git-wip-us.apache.org/repos/asf/karaf-eik/blob/02880b5a/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/model/AbstractKarafPlatformModel.java
----------------------------------------------------------------------
diff --git a/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/model/AbstractKarafPlatformModel.java b/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/model/AbstractKarafPlatformModel.java
index da120cf..007f0ed 100644
--- a/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/model/AbstractKarafPlatformModel.java
+++ b/plugins/org.apache.karaf.eik.core/src/main/java/org/apache/karaf/eik/core/model/AbstractKarafPlatformModel.java
@@ -68,8 +68,7 @@ abstract public class AbstractKarafPlatformModel implements KarafPlatformModel {
synchronized (monitor) {
if (pdeState == null) {
bundleList.addAll(getPlatformBundles());
-
- pdeState = new PDEState(bundleList.toArray(new URL[0]), false, new NullProgressMonitor());
+ pdeState = new PDEState(bundleList.toArray(new URL[0]), false, false, new NullProgressMonitor());
}
}