[wsas-java-dev] svn commit r52 - in wsas/java/trunk/modules: admin admin/conf core integration integration/conf

[svn at wso2.com]

Author: azeez
Date: Thu Nov 30 23:05:19 2006
New Revision: 52

Modified:
   wsas/java/trunk/modules/admin/conf/derby.properties
   wsas/java/trunk/modules/admin/maven.xml
   wsas/java/trunk/modules/core/maven.xml
   wsas/java/trunk/modules/integration/conf/derby.properties
   wsas/java/trunk/modules/integration/maven.xml
Log:
Cleanup the relevant files

Modified: wsas/java/trunk/modules/admin/conf/derby.properties
==============================================================================
--- wsas/java/trunk/modules/admin/conf/derby.properties	(original)
+++ wsas/java/trunk/modules/admin/conf/derby.properties	Thu Nov 30 23:05:19 2006
@@ -14,4 +14,4 @@
 # limitations under the License.
 #
 
-derby.stream.error.file=../target/logs/wso2wsas-derby.log
\ No newline at end of file
+derby.stream.error.file=../logs/wso2wsas-derby.log
\ No newline at end of file

Modified: wsas/java/trunk/modules/admin/maven.xml
==============================================================================
--- wsas/java/trunk/modules/admin/maven.xml	(original)
+++ wsas/java/trunk/modules/admin/maven.xml	Thu Nov 30 23:05:19 2006
@@ -51,8 +51,6 @@
         <copy file="src/org/wso2/wsas/admin/service/META-INF/services.xml"
               tofile="target/toAdmin/service/META-INF/services.xml"/>
 
-        <!-- TODO -->
-
         <copy file="../wsf-common-core/src/org/wso2/wsf/common/codegen/service/META-INF/JavaClientGeneratorService.wsdl"
               tofile="target/toAdmin/service/META-INF/JavaClientGeneratorService.wsdl"/>
 
@@ -66,18 +64,6 @@
         <copy file="target/wso2wsas_admin-${wso2wsas.version}.mar"
               tofile="${maven.repo.local}/org.wso2.wsas/mars/wso2wsas_admin-${wso2wsas.version}.mar"/>
         <delete dir="target/toAdmin"/>
-
-        <!-- tracer module -->
-        <!--<property name="tracer.module.dir" value="target/msgmon/module"/>
-        <mkdir dir="${tracer.module.dir}/META-INF"/>
-        <copy tofile="${tracer.module.dir}/META-INF/module.xml"
-              file="src/org/wso2/wsas/admin/module/tracer/META-INF/module.xml"/>
-        <jar jarfile="target/tracer-${wso2wsas.version}.mar"
-             basedir="${tracer.module.dir}">
-            <include name="**"/>
-        </jar>
-        <copy file="target/tracer-${wso2wsas.version}.mar"
-              tofile="${maven.repo.local}/org.wso2.wsas/mars/tracer-${wso2wsas.version}.mar"/>-->
     </goal>
 
     <preGoal name="test:compile">
@@ -105,7 +91,6 @@
             <ant:fileset
                     file="${maven.repo.local}/org.apache.axis2/mars/addressing-${addressing.version}.mar"/>
         </ant:copy>
-
     </preGoal>
 
     <postGoal name="test:test">
@@ -114,4 +99,14 @@
         <delete dir="work"/>
         <delete file="resources/test-repository/modules/addressing-${addressing.version}.mar"/>
     </postGoal>
+
+    <postGoal name="jar:jar">
+        <delete dir="database"/>
+        <delete dir="logs"/>
+    </postGoal>
+
+    <postGoal name="clean">
+        <delete dir="database"/>
+        <delete dir="logs"/>
+    </postGoal>
 </project>

Modified: wsas/java/trunk/modules/core/maven.xml
==============================================================================
--- wsas/java/trunk/modules/core/maven.xml	(original)
+++ wsas/java/trunk/modules/core/maven.xml	Thu Nov 30 23:05:19 2006
@@ -103,7 +103,17 @@
     </postGoal>
 
     <postGoal name="test:test">
+        <delete dir="database"/>
         <delete dir="logs"/>
+    </postGoal>
+
+    <postGoal name="jar:jar">
         <delete dir="database"/>
+        <delete dir="logs"/>
+    </postGoal>
+    
+    <postGoal name="clean">
+        <delete dir="database"/>
+        <delete dir="logs"/>
     </postGoal>
 </project>
\ No newline at end of file

Modified: wsas/java/trunk/modules/integration/conf/derby.properties
==============================================================================
--- wsas/java/trunk/modules/integration/conf/derby.properties	(original)
+++ wsas/java/trunk/modules/integration/conf/derby.properties	Thu Nov 30 23:05:19 2006
@@ -14,4 +14,4 @@
 # limitations under the License.
 #
 
-derby.stream.error.file=../target/logs/wso2wsas-derby.log
\ No newline at end of file
+derby.stream.error.file=../logs/wso2wsas-derby.log
\ No newline at end of file

Modified: wsas/java/trunk/modules/integration/maven.xml
==============================================================================
--- wsas/java/trunk/modules/integration/maven.xml	(original)
+++ wsas/java/trunk/modules/integration/maven.xml	Thu Nov 30 23:05:19 2006
@@ -58,6 +58,15 @@
     <postGoal name="test:test">
         <delete dir="database"/>
         <delete dir="logs"/>
-        <delete dir="work"/>
+    </postGoal>
+
+    <postGoal name="jar:jar">
+        <delete dir="database"/>
+        <delete dir="logs"/>
+    </postGoal>
+    
+    <postGoal name="clean">
+        <delete dir="database"/>
+        <delete dir="logs"/>
     </postGoal>
 </project>
\ No newline at end of file