You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cactus-dev@jakarta.apache.org by cm...@apache.org on 2003/05/14 12:56:46 UTC

cvs commit: jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/deployment WebXml.java

cmlenz      2003/05/14 03:56:46

  Modified:    integration/ant/src/java/org/apache/cactus/integration/ant/util
                        ResourceUtils.java
               integration/ant/src/test/org/apache/cactus/integration/ant
                        TestAll.java
               integration/ant/src/java/org/apache/cactus/integration/ant
                        CactusTask.java
               integration/ant/src/java/org/apache/cactus/integration/ant/deployment
                        WebXml.java
  Log:
  Fix checkstyle violations
  
  Revision  Changes    Path
  1.7       +2 -1      jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/util/ResourceUtils.java
  
  Index: ResourceUtils.java
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/util/ResourceUtils.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ResourceUtils.java	13 May 2003 22:08:50 -0000	1.6
  +++ ResourceUtils.java	14 May 2003 10:56:45 -0000	1.7
  @@ -220,6 +220,7 @@
        * @param theResourceName The name of the resource
        * @return An input stream containing the specified resource, or
        *         <code>null</code> if the resource was not found in the JAR
  +     * @throws IOException If an I/O error occurs
        */
       public static InputStream getResource(JarInputStream theJar,
           String theResourceName)
  
  
  
  1.5       +3 -2      jakarta-cactus/integration/ant/src/test/org/apache/cactus/integration/ant/TestAll.java
  
  Index: TestAll.java
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/integration/ant/src/test/org/apache/cactus/integration/ant/TestAll.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- TestAll.java	14 May 2003 10:47:07 -0000	1.4
  +++ TestAll.java	14 May 2003 10:56:45 -0000	1.5
  @@ -100,7 +100,8 @@
   
           suite.addTest(
               org.apache.cactus.integration.ant.container.TestAll.suite());
  -        suite.addTest(org.apache.cactus.integration.ant.deployment.TestAll.suite());
  +        suite.addTest(
  +            org.apache.cactus.integration.ant.deployment.TestAll.suite());
   
           suite.addTestSuite(TestCactifyWarTask.class);
           suite.addTestSuite(TestCactusTask.class);
  
  
  
  1.13      +3 -2      jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/CactusTask.java
  
  Index: CactusTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/CactusTask.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- CactusTask.java	14 May 2003 10:44:53 -0000	1.12
  +++ CactusTask.java	14 May 2003 10:56:45 -0000	1.13
  @@ -650,7 +650,8 @@
       private JarInputStream getTestWar(File theEarFile)
       {
           JarInputStream ear = null;
  -        try {
  +        try
  +        {
               ear = new JarInputStream(new FileInputStream(theEarFile));
               ApplicationXml applicationXml =
                   ApplicationXmlIo.parseApplicationXmlFromEar(ear, null);
  
  
  
  1.2       +2 -2      jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/deployment/WebXml.java
  
  Index: WebXml.java
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/deployment/WebXml.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- WebXml.java	14 May 2003 10:43:36 -0000	1.1
  +++ WebXml.java	14 May 2003 10:56:45 -0000	1.2
  @@ -153,7 +153,7 @@
       /**
        * Returns the servlet API version.
        * 
  -     * @return The version.
  +     * @return The version
        */
       public final WebXmlVersion getVersion()
       {
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cactus-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: cactus-dev-help@jakarta.apache.org