Author: solomax
Date: Fri Jan 11 06:09:11 2013
New Revision: 1431906
URL: http://svn.apache.org/viewvc?rev=1431906&view=rev
Log:
[OPENMEETINGS-501] additional check for anakia.installed was added;
Copyrights are added;
Missing libraries in Red5 client/server build were fixed
Added:
incubator/openmeetings/trunk/singlewebapp/build-red5_ivy.xsl
incubator/openmeetings/trunk/singlewebapp/build-red5_ivysettings.xsl
Modified:
incubator/openmeetings/trunk/singlewebapp/.springBeans
incubator/openmeetings/trunk/singlewebapp/build-jaudiotagger.xsl
incubator/openmeetings/trunk/singlewebapp/build.properties
incubator/openmeetings/trunk/singlewebapp/build.xml
Modified: incubator/openmeetings/trunk/singlewebapp/.springBeans
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/.springBeans?rev=1431906&r1=1431905&r2=1431906&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/.springBeans (original)
+++ incubator/openmeetings/trunk/singlewebapp/.springBeans Fri Jan 11 06:09:11
2013
@@ -1,4 +1,17 @@
<?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.
+ -->
<beansProjectDescription>
<version>1</version>
<pluginVersion><![CDATA[2.8.1.201111220115-RELEASE]]></pluginVersion>
Modified: incubator/openmeetings/trunk/singlewebapp/build-jaudiotagger.xsl
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/build-jaudiotagger.xsl?rev=1431906&r1=1431905&r2=1431906&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/build-jaudiotagger.xsl (original)
+++ incubator/openmeetings/trunk/singlewebapp/build-jaudiotagger.xsl Fri Jan 11
06:09:11 2013
@@ -1,4 +1,17 @@
<?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()|@*">
Added: incubator/openmeetings/trunk/singlewebapp/build-red5_ivy.xsl
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/build-red5_ivy.xsl?rev=1431906&view=auto
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/build-red5_ivy.xsl (added)
+++ incubator/openmeetings/trunk/singlewebapp/build-red5_ivy.xsl Fri Jan 11
06:09:11 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.1.3" >
+ <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.1.2" >
+ <include type="jar" />
+ </dependency>
+ </xsl:text>
+ </xsl:template>
+</xsl:stylesheet>
Added: incubator/openmeetings/trunk/singlewebapp/build-red5_ivysettings.xsl
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/build-red5_ivysettings.xsl?rev=1431906&view=auto
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/build-red5_ivysettings.xsl (added)
+++ incubator/openmeetings/trunk/singlewebapp/build-red5_ivysettings.xsl Fri
Jan 11 06:09:11 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: incubator/openmeetings/trunk/singlewebapp/build.properties
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/build.properties?rev=1431906&r1=1431905&r2=1431906&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/build.properties (original)
+++ incubator/openmeetings/trunk/singlewebapp/build.properties Fri Jan 11
06:09:11 2013
@@ -1,3 +1,14 @@
+# 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.
project.version=2.1.0
project.status=SNAPSHOT
ivy.install.version=2.3.0-rc1
Modified: incubator/openmeetings/trunk/singlewebapp/build.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/build.xml?rev=1431906&r1=1431905&r2=1431906&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/build.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/build.xml Fri Jan 11 06:09:11 2013
@@ -817,6 +817,12 @@
<available classpathref="check.classpath"
classname="org.junit.Test" property="junit.installed" />
<available classpathref="check.classpath"
classname="com.thaiopensource.relaxng.translate.Driver"
property="dtd-generator.installed" />
<available classpathref="check.classpath"
classname="org.apache.commons.cli.CommandLine" property="cmdadmin.installed" />
+ <condition property="anakia.installed">
+ <and>
+ <available
classpathref="check.anakia.classpath"
classname="org.apache.oro.text.GlobCompiler" />
+ <available
classpathref="check.anakia.classpath" classname="org.jdom.JDOMException" />
+ </and>
+ </condition>
<available classpathref="check.anakia.classpath"
classname="org.apache.oro.text.GlobCompiler" property="anakia.installed" />
<available classpathref="check.rat.classpath"
classname="org.apache.rat.Report" property="rat.installed" />
<available classpathref="svntask.classpath"
classname="org.tmatesoft.svn.core.SVNCommitInfo" property="svntask.installed" />
@@ -857,7 +863,7 @@
</copy>
</target>
- <!-- Check for the Red5 libraries -->
+ <!-- Check for the Red5 server libraries -->
<target name="-retrieve-red5-server" unless="red5.installed"
description="Retrieves the libraries if needed" depends="-ant-task">
<svn refid="svn.settings">
<checkout
url="http://red5.googlecode.com/svn/java/server/trunk/";
revision="${red5.server.revision}" destPath="${red5.server.dir}" />
@@ -871,6 +877,10 @@
<param name="ivy.lib.location"
value="${red5.server.dir}/plugins" />
</antcall>
<!-- END of Tomcat 7 patch -->
+ <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>
@@ -903,12 +913,14 @@
<antcall target="-patch-red5-server-start-script"/>
</target>
- <!-- Check for the Red5 libraries -->
+ <!-- Check for the Red5 client libraries -->
<target name="-retrieve-red5-client" unless="red5.client.installed"
description="Retrieves the libraries if needed" depends="-retrieve-red5-server">
<svn refid="svn.settings">
<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>
