geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r420384 - in /geronimo/sandbox/svkmerge/m2migration/modules: tomcat-builder/ tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/ transaction/src/test/org/apache/geronimo/transaction/log/
Date Mon, 10 Jul 2006 00:47:05 GMT
Author: jdillon
Date: Sun Jul  9 17:47:05 2006
New Revision: 420384

URL: http://svn.apache.org/viewvc?rev=420384&view=rev
Log:
Minor cleanup; remove System.*.println() and comment about other removals

Modified:
    geronimo/sandbox/svkmerge/m2migration/modules/tomcat-builder/pom.xml
    geronimo/sandbox/svkmerge/m2migration/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/PlanParsingTest.java
    geronimo/sandbox/svkmerge/m2migration/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
    geronimo/sandbox/svkmerge/m2migration/modules/transaction/src/test/org/apache/geronimo/transaction/log/AbstractLogTest.java

Modified: geronimo/sandbox/svkmerge/m2migration/modules/tomcat-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/tomcat-builder/pom.xml?rev=420384&r1=420383&r2=420384&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/tomcat-builder/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/tomcat-builder/pom.xml Sun Jul  9 17:47:05
2006
@@ -179,18 +179,18 @@
                         </goals>
                         <configuration>
                             <tasks>
-                                <copy todir="${buildDir}/var/catalina/conf" file="src/var/web.xml"
/>
+                                <copy todir="${buildDir}/var/catalina/conf" file="src/var/web.xml"/>
                                 <copy todir="${buildDir}/var/catalina/webapps">
                                     <fileset dir="src/test-resources/deployables">
-                                        <include name="war1/**" />
-                                        <include name="war3/**" />
-                                        <include name="war4/**" />
+                                        <include name="war1/**"/>
+                                        <include name="war3/**"/>
+                                        <include name="war4/**"/>
                                     </fileset>
                                 </copy>
                                 <copy todir="${endorsedDir}" flatten="true">
                                     <fileset dir="${localRepoDir}">
-                                        <include name="xerces/xercesImpl/${xercesVersion}/*.jar"
/>
-                                        <include name="xml-apis/xml-apis/${xmlApisVersion}/*.jar"
/>
+                                        <include name="xerces/xercesImpl/${xercesVersion}/*.jar"/>
+                                        <include name="xml-apis/xml-apis/${xmlApisVersion}/*.jar"/>
                                     </fileset>
                                 </copy>
                             </tasks>

Modified: geronimo/sandbox/svkmerge/m2migration/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/PlanParsingTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/PlanParsingTest.java?rev=420384&r1=420383&r2=420384&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/PlanParsingTest.java
(original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/PlanParsingTest.java
Sun Jul  9 17:47:05 2006
@@ -58,7 +58,6 @@
         ref.setResourceLink("target");
 
         SchemaConversionUtils.validateDD(tomcatWebAppType);
-//        System.out.println(tomcatWebAppType.toString());
     }
 
 }

Modified: geronimo/sandbox/svkmerge/m2migration/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java?rev=420384&r1=420383&r2=420384&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
(original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
Sun Jul  9 17:47:05 2006
@@ -140,8 +140,7 @@
     }
 
     private WebModuleInfo deployWar(String warName) throws Exception {
-        File outputPath = new File(basedir,
-                "target/test-resources/deployables/" + warName);
+        File outputPath = new File(basedir, "target/test-resources/deployables/" + warName);
         recursiveDelete(outputPath);
         outputPath.mkdirs();
         File path = new File(basedir, "src/test-resources/deployables/" + warName);

Modified: geronimo/sandbox/svkmerge/m2migration/modules/transaction/src/test/org/apache/geronimo/transaction/log/AbstractLogTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/transaction/src/test/org/apache/geronimo/transaction/log/AbstractLogTest.java?rev=420384&r1=420383&r2=420384&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/transaction/src/test/org/apache/geronimo/transaction/log/AbstractLogTest.java
(original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/transaction/src/test/org/apache/geronimo/transaction/log/AbstractLogTest.java
Sun Jul  9 17:47:05 2006
@@ -139,6 +139,10 @@
                         }
                         localDuration = System.currentTimeMillis() - localStartTime;
                     } catch (Exception e) {
+                        //
+                        // FIXME: Remove System.err usage
+                        //
+                        
                         System.err.println(Thread.currentThread().getName());
                         e.printStackTrace(System.err);
                         exception = true;



Mime
View raw message