Author: solomax
Date: Wed Jul 31 05:18:27 2013
New Revision: 1508727
URL: http://svn.apache.org/r1508727
Log:
Make this branch compilable
Added:
openmeetings/branches/2.0/build-red5_ivy.xsl
openmeetings/branches/2.0/build-red5_ivysettings.xsl
Modified:
openmeetings/branches/2.0/build.xml
Added: openmeetings/branches/2.0/build-red5_ivy.xsl
URL:
http://svn.apache.org/viewvc/openmeetings/branches/2.0/build-red5_ivy.xsl?rev=1508727&view=auto
==============================================================================
--- openmeetings/branches/2.0/build-red5_ivy.xsl (added)
+++ openmeetings/branches/2.0/build-red5_ivy.xsl Wed Jul 31 05:18:27 2013
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
+ <xsl:output omit-xml-declaration="no"/>
+ <xsl:template match="node()|@*">
+ <xsl:copy>
+ <xsl:apply-templates select="node()|@*"/>
+ </xsl:copy>
+ </xsl:template>
+
+ <xsl:template match="//*[@name='jaudiotagger']">
+ <xsl:text disable-output-escaping="yes">
+ <dependency org="org" name="jaudiotagger"
rev="2.0.4-SNAPSHOT" >
+ <include type="jar" />
+ </dependency>
+ </xsl:text>
+ </xsl:template>
+ <xsl:template match="//*[@name='bcprov-jdk16']">
+ <xsl:text disable-output-escaping="yes">
+ <dependency org="org.bouncycastle"
name="bcprov-jdk16" rev="1.45" conf="java6->*" >
+ <include type="jar" />
+ </dependency>
+ </xsl:text>
+ </xsl:template>
+ <xsl:template match="//*[@name='sysout-over-slf4j']">
+ <xsl:text disable-output-escaping="yes">
+ <dependency org="uk.org.lidalia"
name="sysout-over-slf4j" rev="1.0.2" >
+ <include type="jar" />
+ </dependency>
+ </xsl:text>
+ </xsl:template>
+ <xsl:template match="//*[@name='httpcore']">
+ <xsl:text disable-output-escaping="yes">
+ <dependency org="org.apache.httpcomponents"
name="httpcore" rev="4.2.1" >
+ <include type="jar" />
+ </dependency>
+ </xsl:text>
+ </xsl:template>
+ <xsl:template match="//*[@name='httpclient']">
+ <xsl:text disable-output-escaping="yes">
+ <dependency org="org.apache.httpcomponents"
name="httpclient" rev="4.2" >
+ <include type="jar" />
+ </dependency>
+ </xsl:text>
+ </xsl:template>
+</xsl:stylesheet>
Added: openmeetings/branches/2.0/build-red5_ivysettings.xsl
URL:
http://svn.apache.org/viewvc/openmeetings/branches/2.0/build-red5_ivysettings.xsl?rev=1508727&view=auto
==============================================================================
--- openmeetings/branches/2.0/build-red5_ivysettings.xsl (added)
+++ openmeetings/branches/2.0/build-red5_ivysettings.xsl Wed Jul 31 05:18:27
2013
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
+ <xsl:output omit-xml-declaration="no"/>
+ <xsl:template match="node()|@*" name="identity">
+ <xsl:copy>
+ <xsl:apply-templates select="node()|@*"/>
+ </xsl:copy>
+ </xsl:template>
+
+ <xsl:template match="url[last()]">
+ <xsl:call-template name="identity"/>
+ <url name="java_net">
+ <artifact
pattern="http://download.java.net/maven/2/[organisation]/[artifact]/[revision]/[artifact]-[revision].[ext]";
/>
+ </url>
+ </xsl:template>
+</xsl:stylesheet>
Modified: openmeetings/branches/2.0/build.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/2.0/build.xml?rev=1508727&r1=1508726&r2=1508727&view=diff
==============================================================================
--- openmeetings/branches/2.0/build.xml (original)
+++ openmeetings/branches/2.0/build.xml Wed Jul 31 05:18:27 2013
@@ -90,7 +90,11 @@
<fileset dir="${project.lib.dir}" includes="*.jar" />
</path>
- <target name="prepare.mkdir" depends="-java6.check">
+ <target name="info" unless="java6.installed">
+ <echo>Ant version is ${ant.version}</echo> <!-- output Ant
version -->
+ </target>
+
+ <target name="prepare.mkdir" depends="-java6or7.check">
<mkdir dir="${red5.server.lib}" />
<mkdir dir="${red5.client.dir}/dist" />
<mkdir dir="${dist.dir}" />
@@ -353,7 +357,8 @@
<target name="signWebStartJars">
<delete file="${keystore.file}" />
- <genkey alias="filetest" storepass="secret"
keystore="${keystore.file}" verbose="true">
+ <genkey alias="filetest" storepass="secret"
keystore="${keystore.file}" verbose="true"
+ sigalg="MD5withRSA" keyalg="RSA">
<dname>
<param name="CN" value="Sebastian Wagner" />
<param name="OU" value="technology" />
@@ -381,7 +386,8 @@
<fileset dir="${red5.server.lib}"
includes="com.springsource.slf4j.api*.jar" />
<fileset dir="${red5.client.lib}"
includes="red5-client*.jar" />
</copy>
- <signjar alias="filetest" keystore="${keystore.file}"
storepass="secret" lazy="false">
+ <signjar alias="filetest" keystore="${keystore.file}"
storepass="secret" lazy="false"
+ sigalg="MD5withRSA" digestalg="SHA1">
<path>
<fileset dir="${screenshare.out.dir}">
<include name="**/*.jar" />
@@ -683,25 +689,6 @@
<property name="ivy.jar" value="ivy-2.2.0.jar" />
<taskdef uri="antlib:org.apache.ivy.ant"
resource="org/apache/ivy/ant/antlib.xml" classpath="${ivy.lib.dir}/${ivy.jar}"
/>
- <!-- Build Targets -->
- <target name="-java6.check" unless="java6.installed">
- <condition property="java6.installed" value="true">
- <and>
- <or>
- <equals
arg1="${java.specification.version}" arg2="1.6" />
- </or>
- <matches
string="${java.vm.specification.vendor}" pattern=".*[sun,oracle].*"
casesensitive="false" singleline="true" />
- </and>
- </condition>
- <echo message="Using Java ${java.version} specification:
${java.specification.version}" />
- <fail message="Unsupported Java version - detected:
${java.version} Only Sun/Oracle Java compiler version 1.6 supported.">
- <condition>
- <not>
- <equals arg1="${java6.installed}"
arg2="true" />
- </not>
- </condition>
- </fail>
- </target>
<target name="-availability-check" unless="red5.installed"
description="Check which libraries need to be retrieved"
depends="prepare.mkdir">
<available classpathref="compile.classpath"
classname="javax.persistence.spi.PersistenceProvider"
property="mainlib.installed" />
@@ -745,6 +732,10 @@
<svn refid="svn.settings">
<checkout
url="http://red5.googlecode.com/svn/java/server/trunk/";
revision="${red5.server.revision}" destPath="${red5.server.dir}" />
</svn>
+ <xslt in="${red5.server.dir}/ivy.xml"
out="${red5.server.dir}/ivy1.xml" style="build-red5_ivy.xsl" />
+ <move file="${red5.server.dir}/ivy1.xml"
tofile="${red5.server.dir}/ivy.xml" />
+ <xslt in="${red5.server.dir}/ivysettings.xml"
out="${red5.server.dir}/ivysettings1.xml" style="build-red5_ivysettings.xsl" />
+ <move file="${red5.server.dir}/ivysettings1.xml"
tofile="${red5.server.dir}/ivysettings.xml" />
<subant target="dist">
<fileset dir="${red5.server.dir}" includes="build.xml"
/>
</subant>
@@ -784,6 +775,8 @@
<checkout
url="http://red5.googlecode.com/svn/java/client/trunk/";
revision="${red5.client.revision}" destPath="${red5.client.dir}" />
</svn>
<copy file="${red5.lib}/red5.jar"
todir="${red5.client.dir}/lib" overwrite="true" force="true" />
+ <xslt in="${red5.client.dir}/ivy.xml"
out="${red5.client.dir}/ivy1.xml" style="build-red5_ivy.xsl" />
+ <move file="${red5.client.dir}/ivy1.xml"
tofile="${red5.client.dir}/ivy.xml" />
<subant target="dist">
<fileset dir="${red5.client.dir}" includes="build.xml"
/>
</subant>
@@ -948,7 +941,7 @@
<ivy:cleancache />
</target>
- <target name="prepare-eclipse" if="java6.installed" description="Layout
various files necessary for development" depends="-java6.check">
+ <target name="prepare-eclipse" if="java6.installed" description="Layout
various files necessary for development" depends="-java6or7.check">
<antcall target="-retrieve-mainlibs" inheritAll="true"
inheritRefs="true" />
<antcall target="-retrieve-om" inheritAll="true"
inheritRefs="true" />
<antcall target="-retrieve-junit" inheritAll="true"
inheritRefs="true" />
@@ -958,4 +951,24 @@
<antcall target="-retrieve-cmdadmin" inheritAll="true"
inheritRefs="true" />
<antcall target="-process-db" inheritAll="true"
inheritRefs="true" />
</target>
+
+ <target name="-java6or7.check" unless="java6.installed" depends="info">
+ <condition property="java6.installed" value="true">
+ <and>
+ <or>
+ <equals
arg1="${java.specification.version}" arg2="1.6" />
+ <equals
arg1="${java.specification.version}" arg2="1.7" />
+ </or>
+ <matches
string="${java.vm.specification.vendor}" pattern=".*[sun,oracle].*"
casesensitive="false" singleline="true" />
+ </and>
+ </condition>
+ <echo message="Using Java ${java.version} specification:
${java.specification.version}" />
+ <fail message="Unsupported Java version - detected:
${java.version} Only Sun/Oracle Java compiler version 6 or 7 supported.">
+ <condition>
+ <not>
+ <equals arg1="${java6.installed}"
arg2="true" />
+ </not>
+ </condition>
+ </fail>
+ </target>
</project>
