You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2012/07/11 10:12:59 UTC

svn commit: r1360052 - in /incubator/openmeetings/trunk/singlewebapp: WebContent/WEB-INF/services/ WebContent/openmeetings/WEB-INF/services/services.list build.xml

Author: solomax
Date: Wed Jul 11 08:12:59 2012
New Revision: 1360052

URL: http://svn.apache.org/viewvc?rev=1360052&view=rev
Log:
RAT output improved (almost everything cleaned up)

Removed:
    incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/services/
    incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/WEB-INF/services/services.list
Modified:
    incubator/openmeetings/trunk/singlewebapp/build.xml

Modified: incubator/openmeetings/trunk/singlewebapp/build.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/build.xml?rev=1360052&r1=1360051&r2=1360052&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/build.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/build.xml Wed Jul 11 08:12:59 2012
@@ -298,7 +298,9 @@
 		</jar>
 
 		<!-- Build WebServices -->
-		<jar destfile="${dist.webapps.dir}/WEB-INF/services/${project.distname}-${jar.suffix}.aar">
+		<property name="om_aar_name" value="${project.distname}-${jar.suffix}.aar"/>
+		<property name="om_aar_folder" value="${dist.webapps.dir}/WEB-INF/services"/>
+		<jar destfile="${om_aar_folder}/${om_aar_name}">
 			<fileset dir="src/">
 				<include name="META-INF/services.xml" />
 			</fileset>
@@ -307,6 +309,7 @@
 				<include name="META-INF/NOTICE" />
 			</fileset>
 		</jar>
+		<echo file="${om_aar_folder}/services.list" append="false">${om_aar_name}${line.separator}version.aar${line.separator}</echo>
 		<jar destfile="${dist.webapps.dir}/WEB-INF/lib/${project.distname}-WebService-${jar.suffix}.jar">
 			<fileset dir="${main.out.dir}">
 				<include name="**/openmeetings/axis/**" />