Author: solomax
Date: Sat Mar 3 14:55:59 2012
New Revision: 1296632
URL: http://svn.apache.org/viewvc?rev=1296632&view=rev
Log:
Openlaszlo sources are moved to googlecode and added to ivy
Removed:
incubator/openmeetings/trunk/singlewebapp/openlaszlo/
Modified:
incubator/openmeetings/trunk/singlewebapp/ (props changed)
incubator/openmeetings/trunk/singlewebapp/build.xml
incubator/openmeetings/trunk/singlewebapp/ivy.xml
incubator/openmeetings/trunk/singlewebapp/ivysettings.xml
Propchange: incubator/openmeetings/trunk/singlewebapp/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Mar 3 14:55:59 2012
@@ -5,3 +5,5 @@ filetest.keystore
screen_compile
junitreport
log
+openlaszlo
+
Modified: incubator/openmeetings/trunk/singlewebapp/build.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/build.xml?rev=1296632&r1=1296631&r2=1296632&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/build.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/build.xml Sat Mar 3 14:55:59 2012
@@ -173,6 +173,7 @@
<mkdir dir="${rat.lib.dir}" />
<mkdir dir="${dtd-generator.lib.dir}" />
<mkdir dir="${svntask.lib.dir}" />
+ <mkdir dir="${laszlo.home}" />
</target>
<condition property="db.provider" value="${db}" else="derby">
@@ -398,7 +399,7 @@
</java>
</target>
- <target name="compile.laszlo.main.debug.as3">
+ <target name="compile.laszlo.main.debug.as3"
depends="-retrieve-openlaszlo">
<java classname="org.openlaszlo.compiler.Main" fork="true"
newenvironment="true" failonerror="true" dir="${laszlo.as3.src.dir}"
classpathref="laszlo.lib">
<jvmarg value="-DLPS_HOME=${laszlo.home}" />
<jvmarg value="-Dlzdebug=${laszlo.debug}" />
@@ -420,7 +421,7 @@
</java>
</target>
- <target name="compile.laszlo.main.debug">
+ <target name="compile.laszlo.main.debug" depends="-retrieve-openlaszlo">
<java classname="org.openlaszlo.compiler.Main" fork="true"
newenvironment="true" failonerror="true" dir="${laszlo.src.dir}"
classpathref="laszlo.lib">
<jvmarg value="-DLPS_HOME=${laszlo.home}" />
<jvmarg value="-Dlzdebug=${laszlo.debug}" />
@@ -761,6 +762,7 @@
<path id="dtd-generator.classpath"
location="${dtd-generator.lib.dir}/*.jar"/>
<available classpathref="dtd-generator.classpath"
classname="org.relaxng.datatype.Datatype" property="dtd-generator.installed"/>
<available classpathref="svntask.classpath"
classname="org.tmatesoft.svn.core.SVNCommitInfo" property="svntask.installed"/>
+ <available file="${laszlo.home}/WEB-INF/lib" type="dir"
property="laszlo.installed"/>
</target>
<target name="-retrieve" description="Retrieves the libraries if
needed">
@@ -878,7 +880,17 @@
<copy file="${tools.jar.path}"
tofile="${project.lib}/java_16_tools.jar" />
</target>
-
+ <!-- Check for Openlaszlo -->
+ <target name="-extract-tgz" description="Extracts given tar into root
folder">
+ <echo message="Going to extract ${dep.file} to the ${basedir}"
/>
+ <untar src="${dep.file}" dest="${basedir}" compression="gzip"/>
+ </target>
+ <target name="-retrieve-openlaszlo" unless="laszlo.installed"
description="Retrieves the libraries if needed" depends="-availability-check">
+ <antcall target="-retrieve" inheritAll="true"
inheritRefs="true">
+ <param name="ivy.conf.name" value="openlaszlo"/>
+ <param name="ivy.lib.location" value="${laszlo.home}"/>
+ </antcall>
+ </target>
<target name="ivyclear" description="Clears out the Ivy cache">
<delete dir="${user.home}/.ivy2/cache/red5"/>
<delete includeemptydirs="true">
Modified: incubator/openmeetings/trunk/singlewebapp/ivy.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/ivy.xml?rev=1296632&r1=1296631&r2=1296632&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/ivy.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/ivy.xml Sat Mar 3 14:55:59 2012
@@ -28,6 +28,7 @@
<conf name="rat" description="Apache Rat dependencies" />
<conf name="dtd" description="Dtd-generator dependencies" />
<conf name="svntask" description="Svn task dependencies" />
+ <conf name="openlaszlo" description="Openlaszlo dependencies" />
</configurations>
<dependencies>
<!-- START OF RED5 -->
@@ -333,6 +334,13 @@
</dependency>
<!-- END OF svntask -->
+ <!-- START OF openlaszlo -->
+ <dependency org="openlaszlo" name="openlaszlo" rev="4.9"
conf="openlaszlo->*" transitive="false">
+ <artifact name="openlaszlo" type="tgz"/>
+ <include type="tgz" />
+ </dependency>
+ <!-- END OF openlaszlo -->
+
</dependencies>
</ivy-module>
Modified: incubator/openmeetings/trunk/singlewebapp/ivysettings.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/ivysettings.xml?rev=1296632&r1=1296631&r2=1296632&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/ivysettings.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/ivysettings.xml Sat Mar 3
14:55:59 2012
@@ -13,30 +13,34 @@
limitations under the License.
-->
<ivysettings>
- <settings defaultResolver="chain"/>
- <resolvers>
- <chain name="chain">
- <ibiblio name="central" m2compatible="true"/>
- <ibiblio name="springsource-external" m2compatible="true"
root="http://repository.springsource.com/maven/bundles/external"/>
- <ibiblio name="springsource-release" m2compatible="true"
root="http://repository.springsource.com/maven/bundles/release"/>
- <ibiblio name="tmatesoft-release" m2compatible="true"
root="http://maven.tmatesoft.com/content/repositories/releases"/>
- <ibiblio name="tmatesoft-snapshots" m2compatible="true"
root="http://maven.tmatesoft.com/content/repositories/snapshots"/>
- <url name="mavencentral">
- <artifact
pattern="http://repo1.maven.org/maven2/[organisation]/[artifact]-[revision].[ext]";
/>
- </url>
- <url name="apache">
- <artifact
pattern="https://repository.apache.org/content/repositories/releases/[artifact]/[artifact]/[revision]/[artifact]-[revision].[ext]";
/>
- <artifact
pattern="https://repository.apache.org/content/repositories/releases/[organisation]/[artifact]/[revision]/[artifact]-[revision].[ext]";
/>
- </url>
- <url name="sonatype">
- <artifact
pattern="http://oss.sonatype.org/content/repositories/sourceforge-releases/[organisation]/[artifact]-[revision].[ext]";
/>
- <artifact
pattern="http://oss.sonatype.org/content/repositories/central/[artifact]/[artifact]/[revision]/[artifact]-[revision].[ext]";
/>
- </url>
- <url name="googlecode">
- <artifact
pattern="http://red5.googlecode.com/svn/repository/[artifact](-[revision]).[ext]"
/>
- <artifact
pattern="http://red5.googlecode.com/svn/repository/[organisation]/[artifact](-[revision]).[ext]"
/>
- </url>
- </chain>
- </resolvers>
+ <settings defaultResolver="chain"/>
+ <resolvers>
+ <chain name="chain">
+ <ibiblio name="central" m2compatible="true"/>
+ <ibiblio name="springsource-external"
m2compatible="true"
root="http://repository.springsource.com/maven/bundles/external"/>
+ <ibiblio name="springsource-release"
m2compatible="true"
root="http://repository.springsource.com/maven/bundles/release"/>
+ <ibiblio name="tmatesoft-release" m2compatible="true"
root="http://maven.tmatesoft.com/content/repositories/releases"/>
+ <ibiblio name="tmatesoft-snapshots" m2compatible="true"
root="http://maven.tmatesoft.com/content/repositories/snapshots"/>
+ <url name="mavencentral">
+ <artifact
pattern="http://repo1.maven.org/maven2/[organisation]/[artifact]-[revision].[ext]";
/>
+ </url>
+ <url name="apache">
+ <artifact
pattern="https://repository.apache.org/content/repositories/releases/[artifact]/[artifact]/[revision]/[artifact]-[revision].[ext]";
/>
+ <artifact
pattern="https://repository.apache.org/content/repositories/releases/[organisation]/[artifact]/[revision]/[artifact]-[revision].[ext]";
/>
+ </url>
+ <url name="sonatype">
+ <artifact
pattern="http://oss.sonatype.org/content/repositories/sourceforge-releases/[organisation]/[artifact]-[revision].[ext]";
/>
+ <artifact
pattern="http://oss.sonatype.org/content/repositories/central/[artifact]/[artifact]/[revision]/[artifact]-[revision].[ext]";
/>
+ </url>
+ <url name="googlecode">
+ <artifact
pattern="http://red5.googlecode.com/svn/repository/[artifact](-[revision]).[ext]"
/>
+ <artifact
pattern="http://red5.googlecode.com/svn/repository/[organisation]/[artifact](-[revision]).[ext]"
/>
+ <artifact
pattern="http://openlaszlo-openmeetings-integration.googlecode.com/svn/repository/[artifact](-[revision]).[ext]"
/>
+ </url>
+ </chain>
+ </resolvers>
+ <triggers>
+ <ant-call target="-extract-tgz" prefix="dep"
event="post-download-artifact" filter="type=tgz"/>
+ </triggers>
</ivysettings>
