svn commit: r1516817 - in /openmeetings/trunk/singlewebapp: build.properties build.xml

[so...@apache.org]

Author: solomax
Date: Fri Aug 23 10:41:39 2013
New Revision: 1516817

URL: http://svn.apache.org/r1516817
Log:
[OPENMEETINGS-772] project is restructured

Modified:
    openmeetings/trunk/singlewebapp/build.properties
    openmeetings/trunk/singlewebapp/build.xml

Modified: openmeetings/trunk/singlewebapp/build.properties
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/build.properties?rev=1516817&r1=1516816&r2=1516817&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/build.properties (original)
+++ openmeetings/trunk/singlewebapp/build.properties Fri Aug 23 10:41:39 2013
@@ -11,6 +11,7 @@
 #   limitations under the License.
 project.version=3.0.0
 project.status=SNAPSHOT
+project.distname=openmeetings
 ivy.install.version=2.3.0
 maven.version=3.0.4
 red5.server.revision=4639

Modified: openmeetings/trunk/singlewebapp/build.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/build.xml?rev=1516817&r1=1516816&r2=1516817&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/build.xml (original)
+++ openmeetings/trunk/singlewebapp/build.xml Fri Aug 23 10:41:39 2013
@@ -223,10 +223,13 @@
 	</target>
 	
 	<target name="web.copy" depends="-process-db">
-		<filter token="wicket.mode" value="${wicket.mode}" />
-		<copy todir="${dist.webapps.dir}" filtering="true" overwrite="true" force="true">
+		<copy todir="${dist.webapps.dir}" overwrite="true" force="true">
 			<fileset dir="${webapp.dir}" />
 		</copy>
+		<filter token="wicket.mode" value="${wicket.mode}" />
+		<copy todir="${dist.webapps.dir}/WEB-INF" filtering="true" overwrite="true" force="true">
+			<fileset file="${webapp.dir}/WEB-INF/web.xml" />
+		</copy>
 		<copy todir="${dist.classes.dir}">
 			<fileset dir="${main.out.dir}">
 				<include name="**/*.html" />