perfsonar-dev - perfsonar: r5047 - in branches/new-structure-with-base2/ps-mdm-rrd-ma: . ant conf

Subject: perfsonar development work

List archive

perfsonar: r5047 - in branches/new-structure-with-base2/ps-mdm-rrd-ma: . ant conf

From:
To:
Subject: perfsonar: r5047 - in branches/new-structure-with-base2/ps-mdm-rrd-ma: . ant conf
Date: Tue, 10 Mar 2009 07:27:38 -0400

Author: roman
Date: 2009-03-10 07:27:37 -0400 (Tue, 10 Mar 2009)
New Revision: 5047

Removed:

branches/new-structure-with-base2/ps-mdm-rrd-ma/conf/configuration-rules.xml
Modified:

branches/new-structure-with-base2/ps-mdm-rrd-ma/ant/build-simple-testing.xml
branches/new-structure-with-base2/ps-mdm-rrd-ma/ant/build.xml
branches/new-structure-with-base2/ps-mdm-rrd-ma/conf/
branches/new-structure-with-base2/ps-mdm-rrd-ma/pom.xml
Log:
configuration-rules.xml is now linked from ps-mdm-base2 conf directory

Modified:
branches/new-structure-with-base2/ps-mdm-rrd-ma/ant/build-simple-testing.xml
===================================================================
---
branches/new-structure-with-base2/ps-mdm-rrd-ma/ant/build-simple-testing.xml
2009-03-09 15:14:08 UTC (rev 5046)
+++
branches/new-structure-with-base2/ps-mdm-rrd-ma/ant/build-simple-testing.xml
2009-03-10 11:27:37 UTC (rev 5047)
@@ -185,11 +185,11 @@
</fileset>
</copy>

- <copy file="${build.dir}/${jar.name}.aar"
todir="${temp}/WEB-INF/services" />
- <copy file="${basedir}/conf/${config.file.name}"
tofile="${temp}/WEB-INF/classes/perfsonar/conf/configuration.xml" />
- <copy file="${basedir}/conf/configuration-rules.xml"
todir="${temp}/WEB-INF/classes/perfsonar/conf" />
- 
- 
+ <copy file="${build.dir}/${jar.name}.aar"
todir="${temp}/WEB-INF/services" />
+ <copy file="${basedir}/conf/${config.file.name}"
tofile="${temp}/WEB-INF/classes/perfsonar/conf/configuration.xml" />
+ <copy file="${basedir}/conf/base2/configuration-rules.xml"
todir="${temp}/WEB-INF/classes/perfsonar/conf" />
+ 
+ 

<path id="services.archives">
<fileset dir="${temp}/WEB-INF/services">
@@ -337,8 +337,8 @@

<mkdir dir="${build.dir}/perfsonar" />
<mkdir dir="${build.dir}/perfsonar/conf" />
- <copy file="${basedir}/conf/${config.file.name}"
tofile="${build.dir}/perfsonar/conf/configuration.xml"/>
- <copy file="${basedir}/conf/configuration-rules.xml"
todir="${build.dir}/perfsonar/conf"/>
+ <copy file="${basedir}/conf/${config.file.name}"
tofile="${build.dir}/perfsonar/conf/configuration.xml"/>
+ <copy file="${basedir}/conf/base2/configuration-rules.xml"
todir="${build.dir}/perfsonar/conf"/>

<copy file="${basedir}/conf/log4j.xml" todir="${axis.dir}"/>

Modified: branches/new-structure-with-base2/ps-mdm-rrd-ma/ant/build.xml
===================================================================
--- branches/new-structure-with-base2/ps-mdm-rrd-ma/ant/build.xml
2009-03-09 15:14:08 UTC (rev 5046)
+++ branches/new-structure-with-base2/ps-mdm-rrd-ma/ant/build.xml
2009-03-10 11:27:37 UTC (rev 5047)
@@ -182,11 +182,11 @@
</fileset>
</copy>

- <copy file="${build.dir}/${jar.name}.aar"
todir="${temp}/WEB-INF/services" />
- <copy file="${basedir}/conf/${config.file.name}"
tofile="${temp}/WEB-INF/classes/perfsonar/conf/configuration.xml" />
- <copy file="${basedir}/conf/configuration-rules.xml"
todir="${temp}/WEB-INF/classes/perfsonar/conf" />
- <copy file="${basedir}/conf/log4j.properties"
todir="${temp}/WEB-INF/classes" />
- <copy file="${basedir}/conf/log4j.xml"
todir="${temp}/WEB-INF/classes" />
+ <copy file="${build.dir}/${jar.name}.aar"
todir="${temp}/WEB-INF/services" />
+ <copy file="${basedir}/conf/${config.file.name}"
tofile="${temp}/WEB-INF/classes/perfsonar/conf/configuration.xml" />
+ <copy file="${basedir}/conf/base2/configuration-rules.xml"
todir="${temp}/WEB-INF/classes/perfsonar/conf" />
+ <copy file="${basedir}/conf/log4j.properties"
todir="${temp}/WEB-INF/classes" />
+ <copy file="${basedir}/conf/log4j.xml"
todir="${temp}/WEB-INF/classes" />

<path id="services.archives">
<fileset dir="${temp}/WEB-INF/services">

Property changes on: branches/new-structure-with-base2/ps-mdm-rrd-ma/conf
___________________________________________________________________
Name: svn:externals
+ base2 -r5046
https://svn.perfsonar.net/svn/perfsonar/branches/new-structure-with-base2/ps-mdm-base2/conf/

Deleted:
branches/new-structure-with-base2/ps-mdm-rrd-ma/conf/configuration-rules.xml

Modified: branches/new-structure-with-base2/ps-mdm-rrd-ma/pom.xml
===================================================================
--- branches/new-structure-with-base2/ps-mdm-rrd-ma/pom.xml 2009-03-09
15:14:08 UTC (rev 5046)
+++ branches/new-structure-with-base2/ps-mdm-rrd-ma/pom.xml 2009-03-10
11:27:37 UTC (rev 5047)
@@ -77,9 +77,9 @@
<configuration>
<tasks>
<delete dir="${basedir}/conf/tmp" failonerror="false"/>
- <copy file="${basedir}/conf/${configurationFile}"
todir="${basedir}/conf/tmp"/>
- <move file="${basedir}/conf/tmp/${configurationFile}"
tofile="${basedir}/conf/tmp/configuration.xml"/>
- <copy file="${basedir}/conf/configuration-rules.xml"
todir="${basedir}/conf/tmp"/>
+ <copy file="${basedir}/conf/base2/configuration-rules.xml"
todir="${basedir}/conf/tmp"/>
+ <copy file="${basedir}/conf/${configurationFile}"
todir="${basedir}/conf/tmp"/>
+ <move file="${basedir}/conf/tmp/${configurationFile}"
tofile="${basedir}/conf/tmp/configuration.xml"/>
<!--
<copy file="${basedir}/conf/as/perfSONARtruststore.jks"
todir="${basedir}/conf/tmp"/>
<copy file="${basedir}/conf/as/ASValidComponentsFile"
todir="${basedir}/conf/tmp"/>
@@ -157,8 +157,8 @@
<resource>
<directory>${basedir}/conf</directory>
<includes>
- <include>**/log4j.xml</include>
- <include>**/log4j.properties</include>
+ <include>log4j.xml</include>
+ <include>log4j.properties</include>
</includes>
<targetPath>WEB-INF/classes</targetPath>
</resource>

perfsonar: r5047 - in branches/new-structure-with-base2/ps-mdm-rrd-ma: . ant conf, svnlog, 03/10/2009

List archive

perfsonar: r5047 - in branches/new-structure-with-base2/ps-mdm-rrd-ma: . ant conf