mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-07-03 23:25:26 +02:00
Reorganize commons.net as single-jar Orbit bundle: Get rid of separate features
This commit is contained in:
parent
0fadb43989
commit
c653edf1da
8 changed files with 54 additions and 84 deletions
|
@ -5,16 +5,6 @@
|
|||
<!-- Add one <ant> task for each top level element being built. -->
|
||||
<!-- ===================================================================== -->
|
||||
<target name="allElements">
|
||||
<!--
|
||||
<ant antfile="${genericTargets}" target="${target}">
|
||||
<property name="type" value="feature" />
|
||||
<property name="id" value="org.apache.oro" />
|
||||
</ant>
|
||||
<ant antfile="${genericTargets}" target="${target}">
|
||||
<property name="type" value="feature" />
|
||||
<property name="id" value="org.apache.commons.net" />
|
||||
</ant>
|
||||
-->
|
||||
<ant antfile="${genericTargets}" target="${target}">
|
||||
<property name="type" value="feature" />
|
||||
<property name="id" value="org.eclipse.rse.core" />
|
||||
|
@ -72,19 +62,6 @@
|
|||
<!-- Add one target for each root element and each configuration -->
|
||||
<!-- ===================================================================== -->
|
||||
|
||||
<!-- No separate assembly, included in FTP ::
|
||||
<target name="assemble.org.apache.oro">
|
||||
<property name="archiveName" value="jakarta-oro-${buildId}.zip"/>
|
||||
<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
|
||||
<antcall target="unpackUpdateJarsForPackaging" />
|
||||
</target>
|
||||
<target name="assemble.org.apache.commons.net">
|
||||
<property name="archiveName" value="commons-net-${buildId}.zip"/>
|
||||
<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
|
||||
<antcall target="unpackUpdateJarsForPackaging" />
|
||||
</target>
|
||||
-->
|
||||
|
||||
<target name="assemble.org.eclipse.rse.core">
|
||||
<property name="archiveName" value="RSE-runtime-core-${buildId}.zip"/>
|
||||
<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
|
||||
|
@ -251,14 +228,13 @@
|
|||
<!-- the latest released version even in case of an N-build -->
|
||||
<!--
|
||||
<ant antfile="${genericTargets}" target="fetchElement">
|
||||
<property name="type" value="feature" />
|
||||
<property name="type" value="plugin" />
|
||||
<property name="id" value="org.apache.commons.net" />
|
||||
</ant>
|
||||
-->
|
||||
<mkdir dir="${buildDirectory}/features"/>
|
||||
<mkdir dir="${buildDirectory}/plugins"/>
|
||||
<eclipse.fetch
|
||||
elements="feature@org.apache.oro"
|
||||
elements="plugin@org.apache.oro"
|
||||
buildDirectory="${buildDirectory}"
|
||||
directory="${buildDirectory}/directory.txt"
|
||||
fetchTag=""
|
||||
|
@ -267,11 +243,10 @@
|
|||
/>
|
||||
<!-- Run generated fetch script -->
|
||||
<ant antfile="${buildDirectory}/fetch_org.apache.oro.xml">
|
||||
<property name="featureOnly" value="true"/>
|
||||
<property name="featureAndPlugins" value="true"/>
|
||||
</ant>
|
||||
<eclipse.fetch
|
||||
elements="feature@org.apache.commons.net"
|
||||
elements="plugin@org.apache.commons.net"
|
||||
buildDirectory="${buildDirectory}"
|
||||
directory="${buildDirectory}/directory.txt"
|
||||
fetchTag=""
|
||||
|
@ -280,7 +255,6 @@
|
|||
/>
|
||||
<!-- Run generated fetch script -->
|
||||
<ant antfile="${buildDirectory}/fetch_org.apache.commons.net.xml">
|
||||
<property name="featureOnly" value="true"/>
|
||||
<property name="featureAndPlugins" value="true"/>
|
||||
</ant>
|
||||
</target>
|
||||
|
|
|
@ -1,4 +1,2 @@
|
|||
feature@org.apache.commons.net=v20070223,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/thirdparty/org.apache.commons.net-feature
|
||||
feature@org.apache.oro=v20070223,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/thirdparty/org.apache.oro-feature
|
||||
plugin@org.apache.commons.net=v20061222,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.orbit/org.apache.commons.net
|
||||
plugin@org.apache.oro=v20061222,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.orbit/org.apache.oro
|
|
@ -41,12 +41,6 @@
|
|||
<feature url="features/org.eclipse.tm.discovery_2.0.0.qualifier.jar" id="org.eclipse.tm.discovery" version="2.0.0.qualifier">
|
||||
<category name="Target Management Add-ons and Stand-alone Offerings"/>
|
||||
</feature>
|
||||
<feature url="features/org.apache.commons.net_1.4.1.qualifier.jar" id="org.apache.commons.net" version="1.4.1.qualifier">
|
||||
<category name="Enabling Features"/>
|
||||
</feature>
|
||||
<feature url="features/org.apache.oro_2.0.8.qualifier.jar" id="org.apache.oro" version="2.0.8.qualifier">
|
||||
<category name="Enabling Features"/>
|
||||
</feature>
|
||||
<feature url="features/org.eclipse.tm.terminal.sdk_1.0.0.qualifier.jar" id="org.eclipse.tm.terminal.sdk" version="1.0.0.qualifier">
|
||||
<category name="Target Management Add-ons and Stand-alone Offerings"/>
|
||||
</feature>
|
||||
|
@ -68,9 +62,4 @@
|
|||
Target Management Core Components as well as Experimental add-ons for RSE.
|
||||
</description>
|
||||
</category-def>
|
||||
<category-def name="Enabling Features" label="Enabling Features">
|
||||
<description>
|
||||
Third Party Libraries
|
||||
</description>
|
||||
</category-def>
|
||||
</site>
|
||||
|
|
|
@ -13,8 +13,6 @@ bin.includes = feature.xml,\
|
|||
feature.properties,\
|
||||
epl-v10.html,\
|
||||
eclipse_update_120.jpg
|
||||
generate.feature@org.apache.commons.net.source=org.apache.commons.net
|
||||
generate.feature@org.apache.oro.source=org.apache.oro
|
||||
generate.feature@org.eclipse.rse.local.source=org.eclipse.rse.local
|
||||
generate.feature@org.eclipse.rse.ftp.source=org.eclipse.rse.ftp
|
||||
generate.feature@org.eclipse.rse.ssh.source=org.eclipse.rse.ssh
|
||||
|
|
|
@ -22,14 +22,6 @@
|
|||
<update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/milestones"/>
|
||||
</url>
|
||||
|
||||
<includes
|
||||
id="org.apache.commons.net"
|
||||
version="0.0.0"/>
|
||||
|
||||
<includes
|
||||
id="org.apache.oro"
|
||||
version="0.0.0"/>
|
||||
|
||||
<requires>
|
||||
<import plugin="org.eclipse.ui"/>
|
||||
<import plugin="org.eclipse.core.runtime"/>
|
||||
|
@ -44,6 +36,20 @@
|
|||
-->
|
||||
</requires>
|
||||
|
||||
<plugin
|
||||
id="org.apache.oro"
|
||||
download-size="31"
|
||||
install-size="124"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="org.apache.commons.net"
|
||||
download-size="65"
|
||||
install-size="244"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="org.eclipse.rse.services.files.ftp"
|
||||
download-size="11"
|
||||
|
|
|
@ -13,8 +13,6 @@ bin.includes = feature.xml,\
|
|||
feature.properties,\
|
||||
epl-v10.html,\
|
||||
eclipse_update_120.jpg
|
||||
generate.feature@org.apache.commons.net.source=org.apache.commons.net
|
||||
generate.feature@org.apache.oro.source=org.apache.oro
|
||||
generate.feature@org.eclipse.rse.local.source=org.eclipse.rse.local
|
||||
generate.feature@org.eclipse.rse.ftp.source=org.eclipse.rse.ftp
|
||||
generate.feature@org.eclipse.rse.ssh.source=org.eclipse.rse.ssh
|
||||
|
|
|
@ -26,14 +26,6 @@
|
|||
id="org.eclipse.rse"
|
||||
version="0.0.0"/>
|
||||
|
||||
<includes
|
||||
id="org.apache.commons.net.source"
|
||||
version="0.0.0"/>
|
||||
|
||||
<includes
|
||||
id="org.apache.oro.source"
|
||||
version="0.0.0"/>
|
||||
|
||||
<includes
|
||||
id="org.eclipse.rse.core.source"
|
||||
version="0.0.0"/>
|
||||
|
|
|
@ -338,12 +338,16 @@ public class RSEPersistenceManager implements IRSEPersistenceManager {
|
|||
*/
|
||||
private boolean load(ISystemProfileManager profileManager) {
|
||||
boolean successful = true;
|
||||
if (isExporting() || isImporting()) {
|
||||
successful = false;
|
||||
} else {
|
||||
_currentState = STATE_IMPORTING;
|
||||
IProject project = getRemoteSystemsProject();
|
||||
synchronized(this) {
|
||||
if (isExporting() || isImporting()) {
|
||||
successful = false;
|
||||
} else {
|
||||
setState(STATE_IMPORTING);
|
||||
}
|
||||
}
|
||||
if(successful) {
|
||||
try {
|
||||
IProject project = getRemoteSystemsProject();
|
||||
if (!project.isSynchronized(IResource.DEPTH_ONE)) project.refreshLocal(IResource.DEPTH_ONE, null);
|
||||
IRSEPersistenceProvider persistenceProvider = getRSEPersistenceProvider();
|
||||
String[] profileNames = persistenceProvider.getSavedProfileNames();
|
||||
|
@ -361,8 +365,10 @@ public class RSEPersistenceManager implements IRSEPersistenceManager {
|
|||
}
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
successful = false;
|
||||
} finally {
|
||||
setState(STATE_NONE);
|
||||
}
|
||||
_currentState = STATE_NONE;
|
||||
}
|
||||
return successful;
|
||||
}
|
||||
|
@ -375,18 +381,27 @@ public class RSEPersistenceManager implements IRSEPersistenceManager {
|
|||
*/
|
||||
private boolean save(ISystemProfile profile, boolean force) {
|
||||
boolean result = false;
|
||||
if (!isImporting()) {
|
||||
_currentState = STATE_EXPORTING;
|
||||
RSEDOM dom = exportRSEDOM(profile, true); // DWD should do merge, but does not handle deletes properly yet
|
||||
_currentState = STATE_NONE;
|
||||
result = true;
|
||||
if (dom.needsSave()) {
|
||||
Job job = dom.getSaveJob();
|
||||
if (job == null) {
|
||||
job = new SaveRSEDOMJob(dom, getRSEPersistenceProvider());
|
||||
dom.setSaveJob(job);
|
||||
boolean acquiredLock = false;
|
||||
synchronized(this) {
|
||||
if (!isImporting()) {
|
||||
setState(STATE_EXPORTING);
|
||||
acquiredLock = true;
|
||||
}
|
||||
}
|
||||
if (acquiredLock) {
|
||||
try {
|
||||
RSEDOM dom = exportRSEDOM(profile, true); // DWD should do merge, but does not handle deletes properly yet
|
||||
result = true;
|
||||
if (dom.needsSave()) {
|
||||
Job job = dom.getSaveJob();
|
||||
if (job == null) {
|
||||
job = new SaveRSEDOMJob(dom, getRSEPersistenceProvider());
|
||||
dom.setSaveJob(job);
|
||||
}
|
||||
job.schedule(3000); // three second delay
|
||||
}
|
||||
job.schedule(3000); // three second delay
|
||||
} finally {
|
||||
setState(STATE_NONE);
|
||||
}
|
||||
}
|
||||
return result;
|
||||
|
@ -406,17 +421,17 @@ public class RSEPersistenceManager implements IRSEPersistenceManager {
|
|||
job.schedule();
|
||||
}
|
||||
|
||||
public boolean isExporting() {
|
||||
public synchronized boolean isExporting() {
|
||||
return _currentState == STATE_EXPORTING;
|
||||
}
|
||||
|
||||
public boolean isImporting() {
|
||||
public synchronized boolean isImporting() {
|
||||
return _currentState == STATE_IMPORTING;
|
||||
}
|
||||
|
||||
// public void setState(int state) {
|
||||
// _currentState = state;
|
||||
// }
|
||||
private synchronized void setState(int state) {
|
||||
_currentState = state;
|
||||
}
|
||||
|
||||
private RSEDOM exportRSEDOM(ISystemProfile profile, boolean force) {
|
||||
RSEDOM dom = _exporter.createRSEDOM(profile, force);
|
||||
|
|
Loading…
Add table
Reference in a new issue