From e1eff07193e9f27b835b58bc44d1cddddd8390c0 Mon Sep 17 00:00:00 2001 From: Martin Lippert Date: Tue, 13 Jun 2017 08:40:06 +0200 Subject: [PATCH] cleanup feature install experiments --- .../build.properties | 3 ++- .../org.springframework.boot.ide.branding.feature/p2.inf | 7 +++++++ .../build.properties | 2 +- .../p2.inf | 1 - .../p2.inf | 4 ---- 5 files changed, 10 insertions(+), 7 deletions(-) create mode 100644 eclipse-distribution/org.springframework.boot.ide.branding.feature/p2.inf delete mode 100644 eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.manifest.integration.feature/p2.inf diff --git a/eclipse-distribution/org.springframework.boot.ide.branding.feature/build.properties b/eclipse-distribution/org.springframework.boot.ide.branding.feature/build.properties index 64f93a9f0..3c54be93f 100644 --- a/eclipse-distribution/org.springframework.boot.ide.branding.feature/build.properties +++ b/eclipse-distribution/org.springframework.boot.ide.branding.feature/build.properties @@ -1 +1,2 @@ -bin.includes = feature.xml +bin.includes = feature.xml,\ + p2.inf diff --git a/eclipse-distribution/org.springframework.boot.ide.branding.feature/p2.inf b/eclipse-distribution/org.springframework.boot.ide.branding.feature/p2.inf new file mode 100644 index 000000000..82001f975 --- /dev/null +++ b/eclipse-distribution/org.springframework.boot.ide.branding.feature/p2.inf @@ -0,0 +1,7 @@ +instructions.configure=\ + org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/releases/oxygen,name:Oxygen);\ + org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/releases/oxygen,name:Oxygen); + +instructions.unconfigure=\ + org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/releases/oxygen);\ + org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/releases/oxygen); diff --git a/eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.manifest.integration.feature/build.properties b/eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.manifest.integration.feature/build.properties index 64f93a9f0..b82554540 100644 --- a/eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.manifest.integration.feature/build.properties +++ b/eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.manifest.integration.feature/build.properties @@ -1 +1 @@ -bin.includes = feature.xml +bin.includes=feature.xml diff --git a/eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.manifest.integration.feature/p2.inf b/eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.manifest.integration.feature/p2.inf deleted file mode 100644 index d96c1697e..000000000 --- a/eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.manifest.integration.feature/p2.inf +++ /dev/null @@ -1 +0,0 @@ -instructions.configure=installFeature(feature:org.springframework.tooling.cloudfoundry.manifest.ls.feature.feature.group,featureId:default,version:default); \ No newline at end of file diff --git a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.feature/p2.inf b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.feature/p2.inf index 4e68f74ca..8519b654b 100644 --- a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.feature/p2.inf +++ b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.feature/p2.inf @@ -1,11 +1,7 @@ instructions.configure=\ - org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/releases/oxygen,name:Oxygen);\ - org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/releases/oxygen,name:Oxygen);\ org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.springsource.com/release/TOOLS/sts4-language-servers,name:Spring Tooling Language Servers for Eclipse);\ org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.springsource.com/release/TOOLS/sts4-language-servers,name:Spring Tooling Language Servers for Eclipse); instructions.unconfigure=\ - org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/releases/oxygen);\ - org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/releases/oxygen);\ org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.springsource.com/release/TOOLS/sts4-language-servers);\ org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.springsource.com/release/TOOLS/sts4-language-servers)