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/01/08 15:33:19 UTC
git commit: Remove unsupported Eclipse platforms. Fix the MVN URL
resolution.
Updated Branches:
refs/heads/master bdd5ec05c -> a8540cc8b
Remove unsupported Eclipse platforms. Fix the MVN URL resolution.
Project: http://git-wip-us.apache.org/repos/asf/karaf-eik/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-eik/commit/a8540cc8
Tree: http://git-wip-us.apache.org/repos/asf/karaf-eik/tree/a8540cc8
Diff: http://git-wip-us.apache.org/repos/asf/karaf-eik/diff/a8540cc8
Branch: refs/heads/master
Commit: a8540cc8b3d3bbc83d3d9ac85bf3873ec7c7ccad
Parents: bdd5ec0
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Wed Jan 8 15:30:51 2014 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Wed Jan 8 15:30:51 2014 +0100
----------------------------------------------------------------------
parent/pom.xml | 34 ++++++--------------
.../ui/features/FeaturesBundlesStartLevels.java | 3 --
.../karaf/eik/ui/features/MvnUrlConverter.java | 31 +++++++++---------
3 files changed, 25 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf-eik/blob/a8540cc8/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index a779e2e..0882795 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -235,45 +235,31 @@
<profiles>
<profile>
- <id>platform-helios</id>
- <activation>
- <property>
- <name>platform-version-name</name>
- <value>helios</value>
- </property>
- </activation>
- <properties>
- <eclipse-site>http://download.eclipse.org/releases/helios</eclipse-site>
- <platform-version>[3.6,3.7)</platform-version>
- <swtbot-site>http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site</swtbot-site>
- </properties>
- </profile>
- <profile>
- <id>platform-indigo</id>
+ <id>platform-juno</id>
<activation>
<property>
<name>platform-version-name</name>
- <value>indigo</value>
+ <value>juno</value>
</property>
</activation>
<properties>
- <eclipse-site>http://download.eclipse.org/releases/indigo</eclipse-site>
- <platform-version>[3.7,3.8)</platform-version>
- <swtbot-site>http://download.eclipse.org/technology/swtbot/indigo/dev-build/update-site</swtbot-site>
+ <eclipse-site>http://download.eclipse.org/releases/juno</eclipse-site>
+ <platform-version>[3.8,3.9)</platform-version>
+ <swtbot-site>http://download.eclipse.org/technology/swtbot/juno/dev-build/update-site</swtbot-site>
</properties>
</profile>
<profile>
- <id>platform-juno</id>
+ <id>platform-kepler</id>
<activation>
<property>
<name>platform-version-name</name>
- <value>juno</value>
+ <value>kepler</value>
</property>
</activation>
<properties>
- <eclipse-site>http://download.eclipse.org/releases/juno</eclipse-site>
- <platform-version>[3.8,3.9)</platform-version>
- <swtbot-site>http://download.eclipse.org/technology/swtbot/juno/dev-build/update-site</swtbot-site>
+ <eclipse-site>http://download.eclipse.org/releases/kepler</eclipse-site>
+ <platform-version>[4.3,5)</platform-version>
+ <swtbot-site>http://download.eclipse.org/technology/swtbot/kepler/dev-build/update-site</swtbot-site>
</properties>
</profile>
<profile>
http://git-wip-us.apache.org/repos/asf/karaf-eik/blob/a8540cc8/plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/features/FeaturesBundlesStartLevels.java
----------------------------------------------------------------------
diff --git a/plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/features/FeaturesBundlesStartLevels.java b/plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/features/FeaturesBundlesStartLevels.java
index 6fc7d21..b4f08cf 100644
--- a/plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/features/FeaturesBundlesStartLevels.java
+++ b/plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/features/FeaturesBundlesStartLevels.java
@@ -93,9 +93,6 @@ public class FeaturesBundlesStartLevels {
}
private String getSymbolicName(String bundleUrl) {
- if (bundleUrl == null) {
- return null;
- }
File bundlePath = new File(baseBundlesDir, converter.getPath(bundleUrl));
BundleDescription bundleDescription = karafPlatformModel.getState().getBundleByLocation(bundlePath.getAbsolutePath());
if (bundleDescription != null) {
http://git-wip-us.apache.org/repos/asf/karaf-eik/blob/a8540cc8/plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/features/MvnUrlConverter.java
----------------------------------------------------------------------
diff --git a/plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/features/MvnUrlConverter.java b/plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/features/MvnUrlConverter.java
index b7563df..9685305 100644
--- a/plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/features/MvnUrlConverter.java
+++ b/plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/features/MvnUrlConverter.java
@@ -20,26 +20,25 @@ package org.apache.karaf.eik.ui.features;
public class MvnUrlConverter {
- public String getPath(String mvnUrl) {
- if(mvnUrl != null) {
- if(mvnUrl.startsWith("mvn:")) {
- mvnUrl = mvnUrl.substring(4);
- }
+ public String getPath(String url) {
+ if (url != null) {
+ if (url.startsWith("mvn:")) {
+ url = url.substring(4);
+ String[] repositorySplit = url.split("!");
+ String urlWithoutRepository = repositorySplit[repositorySplit.length - 1];
+
+ String[] segments = urlWithoutRepository.split("/");
+ if (segments.length >= 3) {
+ String groupId = segments[0];
+ String artifactId = segments[1];
+ String version = segments[2];
- String[] repositorySplit = mvnUrl.split("!");
- String urlWithoutRepository = repositorySplit[repositorySplit.length - 1];
-
- String[] segments = urlWithoutRepository.split("/");
- if(segments.length == 3) {
- String groupId = segments[0];
- String artifactId = segments[1];
- String version = segments[2];
-
- return groupId.replace(".", "/") + "/" + artifactId + "/" + version + "/" + artifactId + "-" + version + ".jar";
+ return groupId.replace(".", "/") + "/" + artifactId + "/" + version + "/" + artifactId + "-" + version + ".jar";
+ }
}
}
- return null;
+ return url;
}
}