Skip to content

Commit

Permalink
NEW - bug 335237: [Discovery][ZooDiscovery] zookeeper provider feature
Browse files Browse the repository at this point in the history
  • Loading branch information
wimjongman committed Feb 16, 2011
1 parent 5a412fd commit 9869e39
Show file tree
Hide file tree
Showing 5 changed files with 93 additions and 50 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ Export-Package: org.apache.jute,
org.apache.zookeeper.version,
org.apache.zookeeper.version.util
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.apache.log4j
Eclipse-RegisterBuddy: org.apache.log4j
Bundle-Vendor: Eclipse.org - ECF
Import-Package: org.apache.log4j
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<cspecExtension
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:bc="http://www.eclipse.org/buckminster/Common-1.0"
xmlns="http://www.eclipse.org/buckminster/CSpec-1.0">
<dependencies>
<dependency name="org.apache.log4j" componentType="osgi.bundle"/>
<dependency name="org.apache.hadoop.zookeeper" componentType="osgi.bundle"/>
</dependencies>
<generators>
<!-- Place your Generators here -->
</generators>
<artifacts>
<!-- Place your Artifacts here -->
</artifacts>
<actions>
<!-- Place your Actions here -->
</actions>
<groups>
<!-- Place your Groups here -->
</groups>
<alterDependencies>
<!-- Place your Dependencies alterations here -->
</alterDependencies>
<alterArtifacts>
<!-- Place your Artifact alterations here -->
</alterArtifacts>
<alterActions>
<!-- Place your Action alterations here -->
</alterActions>
<alterGroups>
<!-- Place your Group alterations here -->
</alterGroups>
</cspecExtension>
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.eclipse.ecf.discovery.zookeeper.feature"
label="ECF Discovery Zookeeper Provider"
version="1.0.0.qualifier"
provider-name="%providerName">

<description url="http://wiki.eclipse.org/Zookeeper_Based_ECF_Discovery">
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.eclipse.ecf.discovery.zookeeper.feature"
label="ECF Discovery Zookeeper Provider"
version="1.0.0.qualifier"
provider-name="%providerName">

<description url="http://wiki.eclipse.org/Zookeeper_Based_ECF_Discovery">
This feature provides the Apache Zookeeper Discovery Provider
implementation
</description>

<copyright url="http://www.eclipse.org/legal/epl-v10.html">
implementation
</description>

<copyright url="http://www.eclipse.org/legal/epl-v10.html">
/*******************************************************************************
* Copyright (c)2010 REMAIN B.V. (http://www.remainsoftware.com).
* All rights reserved. This program and the accompanying materials
Expand All @@ -20,38 +20,45 @@ implementation
*
* Contributors:
* Remain Software - initial API and implementation
*******************************************************************************/
</copyright>

<license url="%licenseURL">
%license
</license>

<requires>
<import plugin="org.apache.log4j"/>
<import plugin="org.eclipse.equinox.common" version="3.5.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.ecf.discovery" version="3.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.ecf"/>
<import plugin="org.eclipse.ecf.identity"/>
<import plugin="org.eclipse.equinox.concurrent"/>
<import plugin="org.eclipse.osgi"/>
<import plugin="org.eclipse.osgi.services"/>
<import plugin="org.eclipse.equinox.ds"/>
<import feature="org.eclipse.ecf.discovery.feature" version="1.0.0"/>
</requires>

<plugin
id="org.eclipse.ecf.provider.zookeeper"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="org.apache.zookeeper"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

</feature>
*******************************************************************************/
</copyright>

<license url="%licenseURL">
%license
</license>

<requires>
<import plugin="org.apache.log4j"/>
<import plugin="org.eclipse.equinox.common" version="3.5.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.ecf.discovery" version="3.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.ecf"/>
<import plugin="org.eclipse.ecf.identity"/>
<import plugin="org.eclipse.equinox.concurrent"/>
<import plugin="org.eclipse.osgi"/>
<import plugin="org.eclipse.osgi.services"/>
<import plugin="org.eclipse.equinox.ds"/>
<import feature="org.eclipse.ecf.discovery.feature" version="1.0.0"/>
</requires>

<plugin
id="org.eclipse.ecf.provider.zookeeper"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="org.apache.log4j"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="org.apache.hadoop.zookeeper"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

</feature>
2 changes: 1 addition & 1 deletion releng/org.eclipse.ecf.releng.bm/ecf.b3aggr
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<repositories location="http://download.eclipse.org/rt/ecf/3.4/site.p2/"/>
</contributions>
<contacts name="Markus Alexander Kuppe" email="[email protected]"/>
<validationRepositories location="http://download.eclipse.org/tools/orbit/downloads/drops/S20101014084557/repository/"/>
<validationRepositories location="http://download.eclipse.org/tools/orbit/downloads/drops/S20110124210048/repository/"/>
<validationRepositories location="http://download.eclipse.org/eclipse/updates/3.6/R-3.6.1-201009090800/"/>
<validationRepositories location="http://download.eclipse.org/modeling/emf/emf/updates/2.6/"/>
</aggregator:Aggregator>
4 changes: 3 additions & 1 deletion releng/org.eclipse.ecf.releng.bm/ecf.rmap
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,9 @@
<provider readerType="p2" componentTypes="osgi.bundle" mutable="false" source="false">
<uri format="http://download.eclipse.org/tools/orbit/downloads/drops/S20100831105311/repository?importType=binary"/>
</provider>
<provider readerType="p2" componentTypes="osgi.bundle" mutable="false" source="false">
<uri format="http://download.eclipse.org/tools/orbit/downloads/drops/S20110124210048/repository?importType=binary"/>
</provider>
<!-- dev.eclipse.org PDEMapProvider -->
<provider xsi:type="pmp:PDEMapProvider" readerType="cvs" componentTypes="osgi.bundle,eclipse.feature" mutable="false" source="true">
<uri format=":pserver:[email protected]:/cvsroot/tools,org.eclipse.orbit/org.eclipse.orbit.releng/maps">
Expand All @@ -104,7 +107,6 @@
<locator searchPathRef="org.eclipse.ecf" pattern="^org\.eclipse\.ecf(\..+)?" />
<locator searchPathRef="org.eclipse.ecf" pattern="^org\.eclipse\.team\.ecf(\..+)?" />
<locator searchPathRef="org.eclipse.ecf" pattern="^org\.jivesoftware\.smack$" />
<locator searchPathRef="org.eclipse.ecf" pattern="^org\.apache\.zookeeper$" />
<locator searchPathRef="org.eclipse.ecf" pattern="^org\.eclipse\.osgi\.services\.remoteserviceadmin(\..+)?" />

<!-- EMF -->
Expand Down

0 comments on commit 9869e39

Please sign in to comment.