You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@depot.apache.org by aj...@apache.org on 2004/04/30 23:02:18 UTC
svn commit: rev 10461 - incubator/depot/trunk/update/src/java/org/apache/depot/update/ant/task
Author: ajack
Date: Fri Apr 30 16:02:18 2004
New Revision: 10461
Modified:
incubator/depot/trunk/update/src/java/org/apache/depot/update/ant/task/RepositoryToolTask.java
incubator/depot/trunk/update/src/java/org/apache/depot/update/ant/task/SynchronizeTask.java
Log:
Tweaks. Important one is to list all specifiers we extract for repos.
Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/ant/task/RepositoryToolTask.java
==============================================================================
--- incubator/depot/trunk/update/src/java/org/apache/depot/update/ant/task/RepositoryToolTask.java (original)
+++ incubator/depot/trunk/update/src/java/org/apache/depot/update/ant/task/RepositoryToolTask.java Fri Apr 30 16:02:18 2004
@@ -58,7 +58,9 @@
m_updater = updater;
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see org.apache.tools.ant.Task#execute()
*/
public void execute() throws BuildException {
@@ -67,25 +69,22 @@
// Set logging context..
Logger logger = Logger.pushContext(new AntLogListener(this));
-
+
UpdateConfig.configure();
try {
log("RepositorySet: " + m_repositories);
- ResourceUpdaterContext context =
- ResourceUpdaterContext.getDefaultContext();
+ ResourceUpdaterContext context = ResourceUpdaterContext.getDefaultContext();
//
// This uses default or configured stuff..
//
- RepositorySet set =
- RepositorySet.getRepositorySet(m_repositories, true);
+ RepositorySet set = RepositorySet.getRepositorySet(m_repositories,
+ true);
int repoCnt = 0;
- for (Iterator i = set.getRepositories().iterator();
- i.hasNext();
- repoCnt++) {
+ for (Iterator i = set.getRepositories().iterator(); i.hasNext(); repoCnt++) {
IRepository r = (IRepository) i.next();
RepositoryWrapper repo = new RepositoryWrapper(r, context);
@@ -94,53 +93,49 @@
if (null == m_group) {
try {
// List groups ...
- List groups =
- repo.listGroups(AllSelector.getInstance());
+ List groups = repo.listGroups(AllSelector.getInstance());
for (Iterator gi = groups.iterator(); gi.hasNext();) {
ResourceGroup group = (ResourceGroup) gi.next();
log(" - Group: " + group);
+
+ List specifiers = repo.listSpecifiers(group,
+ AllSelector.getInstance());
+
+ for (Iterator si = specifiers.iterator(); si.hasNext();) {
+ ResourceSpecifier specifier = (ResourceSpecifier) si.next();
+
+ log(" - " + specifier);
+ }
}
+ } catch (UpdateException re) {
+ log(" - Failed to list groups: "
+ + re.getLocalizedMessage(), Project.MSG_WARN);
}
- catch (UpdateException re) {
- log(
- " - Failed to list groups: "
- + re.getLocalizedMessage(),
- Project.MSG_WARN);
- }
- }
- else {
+ } else {
ResourceGroup group = new ResourceGroup(m_group);
try {
// List groups ...
- List specifiers =
- repo.listSpecifiers(
- group,
+ List specifiers = repo.listSpecifiers(group,
AllSelector.getInstance());
- for (Iterator gi = specifiers.iterator();
- gi.hasNext();
- ) {
+ for (Iterator gi = specifiers.iterator(); gi.hasNext();) {
ResourceSpecifier specifier = (ResourceSpecifier) gi.next();
log(" - Specifier: " + specifier);
}
- }
- catch (UpdateException re) {
- log(
- " - Failed to list groups: "
- + re.getLocalizedMessage(),
- Project.MSG_WARN);
+ } catch (UpdateException re) {
+ log(" - Failed to list groups: "
+ + re.getLocalizedMessage(), Project.MSG_WARN);
}
}
}
if (0 == repoCnt)
- log(
- "No repositories in set: " + m_repositories,
- Project.MSG_WARN);
+ log("No repositories in set: " + m_repositories,
+ Project.MSG_WARN);
}
// catch (RuperException re2) {
// log(
@@ -153,6 +148,7 @@
Logger.popContext(logger);
}
}
+
/**
* @return
*/
Modified: incubator/depot/trunk/update/src/java/org/apache/depot/update/ant/task/SynchronizeTask.java
==============================================================================
--- incubator/depot/trunk/update/src/java/org/apache/depot/update/ant/task/SynchronizeTask.java (original)
+++ incubator/depot/trunk/update/src/java/org/apache/depot/update/ant/task/SynchronizeTask.java Fri Apr 30 16:02:18 2004
@@ -111,7 +111,7 @@
ruper.clean(group);
}
else
- throw new BuildException("Missing mandatory attributes, 'group' required.");
+ throw new BuildException("Missing mandatory attribute 'group' required.");
}
catch (UpdateException re) {
throw new BuildException("Failed to <reposync " + m_group, re);