Author: sebawagner
Date: Thu Aug 9 07:51:20 2012
New Revision: 1371070
URL: http://svn.apache.org/viewvc?rev=1371070&view=rev
Log:
OPENMEETINGS-389 Drupal Plugin fix artefact output and LICENSE file in Root
directory
Added:
incubator/openmeetings/trunk/plugins/drupal/CHANGELOG
- copied unchanged from r1370713,
incubator/openmeetings/trunk/plugins/drupal/sites/all/modules/openmeetings/CHANGELOG
incubator/openmeetings/trunk/plugins/drupal/DISCLAIMER
- copied unchanged from r1370713,
incubator/openmeetings/trunk/plugins/drupal/sites/all/modules/openmeetings/DISCLAIMER
incubator/openmeetings/trunk/plugins/drupal/LICENSE
- copied unchanged from r1370713,
incubator/openmeetings/trunk/plugins/drupal/sites/all/modules/openmeetings/LICENSE
incubator/openmeetings/trunk/plugins/drupal/NOTICE
- copied unchanged from r1370713,
incubator/openmeetings/trunk/plugins/drupal/sites/all/modules/openmeetings/NOTICE
incubator/openmeetings/trunk/plugins/drupal/README.txt
- copied, changed from r1370713,
incubator/openmeetings/trunk/plugins/drupal/sites/all/modules/openmeetings/README.txt
Removed:
incubator/openmeetings/trunk/plugins/drupal/sites/all/modules/openmeetings/CHANGELOG
incubator/openmeetings/trunk/plugins/drupal/sites/all/modules/openmeetings/DISCLAIMER
incubator/openmeetings/trunk/plugins/drupal/sites/all/modules/openmeetings/LICENSE
incubator/openmeetings/trunk/plugins/drupal/sites/all/modules/openmeetings/NOTICE
incubator/openmeetings/trunk/plugins/drupal/sites/all/modules/openmeetings/README.txt
Modified:
incubator/openmeetings/trunk/plugins/drupal/build.xml
Copied: incubator/openmeetings/trunk/plugins/drupal/README.txt (from r1370713,
incubator/openmeetings/trunk/plugins/drupal/sites/all/modules/openmeetings/README.txt)
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/plugins/drupal/README.txt?p2=incubator/openmeetings/trunk/plugins/drupal/README.txt&p1=incubator/openmeetings/trunk/plugins/drupal/sites/all/modules/openmeetings/README.txt&r1=1370713&r2=1371070&rev=1371070&view=diff
==============================================================================
---
incubator/openmeetings/trunk/plugins/drupal/sites/all/modules/openmeetings/README.txt
(original)
+++ incubator/openmeetings/trunk/plugins/drupal/README.txt Thu Aug 9 07:51:20
2012
@@ -2,4 +2,7 @@ This Drupal plugin uses Apache OpenMeeti
You need your own Apache OpenMeetings instance running.
Check out:
-http://incubator.apache.org/openmeetings/
\ No newline at end of file
+http://incubator.apache.org/openmeetings/
+
+For installation see:
+http://incubator.apache.org/openmeetings/DrupalPlugin.html
\ No newline at end of file
Modified: incubator/openmeetings/trunk/plugins/drupal/build.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/plugins/drupal/build.xml?rev=1371070&r1=1371069&r2=1371070&view=diff
==============================================================================
--- incubator/openmeetings/trunk/plugins/drupal/build.xml (original)
+++ incubator/openmeetings/trunk/plugins/drupal/build.xml Thu Aug 9 07:51:20
2012
@@ -13,10 +13,7 @@
limitations under the License.
-->
<!DOCTYPE project>
-<project name="openmeetings drupal plugin" basedir="./" default="dist-bin"
- xmlns="antlib:org.apache.tools.ant"
- xmlns:rat="antlib:org.apache.rat.anttasks"
- xmlns:ivy="antlib:org.apache.ivy.ant">
+<project name="openmeetings drupal plugin" basedir="./" default="dist-bin"
xmlns="antlib:org.apache.tools.ant" xmlns:rat="antlib:org.apache.rat.anttasks"
xmlns:ivy="antlib:org.apache.ivy.ant">
<property name="dist.dir" value="dist" />
<property name="project.version" value="1.0" />
@@ -32,11 +29,20 @@
<exclude name=".*" />
<exclude name="dist/**" />
<exclude name="build.xml" />
+ <exclude name="ivy.xml" />
+ <exclude name="ivysettings.xml" />
+ <exclude name="ivysettings.xsd" />
+
</fileset>
</copy>
<zip destfile="${archive.file.name}.zip" filesonly="false">
<zipfileset dir="${dist.dir}">
<include name="sites/**/**" />
+ <include name="CHANGELOG" />
+ <include name="DISCLAIMER" />
+ <include name="LICENSE" />
+ <include name="NOTICE" />
+ <include name="README.txt" />
</zipfileset>
</zip>
<zip destfile="${archive.file.name}-src.zip" filesonly="false">
@@ -47,6 +53,11 @@
<tar longfile="gnu" compression="gzip"
destfile="${archive.file.name}.tar.gz">
<tarfileset dir="${dist.dir}">
<include name="sites/**/**" />
+ <include name="CHANGELOG" />
+ <include name="DISCLAIMER" />
+ <include name="LICENSE" />
+ <include name="NOTICE" />
+ <include name="README.txt" />
</tarfileset>
</tar>
<tar longfile="gnu" compression="gzip"
destfile="${archive.file.name}-src.tar.gz">
@@ -54,6 +65,15 @@
<exclude name="*dist/**" />
</tarfileset>
</tar>
+ <delete>
+ <fileset dir="${dist.dir}">
+ <include name="CHANGELOG" />
+ <include name="DISCLAIMER" />
+ <include name="LICENSE" />
+ <include name="NOTICE" />
+ <include name="README.txt" />
+ </fileset>
+ </delete>
</target>
<target name="clean">
