openmeetings-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "seba.wagner@gmail.com" <seba.wag...@gmail.com>
Subject Re: svn commit: r1294440 - in /incubator/openmeetings/trunk/singlewebapp: build.xml ivy.xml src/templates/screenshare.vm
Date Tue, 28 Feb 2012 08:25:59 GMT
No Problem,

can you add that to:
http://incubator.apache.org/openmeetings/BuildInstructions.html

Thanks!
Sebastian

2012/2/28 Maxim Solodovnik <solomax666@gmail.com>

> One more thing,
>
> Eclipse project needs to be fixed.
> I'll handle it.
> If you need it ASAP please do the following:
> 1) run ant prepare-eclipse
> 2) run eclipse
> 3) add any missing library (shouldn't be too much)
>
> sorry for inconvenience :)
>
>
> On Tue, Feb 28, 2012 at 08:49, Maxim Solodovnik <solomax666@gmail.com>wrote:
>
>> Hello Sebastian,
>>
>> I did initial check of apache.ivy integration.
>> I'm afraid I could miss some required libraries, I will test everything
>> today. PLease report me any missing library if you'll find any.
>>
>> Thanks in advance
>>
>>
>> On Tue, Feb 28, 2012 at 08:43, <solomax@apache.org> wrote:
>>
>>> Author: solomax
>>> Date: Tue Feb 28 01:43:17 2012
>>> New Revision: 1294440
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1294440&view=rev
>>> Log:
>>> Rat libraries are added to the ivy
>>>
>>> Modified:
>>>    incubator/openmeetings/trunk/singlewebapp/build.xml
>>>    incubator/openmeetings/trunk/singlewebapp/ivy.xml
>>>    incubator/openmeetings/trunk/singlewebapp/src/templates/screenshare.vm
>>>
>>> Modified: incubator/openmeetings/trunk/singlewebapp/build.xml
>>> URL:
>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/build.xml?rev=1294440&r1=1294439&r2=1294440&view=diff
>>>
>>> ==============================================================================
>>> --- incubator/openmeetings/trunk/singlewebapp/build.xml (original)
>>> +++ incubator/openmeetings/trunk/singlewebapp/build.xml Tue Feb 28
>>> 01:43:17 2012
>>> @@ -92,30 +92,14 @@
>>>        <property name="red5-screenshare.lib.dir"
>>> value="${project.lib}/red5-screenshare" />
>>>        <property name="red5-screenshare.images"
>>> value="${basedir}/WebContent/red5-screenshare" />
>>>        <property name="junit.lib.dir" value="${project.lib}/junit" />
>>> +       <property name="rat.lib.dir" value="${project.lib}/rat" />
>>>
>>> -       <!-- Open JPA -->
>>> -       <property name="openjpa.lib" value="${project.lib}/openjpa2" />
>>> -       <!--JDBC Drivers-->
>>> -       <property name="database.lib" value="${project.lib}/database" />
>>>        <property name="red5.lib"
>>> value="${basedir}/${red5.server.dir}/dist" />
>>>        <property name="red5.server.lib" value="${red5.lib}/lib" />
>>>        <property name="spring.lib" value="${project.lib}/spring" />
>>>        <property name="upload.lib" value="${project.lib}/upload" />
>>>        <property name="xstream.lib" value="${project.lib}/xstream" />
>>>        <property name="web.lib" value="${project.lib}" />
>>> -       <property name="ical.lib" value="${project.lib}/ical4j" />
>>> -       <!-- Apache Axis2 -->
>>> -       <property name="axis2.lib" value="${project.lib}/axis2-1.6" />
>>> -       <!-- SLF4J -->
>>> -       <property name="slf4j.lib" value="${project.lib}/slf4j" />
>>> -       <!-- Apache Velocity -->
>>> -       <property name="velocity.lib" value="${project.lib}/velocity" />
>>> -       <!-- Apache Batik -->
>>> -       <property name="batik.lib" value="${project.lib}/batik_17" />
>>> -       <!-- Mina -->
>>> -       <property name="mina.lib" value="${project.lib}/mina" />
>>> -       <!-- Apache RAT -->
>>> -       <property name="rat.lib" value="${project.lib}/rat" />
>>>        <!-- Svn Task -->
>>>        <property name="svntask.lib" value="${project.lib}/svntask-1.0.8"
>>> />
>>>
>>> @@ -196,6 +180,7 @@
>>>                <mkdir dir="${anakia.lib.dir}" />
>>>                <mkdir dir="${red5-screenshare.lib.dir}" />
>>>                <mkdir dir="${junit.lib.dir}" />
>>> +               <mkdir dir="${rat.lib.dir}" />
>>>        </target>
>>>
>>>        <condition property="db.provider" value="${db}" else="derby">
>>> @@ -216,9 +201,9 @@
>>>                        <fileset dir="${red5.server.dir}/dist"
>>> includes="red5.jar" />
>>>                        <fileset dir="${om.lib.dir}"
>>> includes="org.springframework.context-*.jar" />
>>>                        <fileset dir="${om.lib.dir}"
>>> includes="org.springframework.core-*.jar" />
>>> -                       <fileset dir="${slf4j.lib}"
>>> includes="logback*.jar" />
>>> -                       <fileset dir="${mina.lib}"
>>> includes="mina-core*.jar" />
>>> -                       <fileset dir="${slf4j.lib}"
>>> includes="slf4j-api*.jar" />
>>> +                       <fileset dir="${red5.lib.dir}"
>>> includes="logback*.jar" />
>>> +                       <fileset dir="${red5.lib.dir}"
>>> includes="mina-core*.jar" />
>>> +                       <fileset dir="${red5.lib.dir}"
>>> includes="com.springsource.slf4j.api*.jar" />
>>>                </copy>
>>>                <copy todir="${red5.root}" filtering="true">
>>>                        <fileset dir="${red5.server.dir}/dist">
>>> @@ -564,11 +549,11 @@
>>>        <!-- Build entire project -->
>>>        <target name="build project" depends="clean, prepare, compile" />
>>>
>>> -       <target name="report_rat">
>>> +       <target name="report_rat" depends="-retrieve-rat">
>>>                <!-- define the RAT task -->
>>>                <taskdef uri="antlib:org.apache.rat.anttasks"
>>> resource="org/apache/rat/anttasks/antlib.xml">
>>>                        <classpath>
>>> -                               <fileset dir="${rat.lib}"
>>> includes="*.jar" />
>>> +                               <fileset dir="${rat.lib.dir}"
>>> includes="*.jar" />
>>>                                <path refid="compile.classpath" />
>>>                        </classpath>
>>>                </taskdef>
>>> @@ -864,6 +849,13 @@
>>>                        <param name="ivy.lib.location"
>>> value="${junit.lib.dir}"/>
>>>                </antcall>
>>>        </target>
>>> +       <!-- Check for rat libraries -->
>>> +       <target name="-retrieve-rat" unless="rat.installed"
>>> description="Retrieves the libraries if needed" depends="prepare.mkdir">
>>> +               <antcall target="-retrieve" inheritAll="true"
>>> inheritRefs="true">
>>> +                       <param name="ivy.conf.name" value="rat"/>
>>> +                       <param name="ivy.lib.location"
>>> value="${rat.lib.dir}"/>
>>> +               </antcall>
>>> +       </target>
>>>
>>>        <target name="ivyclear" description="Clears out the Ivy cache">
>>>                <delete dir="${user.home}/.ivy2/cache/red5"/>
>>>
>>> Modified: incubator/openmeetings/trunk/singlewebapp/ivy.xml
>>> URL:
>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/ivy.xml?rev=1294440&r1=1294439&r2=1294440&view=diff
>>>
>>> ==============================================================================
>>> --- incubator/openmeetings/trunk/singlewebapp/ivy.xml (original)
>>> +++ incubator/openmeetings/trunk/singlewebapp/ivy.xml Tue Feb 28
>>> 01:43:17 2012
>>> @@ -26,6 +26,7 @@
>>>                <conf name="openmeetings.ext" description="Openmeetings
>>> required libraries with different pattern" />
>>>                <conf name="openmeetings.axis2" description="Axis
>>> required libraries with dependencies" />
>>>                <conf name="junit" description="Unit testing
>>> dependencies" />
>>> +               <conf name="rat" description="Apache Rat dependencies" />
>>>        </configurations>
>>>        <dependencies>
>>>                <!--  START OF RED5 -->
>>> @@ -307,6 +308,18 @@
>>>                        <include type="jar" />
>>>                </dependency>
>>>                <!--  END OF JUNIT -->
>>> +
>>> +               <!--  START OF RAT -->
>>> +               <dependency org="org.apache.rat" name="apache-rat-core"
>>> rev="0.8" conf="rat->*" transitive="false">
>>> +                       <include type="jar" />
>>> +               </dependency>
>>> +               <dependency org="org.apache.rat" name="apache-rat-tasks"
>>> rev="0.8" conf="rat->*" transitive="false">
>>> +                       <include type="jar" />
>>> +               </dependency>
>>> +               <dependency org="commons-cli" name="commons-cli"
>>> rev="1.2" conf="rat->*" transitive="false">
>>> +                       <include type="jar" />
>>> +               </dependency>
>>> +               <!--  END OF RAT -->
>>>        </dependencies>
>>>  </ivy-module>
>>>
>>>
>>> Modified:
>>> incubator/openmeetings/trunk/singlewebapp/src/templates/screenshare.vm
>>> URL:
>>> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/templates/screenshare.vm?rev=1294440&r1=1294439&r2=1294440&view=diff
>>>
>>> ==============================================================================
>>> ---
>>> incubator/openmeetings/trunk/singlewebapp/src/templates/screenshare.vm
>>> (original)
>>> +++
>>> incubator/openmeetings/trunk/singlewebapp/src/templates/screenshare.vm Tue
>>> Feb 28 01:43:17 2012
>>> @@ -38,7 +38,7 @@ limitations under the License.
>>>         <jar href="org.springframework.core-3.0.6.RELEASE.jar" />
>>>         <jar href="org.springframework.context-3.0.6.RELEASE.jar" />
>>>         <jar href="mina-core-2.0.4.jar" />
>>> -        <jar href="slf4j-api-1.6.1.jar" />
>>> +        <jar href="com.springsource.slf4j.api-1.6.1.jar" />
>>>         <jar href="httpclient-4.1.2.jar" />
>>>         <jar href="httpcore-4.1.3.jar" />
>>>         <jar href="bcprov-jdk16-145.jar" />
>>>
>>>
>>>
>>
>>
>> --
>> WBR
>> Maxim aka solomax
>>
>
>
>
> --
> WBR
> Maxim aka solomax
>



-- 
Sebastian Wagner
http://www.openmeetings.de
http://incubator.apache.org/openmeetings/
http://www.webbase-design.de
http://www.wagner-sebastian.com
seba.wagner@gmail.com

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message