evenisse 2003/09/11 06:03:56
Modified: src/java/org/apache/maven/plugin PluginCacheManager.java
src/java/org/apache/maven/project ArtifactType.java
Dependency.java Resource.java
Log:
detab
Revision Changes Path
1.16 +1 -1 maven/src/java/org/apache/maven/plugin/PluginCacheManager.java
Index: PluginCacheManager.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/plugin/PluginCacheManager.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- PluginCacheManager.java 22 Aug 2003 08:01:24 -0000 1.15
+++ PluginCacheManager.java 11 Sep 2003 13:03:56 -0000 1.16
@@ -366,7 +366,7 @@
}
catch (SAXParseException e)
{
- sessionLog.error("An XML error occurred parsing the file '"
+ sessionLog.error("An XML error occurred parsing the file '"
+ getPluginScript().getAbsolutePath() + "' plugin", e);
}
catch ( Exception e )
1.4 +65 -65 maven/src/java/org/apache/maven/project/ArtifactType.java
Index: ArtifactType.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/project/ArtifactType.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ArtifactType.java 19 Aug 2003 04:29:25 -0000 1.3
+++ ArtifactType.java 11 Sep 2003 13:03:56 -0000 1.4
@@ -65,78 +65,78 @@
*/
public class ArtifactType
{
- /**
- * EJB artifact mapping.
- */
- public static final ArtifactType EJB = new ArtifactType("ejb", "jar");
+ /**
+ * EJB artifact mapping.
+ */
+ public static final ArtifactType EJB = new ArtifactType("ejb", "jar");
/**
* Plugin artifact mapping.
*/
public static final ArtifactType PLUGIN = new ArtifactType("plugin", "jar");
-
+
+ /**
+ * Artifact type.
+ */
+ private String type;
+
+ /**
+ * Artifact file extension.
+ */
+ private String extension;
+
+ /**
+ * @param type the artifact type
+ * @param extension the artifact extension
+ */
+ private ArtifactType(String type, String extension)
+ {
+ this.type = type;
+ this.extension = extension;
+ }
+
+ /**
+ * @return the artifact type
+ */
+ public String getType()
+ {
+ return this.type;
+ }
+
+ /**
+ * @return the artifact extension
+ */
+ public String getExtension()
+ {
+ return this.extension;
+ }
+
/**
- * Artifact type.
- */
- private String type;
-
- /**
- * Artifact file extension.
- */
- private String extension;
-
- /**
- * @param type the artifact type
- * @param extension the artifact extension
- */
- private ArtifactType(String type, String extension)
- {
- this.type = type;
- this.extension = extension;
- }
-
- /**
- * @return the artifact type
- */
- public String getType()
- {
- return this.type;
- }
-
- /**
- * @return the artifact extension
- */
- public String getExtension()
- {
- return this.extension;
- }
-
- /**
- * Factory to return the correct [EMAIL PROTECTED] ArtifactType} object.
- *
- * @param type the artifact type
- * @return the artifact mapping
- */
- public static ArtifactType findType(String type)
- {
- ArtifactType result;
-
- if (type == null)
- {
- result = null;
- }
- else if (type.equalsIgnoreCase("ejb"))
- {
- result = EJB;
- }
+ * Factory to return the correct [EMAIL PROTECTED] ArtifactType} object.
+ *
+ * @param type the artifact type
+ * @return the artifact mapping
+ */
+ public static ArtifactType findType(String type)
+ {
+ ArtifactType result;
+
+ if (type == null)
+ {
+ result = null;
+ }
+ else if (type.equalsIgnoreCase("ejb"))
+ {
+ result = EJB;
+ }
else if (type.equalsIgnoreCase("plugin"))
{
result = PLUGIN;
}
- else
- {
- result = new ArtifactType(type, type);
- }
- return result;
- }
+ else
+ {
+ result = new ArtifactType(type, type);
+ }
+ return result;
+ }
}
1.41 +21 -21 maven/src/java/org/apache/maven/project/Dependency.java
Index: Dependency.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/project/Dependency.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- Dependency.java 5 Sep 2003 15:28:41 -0000 1.40
+++ Dependency.java 11 Sep 2003 13:03:56 -0000 1.41
@@ -304,29 +304,29 @@
*/
public String getType()
{
- String result = null;
-
- if (this.type != null)
- {
- result = this.type.getType();
- }
+ String result = null;
+
+ if (this.type != null)
+ {
+ result = this.type.getType();
+ }
return result;
}
- /**
- * @return dependency extension such as "jar", "war", etc.
- */
- public String getExtension()
- {
- String result = null;
-
- if (this.type != null)
- {
- result = this.type.getExtension();
- }
- return result;
- }
-
+ /**
+ * @return dependency extension such as "jar", "war", etc.
+ */
+ public String getExtension()
+ {
+ String result = null;
+
+ if (this.type != null)
+ {
+ result = this.type.getExtension();
+ }
+ return result;
+ }
+
/**
* Sets the dependency type such as "jar" or "war"
*
1.13 +19 -19 maven/src/java/org/apache/maven/project/Resource.java
Index: Resource.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/project/Resource.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Resource.java 5 Sep 2003 15:28:42 -0000 1.12
+++ Resource.java 11 Sep 2003 13:03:56 -0000 1.13
@@ -84,10 +84,10 @@
/** Exclude patterns. */
private List excludes = new ArrayList();
- /**
- * Is filtering on?
- */
- private boolean isFiltering = false;
+ /**
+ * Is filtering on?
+ */
+ private boolean isFiltering = false;
/**
* Add an include pattern.
@@ -174,21 +174,21 @@
return "[dir = " + this.dir + "]";
}
- /**
- * @param isFiltering specifies whether filtering is active or not
- */
- public void setFiltering( boolean isFiltering )
- {
- this.isFiltering = isFiltering;
- }
-
- /**
- * @return whether filtering is on or off
- */
- public boolean getFiltering()
- {
- return this.isFiltering;
- }
+ /**
+ * @param isFiltering specifies whether filtering is active or not
+ */
+ public void setFiltering( boolean isFiltering )
+ {
+ this.isFiltering = isFiltering;
+ }
+
+ /**
+ * @return whether filtering is on or off
+ */
+ public boolean getFiltering()
+ {
+ return this.isFiltering;
+ }
/**
* Resolve directory against a base directory if it is not already absolute.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
