perfsonar-dev - perfsonar: r5171 - in branches/new-structure-with-base2/ps-mdm-ls: ant conf resources/axis2-1.4.1/conf
Subject: perfsonar development work
List archive
perfsonar: r5171 - in branches/new-structure-with-base2/ps-mdm-ls: ant conf resources/axis2-1.4.1/conf
Chronological Thread
- From:
- To:
- Subject: perfsonar: r5171 - in branches/new-structure-with-base2/ps-mdm-ls: ant conf resources/axis2-1.4.1/conf
- Date: Fri, 5 Jun 2009 05:20:52 -0400
Author: trzaszcz
Date: 2009-06-05 05:20:51 -0400 (Fri, 05 Jun 2009)
New Revision: 5171
Modified:
branches/new-structure-with-base2/ps-mdm-ls/ant/build.xml
branches/new-structure-with-base2/ps-mdm-ls/ant/server.properties
branches/new-structure-with-base2/ps-mdm-ls/conf/configuration.xml
branches/new-structure-with-base2/ps-mdm-ls/resources/axis2-1.4.1/conf/axis2.xml
Log:
scripts enhancement
Modified: branches/new-structure-with-base2/ps-mdm-ls/ant/build.xml
===================================================================
--- branches/new-structure-with-base2/ps-mdm-ls/ant/build.xml 2009-06-04
14:15:46 UTC (rev 5170)
+++ branches/new-structure-with-base2/ps-mdm-ls/ant/build.xml 2009-06-05
09:20:51 UTC (rev 5171)
@@ -102,7 +102,8 @@
<target name="clean">
<delete dir="${build.dir}/classes"/>
- <delete>
+ <delete dir="${build.dir}/temp"/>
+ <delete includeemptydirs="true">
<fileset dir="${build.dir}">
<include name="*.aar"/>
<include name="*.war"/>
@@ -169,16 +170,6 @@
<exclude name="**/temp/**"/>
</fileset>
</copy>
- <!--
- <echo>configuration files</echo>
- <mkdir dir="${temp}/WEB-INF/classes/perfsonar/conf"/>
- <copy todir="${temp}/WEB-INF/classes/perfsonar/conf/">
- <fileset dir="conf">
- <include name="configuration.xml"/>
- <include name="configuration-rules.xml"/>
- </fileset>
- </copy>
- -->
</target>
@@ -231,13 +222,39 @@
<include name="axis2-web/**" />
</fileset>
</war>
- <!--
+
+ <delete dir="${build.dir}/classes/" />
<delete dir="${temp}" />
- -->
+
+ <echo>war created</echo>
+
</target>
+ <target name="create.aar" depends="compile">
+
+ <copy toDir="${build.dir}/classes" failonerror="false">
+ <fileset dir="${basedir}/conf/axis2">
+ <include name="**/*.xml"/>
+ </fileset>
+ </copy>
+
+ <mkdir dir="${build.dir}/classes/lib"/>
+
+ <copy toDir="${build.dir}/classes/lib" flatten="true">
+ <fileset dir="${lib.dir}/repository">
+ <include name="**/*.jar" />
+ </fileset>
+ </copy>
+ <jar destfile="${build.dir}/${jar.name}.aar"
basedir="${build.dir}/classes" />
+
+ <delete dir="${build.dir}/classes" />
+
+ <echo>aar created</echo>
+
+ <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" />
+ </target>
-
<target name="build.base2">
<ant antfile="../ps-mdm-base2/ant/build.xml"
target="create.base2" inheritrefs="false" inheritall="false"/>
<echo message=" base2.jar created"/>
@@ -276,19 +293,4 @@
<echo message=" ${war.name}.war and ${war.name} folder
deleted from tomcat webapps"/>
</target>
- <!-- AXIS -->
-
- <target name="axis.start">
- <exec executable="xterm" spawn="true" dir="${axis.dir}/bin/">
- <arg line=" -hold -e "/>
- <arg line=" sh axis2server.sh "/>
- </exec>
- <echo message="axis is running"/>
- </target>
-
- <target name="axis.deploy">
- <copy todir="${axis.dir}/repository/services/"
file="build/${war.name}.aar"/>
- </target>
-
-
</project>
\ No newline at end of file
Modified: branches/new-structure-with-base2/ps-mdm-ls/ant/server.properties
===================================================================
--- branches/new-structure-with-base2/ps-mdm-ls/ant/server.properties
2009-06-04 14:15:46 UTC (rev 5170)
+++ branches/new-structure-with-base2/ps-mdm-ls/ant/server.properties
2009-06-05 09:20:51 UTC (rev 5171)
@@ -1,2 +1,2 @@
tomcat.dir=/usr/local/tomcat/
-axis.dir=/home/czacha/workspace/ls2/new-structure-with-base2/ps-mdm-ls/resources/axis2-1.4.1
\ No newline at end of file
+axis.dir=/home/czacha/workspace/ls2/new-structure-with-base2/ps-mdm-ls/contrib/axis2-1.4.1
\ No newline at end of file
Modified: branches/new-structure-with-base2/ps-mdm-ls/conf/configuration.xml
===================================================================
--- branches/new-structure-with-base2/ps-mdm-ls/conf/configuration.xml
2009-06-04 14:15:46 UTC (rev 5170)
+++ branches/new-structure-with-base2/ps-mdm-ls/conf/configuration.xml
2009-06-05 09:20:51 UTC (rev 5171)
@@ -13,8 +13,8 @@
<lookupInformation>
<option name="accessPoint"
value="http://localhost:8080/axis2/services/xmlls"/>
- <option name="name" value="Geant2 Java XML LS 2.0"/>
- <option name="type" value="LS"/>
+ <option name="serviceName" value="Geant2 Java XML LS 2.0"/>
+ <option name="serviceType" value="LS"/>
</lookupInformation>
<!--
....................................................................................
-->
@@ -85,7 +85,7 @@
className="org.perfsonar.base2.service.storage.xml.XMLDBComponent">
<option name="dataStorageClassName"
value="org.perfsonar.base2.service.storage.xml.exist.ExistHTTPDataStorage"/>
- <option name="uri"
value="http://localhost:8680/exist/rest/db/ls"/>
+ <option name="uri"
value="http://localhost:8080/exist/rest/db/ls"/>
<option name="username" value="lookupservice"/>
<option name="password" value="sonar"/>
</component>
@@ -120,12 +120,12 @@
<option name="registerDataSource"
value="org.perfsonar.service.lookupservice.registration.LSSummaryRegisterDataSource"/>
<option name="registerEventType"
-
value="http://ogf.org/ns/nmwg/tools/org/perfsonar/service/lookup/registration/summary/2.0"/>
+
value="http://ogf.org/ns/nmwg/tools/org/perfsonar/service/lookup/registration/service/2.0"/>
<option name="registrator"
value="org.perfsonar.base2.service.registration.GenericLSRegistrator"/>
<option name="lsAddress-1"
- value="http://localhost:8080/axis2/services/xmlls"/>
+
value="http://localhost:8080/ps-mdm-ls/services/LookupService"/>
<option name="keyRefresh" value="0"/>
</action>
Modified:
branches/new-structure-with-base2/ps-mdm-ls/resources/axis2-1.4.1/conf/axis2.xml
===================================================================
---
branches/new-structure-with-base2/ps-mdm-ls/resources/axis2-1.4.1/conf/axis2.xml
2009-06-04 14:15:46 UTC (rev 5170)
+++
branches/new-structure-with-base2/ps-mdm-ls/resources/axis2-1.4.1/conf/axis2.xml
2009-06-05 09:20:51 UTC (rev 5171)
@@ -347,8 +347,20 @@
<!-- Global Modules -->
<!-- ================================================= -->
<!-- Comment this to disable Addressing -->
- <module ref="addressing"/>
+
+ <!--
+
+ If this module is used, in envelope header is included ws-addreasing
elements,
+ wsa:to wsa:messageId wsa:action which must be correct set. If you
don't want to use this elements, comment this module.
+ If the module is used and this header elements are not correct
setted, the exception is thrown.
+ In axis stand-alone server this module don't cause any problems.
Problems occures in tomcat.
+ -->
+
+ <!--
+ <module ref="addressing"/>
+ -->
+
<!--Configuring module , providing parameters for modules whether they
refer or not-->
<!--<moduleConfig name="addressing">-->
<!--<parameter name="addressingPara">N/A</parameter>-->
- perfsonar: r5171 - in branches/new-structure-with-base2/ps-mdm-ls: ant conf resources/axis2-1.4.1/conf, svnlog, 06/05/2009
Archive powered by MHonArc 2.6.16.