Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Alexander Kuppe2012-09-12 09:58:06 +0000
committerMarkus Alexander Kuppe2012-09-12 09:58:06 +0000
commit6b95f1014751dc8418c8ffb722cfab468a5fd00c (patch)
tree0b24b6339a951caecb789a9fa0648df2f5caaca0
parentbcdba5ee30de755f8b1dbd80fec3d04ee94b4927 (diff)
downloadorg.eclipse.ecf-6b95f1014751dc8418c8ffb722cfab468a5fd00c.tar.gz
org.eclipse.ecf-6b95f1014751dc8418c8ffb722cfab468a5fd00c.tar.xz
org.eclipse.ecf-6b95f1014751dc8418c8ffb722cfab468a5fd00c.zip
Either reference dependecies in the cspex _or_ in the feature.xml. The
feature overwrites/hides the cspex entries.
-rw-r--r--releng/features/org.eclipse.ecf.filetransfer.httpclient4.feature/buckminster.cspex2
-rw-r--r--releng/features/org.eclipse.ecf.filetransfer.httpclient4.feature/feature.xml105
2 files changed, 49 insertions, 58 deletions
diff --git a/releng/features/org.eclipse.ecf.filetransfer.httpclient4.feature/buckminster.cspex b/releng/features/org.eclipse.ecf.filetransfer.httpclient4.feature/buckminster.cspex
index dbf46dc80..d20a37e35 100644
--- a/releng/features/org.eclipse.ecf.filetransfer.httpclient4.feature/buckminster.cspex
+++ b/releng/features/org.eclipse.ecf.filetransfer.httpclient4.feature/buckminster.cspex
@@ -6,13 +6,11 @@
<dependencies>
<dependency name="org.eclipse.platform" componentType="eclipse.feature"/>
<dependency name="org.eclipse.equinox.concurrent" componentType="osgi.bundle"/>
- <dependency name="org.apache.commons.httpclient" componentType="osgi.bundle"/>
<!-- Explicitly reflect the import-package dependency as defined by -->
<!-- org.apache.httpcomponents.httpclient 4.1.2, because Buckminster -->
<!-- does not handle import-package definitions and thus needs a little -->
<!-- help figuring out what bundle to select -->
<dependency name="org.apache.commons.logging" versionDesignator="1.1.1" componentType="osgi.bundle"/>
- <dependency name="org.apache.commons.codec" componentType="osgi.bundle"/>
<!-- Add filetransfer tests -->
<dependency name="org.eclipse.ecf.tests.filetransfer.feature" componentType="eclipse.feature"/>
</dependencies>
diff --git a/releng/features/org.eclipse.ecf.filetransfer.httpclient4.feature/feature.xml b/releng/features/org.eclipse.ecf.filetransfer.httpclient4.feature/feature.xml
index 1fec7fa18..db315a2a0 100644
--- a/releng/features/org.eclipse.ecf.filetransfer.httpclient4.feature/feature.xml
+++ b/releng/features/org.eclipse.ecf.filetransfer.httpclient4.feature/feature.xml
@@ -1,64 +1,57 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.ecf.filetransfer.httpclient4.feature"
- label="ECF Httpclient4 Filetransfer Provider"
- version="3.5.6.qualifier"
- provider-name="Eclipse.org - ECF">
-
- <description url="http://www.eclipse.org/ecf">
- This feature provides the httpclient4-based filetransfer provider.
- </description>
-
- <copyright url="http://www.example.com/copyright">
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.eclipse.ecf.filetransfer.httpclient4.feature"
+ label="ECF Httpclient4 Filetransfer Provider"
+ version="3.5.6.qualifier"
+ provider-name="Eclipse.org - ECF">
+
+ <description url="http://www.eclipse.org/ecf">
+ This feature provides the httpclient4-based filetransfer provider.
+ </description>
+
+ <copyright url="http://www.example.com/copyright">
Copyright (c) 2011 Composent, Inc. and others. All rights reserved.
This program and the accompanying materials are made available
under the terms of the Eclipse Public License v1.0 which accompanies
this distribution, and is available at
http://www.eclipse.org/legal/epl-v10.html
-Contributors: Composent, Inc. - initial API and implementation
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <plugin
- id="org.apache.commons.logging"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.httpcomponents.httpclient"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.httpcomponents.httpcore"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.ecf.provider.filetransfer.httpclient4"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.ecf.provider.filetransfer.httpclient4.ssl"
- download-size="0"
- install-size="0"
- version="0.0.0"
- fragment="true"
- unpack="false"/>
-
+Contributors: Composent, Inc. - initial API and implementation
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+ <plugin
+ id="org.apache.httpcomponents.httpclient"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.httpcomponents.httpcore"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.ecf.provider.filetransfer.httpclient4"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.ecf.provider.filetransfer.httpclient4.ssl"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ fragment="true"
+ unpack="false"/>
+
<plugin
id="org.apache.commons.codec"
download-size="0"
@@ -66,4 +59,4 @@ Contributors: Composent, Inc. - initial API and implementation
version="0.0.0"
unpack="false"/>
-</feature>
+</feature>

Back to the top