You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by jv...@apache.org on 2003/05/24 05:22:02 UTC
cvs commit: maven-new/core/src/java/org/apache/maven/verifier ChecksumVerificationException.java UnsatisfiedDependencyException.java
jvanzyl 2003/05/23 20:22:02
Modified: core/src/java/org/apache/maven DefaultMaven.java
core/src/java/org/apache/maven/artifact/satisfy
DefaultDependencySatisfier.java
DependencySatisfier.java
core/src/java/org/apache/maven/artifact/verify
ArtifactVerifier.java DefaultArtifactVerifier.java
Added: core/src/java/org/apache/maven/artifact/satisfy
UnsatisfiedDependencyException.java
core/src/java/org/apache/maven/artifact/verify
ChecksumVerificationException.java
Removed: core/src/java/org/apache/maven/verifier
ChecksumVerificationException.java
UnsatisfiedDependencyException.java
Log:
o Just shifting a couple classes into the o.a.m.artifact package.
Revision Changes Path
1.10 +4 -4 maven-new/core/src/java/org/apache/maven/DefaultMaven.java
Index: DefaultMaven.java
===================================================================
RCS file: /home/cvs/maven-new/core/src/java/org/apache/maven/DefaultMaven.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DefaultMaven.java 23 May 2003 10:36:05 -0000 1.9
+++ DefaultMaven.java 24 May 2003 03:22:01 -0000 1.10
@@ -66,10 +66,10 @@
import org.apache.maven.project.Project;
import org.apache.maven.project.builder.ProjectBuilder;
import org.apache.maven.project.builder.ProjectUnmarshaller;
-import org.apache.maven.verifier.ChecksumVerificationException;
+import org.apache.maven.artifact.verify.ChecksumVerificationException;
import org.apache.maven.verifier.LocalSettingsVerifier;
import org.apache.maven.verifier.RepoConfigException;
-import org.apache.maven.verifier.UnsatisfiedDependencyException;
+import org.apache.maven.artifact.satisfy.UnsatisfiedDependencyException;
import org.apache.plexus.context.DefaultContext;
import org.apache.plexus.logging.AbstractLogEnabled;
@@ -589,7 +589,7 @@
* Verify the dependencies for this project.
*
* @throws RepoConfigException If an error occurs checking the local settings.
- * @throws UnsatisfiedDependencyException If an error occurs due to missing exceptions.
+ * @throws org.apache.maven.artifact.satisfy.UnsatisfiedDependencyException If an error occurs due to missing exceptions.
*/
public void verifyDependencies( Project project )
throws RepoConfigException, UnsatisfiedDependencyException, ChecksumVerificationException
1.2 +2 -3 maven-new/core/src/java/org/apache/maven/artifact/satisfy/DefaultDependencySatisfier.java
Index: DefaultDependencySatisfier.java
===================================================================
RCS file: /home/cvs/maven-new/core/src/java/org/apache/maven/artifact/satisfy/DefaultDependencySatisfier.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultDependencySatisfier.java 20 May 2003 19:57:52 -0000 1.1
+++ DefaultDependencySatisfier.java 24 May 2003 03:22:01 -0000 1.2
@@ -61,7 +61,6 @@
import org.apache.avalon.framework.service.Serviceable;
import org.apache.maven.project.Project;
import org.apache.maven.util.I18NUtils;
-import org.apache.maven.verifier.UnsatisfiedDependencyException;
import org.apache.maven.artifact.download.ArtifactDownloader;
import org.apache.maven.artifact.Artifact;
import org.apache.plexus.logging.AbstractLogEnabled;
@@ -111,7 +110,7 @@
* Check to see that all dependencies are present and if they are
* not then download them.
*
- * @throws org.apache.maven.verifier.UnsatisfiedDependencyException If there are unsatisfied dependencies.
+ * @throws org.apache.maven.artifact.satisfy.UnsatisfiedDependencyException If there are unsatisfied dependencies.
*/
public void satisfyDependencies( Project project )
throws UnsatisfiedDependencyException
1.2 +2 -3 maven-new/core/src/java/org/apache/maven/artifact/satisfy/DependencySatisfier.java
Index: DependencySatisfier.java
===================================================================
RCS file: /home/cvs/maven-new/core/src/java/org/apache/maven/artifact/satisfy/DependencySatisfier.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DependencySatisfier.java 20 May 2003 19:57:52 -0000 1.1
+++ DependencySatisfier.java 24 May 2003 03:22:01 -0000 1.2
@@ -56,7 +56,6 @@
package org.apache.maven.artifact.satisfy;
import org.apache.maven.project.Project;
-import org.apache.maven.verifier.UnsatisfiedDependencyException;
/**
* Make sure that everything that is required for the project to build
@@ -75,7 +74,7 @@
*
* @param project
* @throws RepoConfigException
- * @throws org.apache.maven.verifier.UnsatisfiedDependencyException
+ * @throws org.apache.maven.artifact.satisfy.UnsatisfiedDependencyException
* @throws ChecksumVerificationException
*/
void satisfyDependencies( Project project )
1.1 maven-new/core/src/java/org/apache/maven/artifact/satisfy/UnsatisfiedDependencyException.java
Index: UnsatisfiedDependencyException.java
===================================================================
package org.apache.maven.artifact.satisfy;
/* ====================================================================
* The Apache Software License, Version 1.1
*
* Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "Apache" and "Apache Software Foundation" and
* "Apache MavenSession" must not be used to endorse or promote products
* derived from this software without prior written permission. For
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
* "Apache MavenSession", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
* ====================================================================
*/
import org.apache.maven.MavenException;
/**
* Specialized unsatisfied dependency exception.
*
* @author <a href="mailto:jason@zenplex.com">Jason van Zyl</a>
*
* @version $Id: UnsatisfiedDependencyException.java,v 1.1 2003/05/24 03:22:01 jvanzyl Exp $
*/
public class UnsatisfiedDependencyException
extends MavenException
{
/**
* Constructs a UnsatisfiedDependencyException with the specified detail message.
* @param message Detailed message.
*/
public UnsatisfiedDependencyException( String message )
{
super( message );
}
}
1.3 +2 -3 maven-new/core/src/java/org/apache/maven/artifact/verify/ArtifactVerifier.java
Index: ArtifactVerifier.java
===================================================================
RCS file: /home/cvs/maven-new/core/src/java/org/apache/maven/artifact/verify/ArtifactVerifier.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ArtifactVerifier.java 23 May 2003 02:18:44 -0000 1.2
+++ ArtifactVerifier.java 24 May 2003 03:22:02 -0000 1.3
@@ -56,7 +56,6 @@
package org.apache.maven.artifact.verify;
import org.apache.maven.project.Project;
-import org.apache.maven.verifier.ChecksumVerificationException;
/**
* The interface defining an interface for classes
@@ -75,7 +74,7 @@
/**
*
* @param artifact the <code>Artifact</code> which will be verified
- * @throws org.apache.maven.verifier.ChecksumVerificationException
+ * @throws org.apache.maven.artifact.verify.ChecksumVerificationException
*/
void verify( Project project ) throws ChecksumVerificationException;
}
1.3 +1 -2 maven-new/core/src/java/org/apache/maven/artifact/verify/DefaultArtifactVerifier.java
Index: DefaultArtifactVerifier.java
===================================================================
RCS file: /home/cvs/maven-new/core/src/java/org/apache/maven/artifact/verify/DefaultArtifactVerifier.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultArtifactVerifier.java 23 May 2003 22:48:59 -0000 1.2
+++ DefaultArtifactVerifier.java 24 May 2003 03:22:02 -0000 1.3
@@ -61,7 +61,6 @@
import org.apache.maven.project.Project;
import org.apache.maven.util.I18NUtils;
import org.apache.maven.util.MD5Sum;
-import org.apache.maven.verifier.ChecksumVerificationException;
import org.apache.maven.artifact.verify.ArtifactVerifier;
import org.apache.maven.artifact.Artifact;
1.1 maven-new/core/src/java/org/apache/maven/artifact/verify/ChecksumVerificationException.java
Index: ChecksumVerificationException.java
===================================================================
package org.apache.maven.artifact.verify;
/* ====================================================================
* The Apache Software License, Version 1.1
*
* Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "Apache" and "Apache Software Foundation" and
* "Apache MavenSession" must not be used to endorse or promote products
* derived from this software without prior written permission. For
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
* "Apache MavenSession", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
* ====================================================================
*/
import org.apache.maven.MavenException;
/**
* Specialized artifact corruption exception.
*
* @author <a href="jason@zenplex.com">Jason van Zyl</a>
*
* @version $Id: ChecksumVerificationException.java,v 1.1 2003/05/24 03:22:02 jvanzyl Exp $
*/
public class ChecksumVerificationException
extends MavenException
{
/**
* Constructs an ChecksumVerificationException with the specified detail message.
* @param message Detailed message.
*/
public ChecksumVerificationException( String message )
{
super( message );
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org