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 2016/03/24 19:41:00 UTC
svn commit: r1736484 - in /openmeetings/application:
branches/3.1.x/openmeetings-flash/ trunk/openmeetings-flash/
Author: solomax
Date: Thu Mar 24 18:40:59 2016
New Revision: 1736484
URL: http://svn.apache.org/viewvc?rev=1736484&view=rev
Log:
[OPENMEETINGS-1357] maven-dependency-plugin is used to download/unpack OpenLaszlo
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/ (props changed)
openmeetings/application/branches/3.1.x/openmeetings-flash/openlaszlo.xml
openmeetings/application/branches/3.1.x/openmeetings-flash/pom.xml
openmeetings/application/trunk/openmeetings-flash/ (props changed)
openmeetings/application/trunk/openmeetings-flash/openlaszlo.xml
openmeetings/application/trunk/openmeetings-flash/pom.xml
Propchange: openmeetings/application/branches/3.1.x/openmeetings-flash/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Mar 24 18:40:59 2016
@@ -1,5 +1,4 @@
target
-openlaszlo
.project
.classpath
.settings
Modified: openmeetings/application/branches/3.1.x/openmeetings-flash/openlaszlo.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/openlaszlo.xml?rev=1736484&r1=1736483&r2=1736484&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-flash/openlaszlo.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-flash/openlaszlo.xml Thu Mar 24 18:40:59 2016
@@ -63,7 +63,7 @@
</antcall>
</target>
- <target name="compile.laszlo.main.debug" depends="-retrieve-openlaszlo46">
+ <target name="compile.laszlo.main.debug">
<antcall target="-compile.flash" inheritAll="true" inheritRefs="true">
<param name="flash.classpath.ref" value="laszlo46.lib" />
<param name="flash.src.dir" value="${src.dir}" />
@@ -87,7 +87,7 @@
</antcall>
</target>
- <target name="compile.laszlo.networktesting.debug" depends="-retrieve-openlaszlo46">
+ <target name="compile.laszlo.networktesting.debug">
<antcall target="-compile.flash" inheritAll="true" inheritRefs="true">
<param name="flash.classpath.ref" value="laszlo46.lib" />
<param name="flash.src.dir" value="${src.dir}/networkTesting" />
@@ -98,18 +98,4 @@
<param name="flash.debug" value="--debug" />
</antcall>
</target>
-
- <target name="-availability-check" description="Check which libraries need to be retrieved">
- <available file="${laszlo46.home}/WEB-INF/lib" type="dir" property="laszlo46.installed" />
- </target>
- <target name="-retrieve-openlaszlo46" unless="laszlo46.installed" description="Retrieves the libraries if needed" depends="-availability-check">
- <mkdir dir="${openlaszlo}"/>
- <get src="https://dl.bintray.com/openmeetings/maven/org/openlaszlo/openlaszlo/4.9.6/openlaszlo-4.9.6.tgz"
- dest="${openlaszlo}" usetimestamp="true"/>
- <untar src="${openlaszlo}/openlaszlo-4.9.6.tgz" dest="${openlaszlo}" compression="gzip" />
- <chmod dir="${laszlo46.home}/WEB-INF/flexsdk" perm="a+x" includes="**/mxmlc*" />
- <delete>
- <fileset dir="${openlaszlo}" includes="openlaszlo*.tgz"/>
- </delete>
- </target>
</project>
Modified: openmeetings/application/branches/3.1.x/openmeetings-flash/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/pom.xml?rev=1736484&r1=1736483&r2=1736484&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-flash/pom.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-flash/pom.xml Thu Mar 24 18:40:59 2016
@@ -29,12 +29,18 @@
<name>Openmeetings Flash</name>
<description>TODO</description>
<properties>
- <openlaszlo>${project.basedir}/openlaszlo</openlaszlo>
+ <openlaszlo>${project.build.directory}</openlaszlo>
<out.dir.swf>${project.build.directory}</out.dir.swf>
<webcontent.base.dir>${project.basedir}/src/main</webcontent.base.dir>
<site.basedir>${project.parent.basedir}</site.basedir>
<skip.site.copy>false</skip.site.copy>
</properties>
+ <repositories>
+ <repository>
+ <id>openmeetings-bintray</id>
+ <url>https://dl.bintray.com/openmeetings/maven</url>
+ </repository>
+ </repositories>
<profiles>
<profile>
<id>default-target</id>
@@ -87,6 +93,30 @@
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack</id>
+ <phase>initialize</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.openlaszlo</groupId>
+ <artifactId>openlaszlo</artifactId>
+ <version>4.9.7</version>
+ <type>tgz</type>
+ <outputDirectory>${openlaszlo}</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<configuration>
Propchange: openmeetings/application/trunk/openmeetings-flash/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Mar 24 18:40:59 2016
@@ -2,5 +2,4 @@ target
.settings
.classpath
.project
-openlaszlo
Modified: openmeetings/application/trunk/openmeetings-flash/openlaszlo.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-flash/openlaszlo.xml?rev=1736484&r1=1736483&r2=1736484&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-flash/openlaszlo.xml (original)
+++ openmeetings/application/trunk/openmeetings-flash/openlaszlo.xml Thu Mar 24 18:40:59 2016
@@ -24,7 +24,7 @@
xmlns:ivy="antlib:org.apache.ivy.ant"
xmlns:artifact="antlib:org.apache.maven.artifact.ant"
>
- <property name="laszlo46.home" value="${basedir}/openlaszlo/openlaszlo46" />
+ <property name="laszlo46.home" value="${openlaszlo}/openlaszlo46" />
<!-- LPS Properties -->
<property name="out.dir.swf" value="${dist.webapps.dir}/public" />
<property name="flex.src.dir" value="${webcontent.base.dir}/flex" />
@@ -73,7 +73,7 @@
</antcall>
</target>
- <target name="compile.laszlo.networktesting.debug" depends="-retrieve-openlaszlo46">
+ <target name="compile.laszlo.networktesting.debug">
<antcall target="-compile.flash" inheritAll="true" inheritRefs="true">
<param name="flash.classpath.ref" value="laszlo46.lib" />
<param name="flash.src.dir" value="${laszlo.as3.src.dir}/networkTesting" />
@@ -113,21 +113,7 @@
<antcall target="-compile.flex" inheritAll="true" inheritRefs="true"/>
</target>
- <target name="compile.flex.debug" depends="-retrieve-openlaszlo46">
+ <target name="compile.flex.debug">
<!--antcall target="-compile.flex" inheritAll="true" inheritRefs="true"/-->
</target>
-
- <target name="-availability-check" description="Check which libraries need to be retrieved">
- <available file="${laszlo46.home}/WEB-INF/lib" type="dir" property="laszlo46.installed" />
- </target>
- <target name="-retrieve-openlaszlo46" unless="laszlo46.installed" description="Retrieves the libraries if needed" depends="-availability-check">
- <mkdir dir="${openlaszlo}"/>
- <get src="https://dl.bintray.com/openmeetings/maven/org/openlaszlo/openlaszlo/4.9.6/openlaszlo-4.9.6.tgz"
- dest="${openlaszlo}" usetimestamp="true"/>
- <untar src="${openlaszlo}/openlaszlo-4.9.6.tgz" dest="${openlaszlo}" compression="gzip" />
- <chmod dir="${laszlo46.home}/WEB-INF/flexsdk" perm="a+x" includes="**/mxmlc*" />
- <delete>
- <fileset dir="${openlaszlo}" includes="openlaszlo*.tgz"/>
- </delete>
- </target>
</project>
Modified: openmeetings/application/trunk/openmeetings-flash/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-flash/pom.xml?rev=1736484&r1=1736483&r2=1736484&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-flash/pom.xml (original)
+++ openmeetings/application/trunk/openmeetings-flash/pom.xml Thu Mar 24 18:40:59 2016
@@ -29,17 +29,47 @@
<name>Openmeetings Flash</name>
<description>TODO</description>
<properties>
- <openlaszlo>${project.basedir}/openlaszlo</openlaszlo>
+ <openlaszlo>${project.build.directory}</openlaszlo>
<out.dir.swf>${project.build.directory}</out.dir.swf>
<webcontent.base.dir>${project.basedir}/src/main</webcontent.base.dir>
<site.basedir>${project.parent.basedir}</site.basedir>
<skip.site.copy>false</skip.site.copy>
</properties>
+ <repositories>
+ <repository>
+ <id>openmeetings-bintray</id>
+ <url>https://dl.bintray.com/openmeetings/maven</url>
+ </repository>
+ </repositories>
<build>
<!-- sourceDirectory>src/main/flex</sourceDirectory-->
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack</id>
+ <phase>initialize</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.openlaszlo</groupId>
+ <artifactId>openlaszlo</artifactId>
+ <version>4.9.7</version>
+ <type>tgz</type>
+ <outputDirectory>${openlaszlo}</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<configuration>