[wsas-java-dev] svn commit r6129 - in trunk/wsas/java/modules: admin core core/src/org/wso2/wsas core/test/org/wso2/wsas integration

[svn at wso2.org]

Author: saminda
Date: Mon Aug  6 02:54:49 2007
New Revision: 6129

Modified:
   trunk/wsas/java/modules/admin/pom.xml
   trunk/wsas/java/modules/core/pom.xml
   trunk/wsas/java/modules/core/src/org/wso2/wsas/Main.java
   trunk/wsas/java/modules/core/test/org/wso2/wsas/TomcatServerTest.java
   trunk/wsas/java/modules/integration/pom.xml
Log:
Added log4j.properties file as a log file 


Modified: trunk/wsas/java/modules/admin/pom.xml
==============================================================================
--- trunk/wsas/java/modules/admin/pom.xml	(original)
+++ trunk/wsas/java/modules/admin/pom.xml	Mon Aug  6 02:54:49 2007
@@ -103,6 +103,12 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <inherited>true</inherited>
                 <configuration>
+                    <systemProperties>
+                        <property>
+                            <name>log4j.configuration</name>
+                            <value>file:${basedir}/../core/conf/log4j.properties</value>
+                        </property>
+                    </systemProperties>
                     <forkMode>pertest</forkMode>
                     <argLine>-enableassertions</argLine>
                     <testFailureIgnore>false</testFailureIgnore>

Modified: trunk/wsas/java/modules/core/pom.xml
==============================================================================
--- trunk/wsas/java/modules/core/pom.xml	(original)
+++ trunk/wsas/java/modules/core/pom.xml	Mon Aug  6 02:54:49 2007
@@ -60,7 +60,7 @@
             <testResource>
                 <directory>conf</directory>
                 <includes>
-                    <include>**/*.properties</include>
+                    <include>**/wso2wsas.properties</include>
                 </includes>
             </testResource>
         </testResources>
@@ -90,6 +90,12 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <inherited>true</inherited>
                 <configuration>
+                    <systemProperties>
+                        <property>
+                            <name>log4j.configuration</name>
+                            <value>file:${basedir}/conf/log4j.properties</value>
+                        </property>
+                    </systemProperties>
                     <!--<forkMode>pertest</forkMode>-->
                     <argLine>-enableassertions</argLine>
                     <testFailureIgnore>false</testFailureIgnore>
@@ -97,7 +103,6 @@
                     <excludes>
                         <exclude>**/*Abstract*.java</exclude>
                         <exclude>**/*CryptoUtilTest*.java</exclude>
-                        <exclude>**/TomcatServerTest.java</exclude>
                     </excludes>
                     <includes>
                         <include>**/*Test.java</include>

Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/Main.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/Main.java	(original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/Main.java	Mon Aug  6 02:54:49 2007
@@ -76,14 +76,12 @@
 
 
     public void startServer() {
-        System.err.println("###### Gonna start listeners");
         try {
             webServer = new TomcatServer();
             webServer.start();
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
-        System.err.println("######DONE");
     }
 
     public void stop() throws IOException, ServerException {

Modified: trunk/wsas/java/modules/core/test/org/wso2/wsas/TomcatServerTest.java
==============================================================================
--- trunk/wsas/java/modules/core/test/org/wso2/wsas/TomcatServerTest.java	(original)
+++ trunk/wsas/java/modules/core/test/org/wso2/wsas/TomcatServerTest.java	Mon Aug  6 02:54:49 2007
@@ -45,9 +45,7 @@
                                    "target/tomcat_test/conf/server.xml");
 
                 ServerUtils serverUtils = new ServerUtils();
-                System.err.println("###### Gonna start server");
                 serverUtils.startServer();
-                System.err.println("####### Started server");
             }
 
             protected void tearDown() throws Exception {

Modified: trunk/wsas/java/modules/integration/pom.xml
==============================================================================
--- trunk/wsas/java/modules/integration/pom.xml	(original)
+++ trunk/wsas/java/modules/integration/pom.xml	Mon Aug  6 02:54:49 2007
@@ -142,6 +142,12 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <inherited>false</inherited>
                 <configuration>
+                    <systemProperties>
+                        <property>
+                            <name>log4j.configuration</name>
+                            <value>file:${basedir}/../core/conf/log4j.properties</value>
+                        </property>
+                    </systemProperties>
                     <forkMode>pertest</forkMode>
                     <argLine>-enableassertions</argLine>
                     <testFailureIgnore>false</testFailureIgnore>