sanders 01/05/05 19:37:50
Modified: cjan/repository cjan-0.1.dtd
cjan/src/java/org/apache/tools/ant/taskdefs/optional/cjan
CJANInfo.java CJANTask.java
Log:
More updates. Very close to working.
Revision Changes Path
1.2 +1 -5 jakarta-commons-sandbox/cjan/repository/cjan-0.1.dtd
Index: cjan-0.1.dtd
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/cjan/repository/cjan-0.1.dtd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cjan-0.1.dtd 2001/05/06 01:08:16 1.1
+++ cjan-0.1.dtd 2001/05/06 02:37:48 1.2
@@ -1,8 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Id: cjan-0.1.dtd,v 1.1 2001/05/06 01:08:16 sanders Exp $
- Copyright 2001 The Apache Software Foundation.
- All rights reserved.
--->
+<!-- $Id: cjan-0.1.dtd,v 1.2 2001/05/06 02:37:48 sanders Exp $ -->
<!ELEMENT project (component+)>
<!ATTLIST project
name CDATA #REQUIRED
1.2 +2 -2
jakarta-commons-sandbox/cjan/src/java/org/apache/tools/ant/taskdefs/optional/cjan/CJANInfo.java
Index: CJANInfo.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/cjan/src/java/org/apache/tools/ant/taskdefs/optional/cjan/CJANInfo.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CJANInfo.java 2001/05/06 01:08:17 1.1
+++ CJANInfo.java 2001/05/06 02:37:49 1.2
@@ -64,7 +64,7 @@
* Class to provide repository information for CJAN.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Scott Sanders</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class CJANInfo extends Object {
@@ -72,7 +72,7 @@
public static final String DEFAULT_PROTOCOL = "http";
public static final String REMOTE_REPO = "cjan.repository.remote";
public static final String LOCAL_REPO = "cjan.repository.local";
- public static final String REMOTE_REPO_DEFAULT =
"http://jakarta.apache.org/cjan/repository/0.1";;
+ public static final String REMOTE_REPO_DEFAULT =
"http://jakarta.apache.org/cjan/repository";;
public static final String DTD_VERSION = "0.1";
public static final String XML_ATTR_LATEST_REVISION = "latest-revision";
1.3 +6 -4
jakarta-commons-sandbox/cjan/src/java/org/apache/tools/ant/taskdefs/optional/cjan/CJANTask.java
Index: CJANTask.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/cjan/src/java/org/apache/tools/ant/taskdefs/optional/cjan/CJANTask.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CJANTask.java 2001/05/06 01:08:17 1.2
+++ CJANTask.java 2001/05/06 02:37:49 1.3
@@ -79,7 +79,7 @@
* Class to provide automated jar file download ala CPAN
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Scott Sanders</a>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class CJANTask extends Task {
@@ -149,17 +149,19 @@
/** A project is required to continue */
if (project == null)
- throw new BuildException("No Project Specified. Please set the project
attribute.");
+ throw new BuildException("No Project Specified. " +
+ "Please set the project attribute.");
/** A remoteRepo is required to continue */
if (cjan.getRemoteRepository() == null)
- throw new BuildException("No Remote Repository Specified. Please set
the " +
+ throw new BuildException("No Remote Repository Specified. " +
+ "Please set the " +
CJANInfo.REMOTE_REPO +
" property or set the remoteRepository
attribute.");
//Parse the project definition and find the URL of the jar to download
String projectURI = cjan.getRemoteRepository() + "/" + project + ".xml";
- cjan.getProject().log("Attempting to download project repository
definition" +
+ cjan.getProject().log("Attempting to download project repository definition
" +
projectURI + ".", Project.MSG_INFO);
Document xml = getProjectDocument(projectURI);
