perfsonar development work

Author: trzaszcz
Date: 2009-12-07 08:21:34 -0500 (Mon, 07 Dec 2009)
New Revision: 5378

Modified:
   branches/new-structure-with-base2/ps-mdm-ls/ant/build.xml
   branches/new-structure-with-base2/ps-mdm-ls/pom.xml
Log:
build directory removed, enhancement of pom.xml script

Modified: branches/new-structure-with-base2/ps-mdm-ls/ant/build.xml
===================================================================
--- branches/new-structure-with-base2/ps-mdm-ls/ant/build.xml   2009-12-07 
12:50:58 UTC (rev 5377)
+++ branches/new-structure-with-base2/ps-mdm-ls/ant/build.xml   2009-12-07 
13:21:34 UTC (rev 5378)
@@ -83,7 +83,7 @@
     <!-- ======================= create.library =================== -->
 
 
-    <property name="build.dir"    value="${basedir}/build"/>
+    <property name="build.dir"    value="${basedir}/target"/>
     <property name="lib.dir"      value="${basedir}/lib"/>
 
     <property name="jar.name"     value="ps-mdm-ls"/>

Modified: branches/new-structure-with-base2/ps-mdm-ls/pom.xml
===================================================================
--- branches/new-structure-with-base2/ps-mdm-ls/pom.xml 2009-12-07 12:50:58 
UTC (rev 5377)
+++ branches/new-structure-with-base2/ps-mdm-ls/pom.xml 2009-12-07 13:21:34 
UTC (rev 5378)
@@ -30,7 +30,7 @@
                <testSourceDirectory>${basedir}/src/test/java
                </testSourceDirectory>
                <outputDirectory>${basedir}/bin</outputDirectory>
-               <directory>${basedir}/build</directory>
+               <directory>${basedir}/target</directory>
                <finalName>${packageName}</finalName>
 
                <plugins>
@@ -66,9 +66,8 @@
                                                                        
</fileset>
                                                                </copy>
                                                                <mkdir 
dir="${project.build.directory}" />
-                                                               <jar 
destfile="${basedir}/build/${aar.name}.aar">
-                                                                       
<fileset includes="**/PerfsonarService.class **/services.xml"
-                                                                             
  dir="${basedir}/bin" />
+                                                               <jar 
destfile="${project.build.directory}/${aar.name}.aar">
+                                                                       
<fileset includes="**/services.xml" dir="${basedir}/bin" />
                                                                </jar>
                                                        </tasks>
                                                </configuration>
@@ -100,7 +99,7 @@
                                                        
<targetPath>db</targetPath>
                                                </resource>
                                                <resource>
-                                                       
<directory>${basedir}/build</directory>
+                                                       
<directory>${project.build.directory}</directory>
                                                        <includes>
                                                                
<include>**/*.aar</include>
                                                        </includes>