dion 2002/07/14 09:12:10
Modified: src/java/org/apache/maven/j2ee WarValidator.java
WarFile.java WarClassLoader.java
ValidationFormatter.java
Log:
Style violations
Revision Changes Path
1.25 +9 -9
jakarta-turbine-maven/src/java/org/apache/maven/j2ee/WarValidator.java
Index: WarValidator.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/j2ee/WarValidator.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- WarValidator.java 16 Jun 2002 17:01:44 -0000 1.24
+++ WarValidator.java 14 Jul 2002 16:12:10 -0000 1.25
@@ -147,8 +147,8 @@
validate();
if (getStatus().isError() && isFailOnError())
{
- throw new BuildException("Errors occurred during validation. " +
- "Messages should have been provided");
+ throw new BuildException("Errors occurred during validation. "
+ + "Messages should have been provided");
}
}
@@ -235,8 +235,8 @@
}
catch (IOException ioe)
{
- error("Error opening war file for web.xml - possibly missing " +
- "manifest");
+ error("Error opening war file for web.xml - possibly missing "
+ + "manifest");
}
}
@@ -287,8 +287,8 @@
{
entry = (Map.Entry) entries.next();
String jspFile = (String) entry.getValue();
- info("validating servlet name: " + entry.getKey() +
- " jsp file: " + jspFile);
+ info("validating servlet name: " + entry.getKey()
+ + " jsp file: " + jspFile);
if (!war.hasFile(jspFile))
{
@@ -400,8 +400,8 @@
}
if (!war.hasFile(config.getErrorPage()))
{
- error("<form-config-login> error-page location: '" +
- config.getErrorPage() + "' not found");
+ error("<form-config-login> error-page location: '"
+ + config.getErrorPage() + "' not found");
}
}
}
1.10 +3 -3
jakarta-turbine-maven/src/java/org/apache/maven/j2ee/WarFile.java
Index: WarFile.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/j2ee/WarFile.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- WarFile.java 17 Jun 2002 16:13:53 -0000 1.9
+++ WarFile.java 14 Jul 2002 16:12:10 -0000 1.10
@@ -278,8 +278,8 @@
while (entries.hasMoreElements())
{
entry = (JarEntry) entries.nextElement();
- if (entry.getName().startsWith("WEB-INF/lib/") &&
- entry.getName().toLowerCase().endsWith(".jar"))
+ if (entry.getName().startsWith("WEB-INF/lib/")
+ && entry.getName().toLowerCase().endsWith(".jar"))
{
libs.add(entry);
}
1.5 +3 -3
jakarta-turbine-maven/src/java/org/apache/maven/j2ee/WarClassLoader.java
Index: WarClassLoader.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/j2ee/WarClassLoader.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- WarClassLoader.java 27 May 2002 12:30:12 -0000 1.4
+++ WarClassLoader.java 14 Jul 2002 16:12:10 -0000 1.5
@@ -120,8 +120,8 @@
private void addURLs() throws IOException, MalformedURLException
{
File warFile = new File(war.getName());
- URL webInfClasses = new URL("jar:" + warFile.toURL() + "!/" +
- "WEB-INF/classes/");
+ URL webInfClasses = new URL("jar:" + warFile.toURL() + "!/"
+ + "WEB-INF/classes/");
addURL(webInfClasses);
Set jars = war.getLibEntries();
JarEntry entry = null;
1.8 +3 -3
jakarta-turbine-maven/src/java/org/apache/maven/j2ee/ValidationFormatter.java
Index: ValidationFormatter.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/j2ee/ValidationFormatter.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ValidationFormatter.java 27 May 2002 12:30:12 -0000 1.7
+++ ValidationFormatter.java 14 Jul 2002 16:12:10 -0000 1.8
@@ -124,8 +124,8 @@
*/
private void printEvent(String type, ValidationEvent event)
{
- getStream().println(event.getSubject() + " " + type + ": " +
- event.getMessage());
+ getStream().println(event.getSubject() + " " + type + ": "
+ + event.getMessage());
}
/**
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
