[KARAF-3161] Add support of Eclipse Luna platform
Conflicts:
plugins/org.apache.karaf.eik.core/META-INF/MANIFEST.MF
diff --git a/parent/pom.xml b/parent/pom.xml
index 732a3a3..41d9a86 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>
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 c33d839..a558dbc 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: Apache Karaf :: EIK :: Plugins :: Core
Bundle-SymbolicName: org.apache.karaf.eik.core;singleton:=true
-Bundle-Version: 2.3.1
+Bundle-Version: 2.3.1.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 @@
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
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 @@
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());
}
}
