Author: carlos
Date: Tue Oct 23 10:38:12 2007
New Revision: 587567
URL: http://svn.apache.org/viewvc?rev=587567&view=rev
Log:
Keep backwards compatibility by deprecating old methods
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DuplicateProjectException.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/InvalidProjectModelException.java
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DuplicateProjectException.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DuplicateProjectException.java?rev=587567&r1=587566&r2=587567&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DuplicateProjectException.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DuplicateProjectException.java
Tue Oct 23 10:38:12 2007
@@ -36,6 +36,25 @@
private final File conflictingProjectFile;
+ /**
+ * @deprecated use [EMAIL PROTECTED] #DuplicateProjectException(String,
File, File, String)}
+ */
+ public DuplicateProjectException( String message )
+ {
+ this( null, null, null, message );
+ }
+
+ /**
+ * @deprecated use [EMAIL PROTECTED] #DuplicateProjectException(String,
File, File, String)}
+ */
+ public DuplicateProjectException( String message, Exception e )
+ {
+ super( message, e );
+ this.projectId = null;
+ this.existingProjectFile = null;
+ this.conflictingProjectFile = null;
+ }
+
public DuplicateProjectException( String projectId,
File existingProjectFile,
File conflictingProjectFile,
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/InvalidProjectModelException.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/InvalidProjectModelException.java?rev=587567&r1=587566&r2=587567&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/InvalidProjectModelException.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/InvalidProjectModelException.java
Tue Oct 23 10:38:12 2007
@@ -19,55 +19,117 @@
* under the License.
*/
-import org.apache.maven.artifact.InvalidRepositoryException;
-import org.apache.maven.project.interpolation.ModelInterpolationException;
+import java.io.File;
+import java.net.URI;
+
import org.apache.maven.project.validation.ModelValidationResult;
-import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
public class InvalidProjectModelException
extends ProjectBuildingException
{
private ModelValidationResult validationResult;
+ /**
+ *
+ * @param projectId
+ * @param message
+ * @param pomFile pom file
+ * @param cause
+ */
+ public InvalidProjectModelException( String projectId,
+ String message,
+ File pomFile,
+ Throwable cause )
+ {
+ super( projectId, message, pomFile, cause );
+ }
+
+ /**
+ *
+ * @param projectId
+ * @param message
+ * @param pomLocation pom location
+ * @param cause
+ */
public InvalidProjectModelException( String projectId,
- String pomLocation,
String message,
- ModelInterpolationException cause )
+ URI pomLocation,
+ Throwable cause )
{
super( projectId, message, pomLocation, cause );
}
+ /**
+ *
+ * @param projectId
+ * @param message
+ * @param pomLocation pom location
+ */
+ public InvalidProjectModelException( String projectId,
+ String message,
+ URI pomLocation )
+ {
+ super( projectId, message, pomLocation );
+ }
+
+ /**
+ * @deprecated use [EMAIL PROTECTED] #InvalidProjectModelException(String,
String, File, Throwable)}
+ * @param projectId
+ * @param pomLocation absolute path of the pom file
+ * @param message
+ * @param cause
+ */
public InvalidProjectModelException( String projectId,
String pomLocation,
String message,
- InvalidRepositoryException cause )
+ Throwable cause )
{
- super( projectId, message, pomLocation, cause );
+ super( projectId, message, new File( pomLocation ), cause );
}
+ /**
+ * @deprecated use [EMAIL PROTECTED] #InvalidProjectModelException(String,
String, File, ModelValidationResult)}
+ * @param projectId
+ * @param pomLocation absolute path of the pom file
+ * @param message
+ * @param validationResult
+ */
public InvalidProjectModelException( String projectId,
String pomLocation,
String message,
ModelValidationResult
validationResult )
{
- super( projectId, message, pomLocation );
+ this( projectId, message, new File( pomLocation ), validationResult );
+ }
+
+ public InvalidProjectModelException( String projectId,
+ String message,
+ File pomFile,
+ ModelValidationResult
validationResult )
+ {
+ super( projectId, message, pomFile );
this.validationResult = validationResult;
}
public InvalidProjectModelException( String projectId,
- String pomLocation,
- String message )
+ String message,
+ File pomLocation )
{
super( projectId, message, pomLocation );
}
+ /**
+ * @deprecated use [EMAIL PROTECTED] #InvalidProjectModelException(String,
String, File)}
+ * @param projectId
+ * @param pomLocation absolute path of the pom file
+ * @param message
+ */
public InvalidProjectModelException( String projectId,
String pomLocation,
- String message,
- XmlPullParserException cause )
+ String message )
{
- super( projectId, message, pomLocation, cause );
+ super( projectId, message, new File( pomLocation ) );
}
public final ModelValidationResult getValidationResult()
