Revision: 112
Author: [email protected]
Date: Tue Mar 19 09:33:55 2013
Log: project is updated to use ivy and to be compatible with latest OM
and red5
http://code.google.com/p/red5phone/source/detail?r=112
Added:
/branches/red5sip/build.properties
/branches/red5sip/ivy.xml
/branches/red5sip/ivysettings.xml
/branches/red5sip/ivysettings.xsd
/branches/red5sip/lib/openmeetings-3.0.0-SNAPSHOT.jar
/branches/red5sip/lib/red5-client-1.0.2-SNAPSHOT.jar
/branches/red5sip/lib/red5-server.jar
Deleted:
/branches/red5sip/lib/bcprov-jdk16-145.jar
/branches/red5sip/lib/cglib-2.2.2.jar
/branches/red5sip/lib/com.springsource.javax.xml.stream-1.0.1.jar
/branches/red5sip/lib/com.springsource.org.antlr-3.1.3.jar
/branches/red5sip/lib/com.springsource.org.aopalliance-1.0.0.jar
/branches/red5sip/lib/com.springsource.org.apache.commons.codec-1.4.0.jar
/branches/red5sip/lib/com.springsource.org.apache.commons.collections-3.2.1.jar
/branches/red5sip/lib/com.springsource.org.apache.commons.httpclient-3.1.0.jar
/branches/red5sip/lib/com.springsource.org.apache.commons.lang-2.4.0.jar
/branches/red5sip/lib/com.springsource.org.apache.commons.modeler-2.0.1.jar
/branches/red5sip/lib/com.springsource.org.apache.commons.pool-1.5.3.jar
/branches/red5sip/lib/com.springsource.org.apache.xerces-2.9.1.jar
/branches/red5sip/lib/com.springsource.org.codehaus.groovy-1.7.0.jar
/branches/red5sip/lib/com.springsource.org.mozilla.javascript-1.7.0.R2.jar
/branches/red5sip/lib/com.springsource.org.objectweb.asm-3.2.0.jar
/branches/red5sip/lib/com.springsource.org.objectweb.asm.commons-3.2.0.jar
/branches/red5sip/lib/com.springsource.slf4j.api-1.6.1.jar
/branches/red5sip/lib/com.springsource.slf4j.bridge-1.6.1.jar
/branches/red5sip/lib/commons-beanutils-1.8.2.jar
/branches/red5sip/lib/commons-daemon-1.0.3.jar
/branches/red5sip/lib/commons-io-1.4.jar
/branches/red5sip/lib/ehcache-2.2.0.jar
/branches/red5sip/lib/geronimo-jpa_2.0_spec-1.1.jar
/branches/red5sip/lib/javaee-api-5.1.2.jar
/branches/red5sip/lib/jcl-over-slf4j-1.6.1.jar
/branches/red5sip/lib/libresample4j-1.0.jar
/branches/red5sip/lib/logback-classic-0.9.26.jar
/branches/red5sip/lib/logback-core-0.9.26.jar
/branches/red5sip/lib/mina-core-2.0.2.jar
/branches/red5sip/lib/openjpa-2.1.0.jar
/branches/red5sip/lib/openmeetings.jar
/branches/red5sip/lib/org.springframework.aop-3.0.5.RELEASE.jar
/branches/red5sip/lib/org.springframework.asm-3.0.5.RELEASE.jar
/branches/red5sip/lib/org.springframework.aspects-3.0.5.RELEASE.jar
/branches/red5sip/lib/org.springframework.beans-3.0.5.RELEASE.jar
/branches/red5sip/lib/org.springframework.context-3.0.5.RELEASE.jar
/branches/red5sip/lib/org.springframework.context.support-3.0.5.RELEASE.jar
/branches/red5sip/lib/org.springframework.core-3.0.5.RELEASE.jar
/branches/red5sip/lib/org.springframework.expression-3.0.5.RELEASE.jar
/branches/red5sip/lib/org.springframework.jdbc-3.0.5.RELEASE.jar
/branches/red5sip/lib/org.springframework.orm-3.0.5.RELEASE.jar
/branches/red5sip/lib/org.springframework.test-3.0.5.RELEASE.jar
/branches/red5sip/lib/org.springframework.transaction-3.0.5.RELEASE.jar
/branches/red5sip/lib/org.springframework.web-3.0.5.RELEASE.jar
/branches/red5sip/lib/org.springframework.web.servlet-3.0.5.RELEASE.jar
/branches/red5sip/lib/red5.jar
/branches/red5sip/lib/sip.jar
/branches/red5sip/lib/slf4j-api-1.6.4.jar
/branches/red5sip/lib/sources
/branches/red5sip/lib/xmlrpc-2.0.1.jar
/branches/red5sip/red5sip.userlibraries
Modified:
/branches/red5sip/.classpath
/branches/red5sip/.project
/branches/red5sip/build.xml
/branches/red5sip/red5sip.sh
/branches/red5sip/src/java/org/red5/sip/app/RTMPControlClient.java
/branches/red5sip/src/java/org/red5/sip/app/RTMPRoomClient.java
=======================================
--- /dev/null
+++ /branches/red5sip/build.properties Tue Mar 19 09:33:55 2013
@@ -0,0 +1,1 @@
+ivy.install.version=2.3.0
=======================================
--- /dev/null
+++ /branches/red5sip/ivy.xml Tue Mar 19 09:33:55 2013
@@ -0,0 +1,44 @@
+<?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.
+ -->
+<ivy-module version="2.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd";>
+ <info organisation="apache" module="red5sip" />
+ <configurations defaultconfmapping="default">
+ <conf name="default" />
+ </configurations>
+ <dependencies>
+ <dependency org="org.apache.mina" name="mina-core" rev="2.0.7"
transitive="false" />
+ <dependency org="org.slf4j" name="slf4j-api" rev="1.7.2"
transitive="false"/>
+ <dependency org="commons-daemon" name="commons-daemon" rev="1.0.14"
transitive="false">
+ <include type="jar" />
+ </dependency>
+ <dependency org="commons-io" name="commons-io" rev="1.4"
transitive="false">
+ <include type="jar" />
+ </dependency>
+ <dependency org="org.apache.geronimo.specs" name="geronimo-jpa_2.0_spec"
rev="1.1" transitive="false"/>
+ <dependency org="org.springframework" name="spring-context"
rev="3.1.1.RELEASE" transitive="false"/>
+ <dependency org="org.springframework" name="spring-beans"
rev="3.1.1.RELEASE"/>
+ <dependency org="org.springframework" name="spring-core"
rev="3.1.1.RELEASE"/>
+ <dependency org="ch.qos.logback" name="logback-core"
rev="1.0.9"/>
+ <dependency org="ch.qos.logback" name="logback-classic"
rev="1.0.9"/>
+
+ <!--
+ <dependency org="org.apache.mina" name="mina-core" rev="2.0.7"
transitive="false">
+ <include type="jar" />
+ </dependency>
+ -->
+ </dependencies>
+</ivy-module>
=======================================
--- /dev/null
+++ /branches/red5sip/ivysettings.xml Tue Mar 19 09:33:55 2013
@@ -0,0 +1,36 @@
+<?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.
+ -->
+<ivysettings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:noNamespaceSchemaLocation="ivysettings.xsd">
+ <settings defaultResolver="chain"/>
+ <resolvers>
+ <chain name="chain">
+ <ibiblio name="central" m2compatible="true"/>
+ <ibiblio name="apache-public" m2compatible="true"
root="https://repository.apache.org/content/groups/public"; />
+ <url name="mavencentral">
+ <artifact
pattern="http://repo1.maven.org/maven2/[organisation]/[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://openlaszlo-openmeetings-integration.googlecode.com/svn/repository/[artifact](-[revision]).[ext]"
/>
+ <artifact
pattern="http://openmeetings.googlecode.com/svn/repository/[artifact](-[revision]).[ext]"
/>
+ <artifact
pattern="http://red5.googlecode.com/svn/repository/[organisation]/[artifact]/[revision]/[artifact](-[revision]).[ext]"
/>
+ </url>
+ </chain>
+ </resolvers>
+</ivysettings>
=======================================
--- /dev/null
+++ /branches/red5sip/ivysettings.xsd Tue Mar 19 09:33:55 2013
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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.
+
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema";
elementFormDefault="qualified">
+ <xs:element name="ivysettings">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="settings"/>
+ <xs:element ref="resolvers"/>
+ <xs:element ref="triggers" minOccurs="0"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="settings">
+ <xs:complexType>
+ <xs:attribute name="defaultResolver" use="required"
type="xs:NCName"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="resolvers">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="chain"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="chain">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element maxOccurs="unbounded" ref="ibiblio"/>
+ <xs:element maxOccurs="unbounded" ref="url"/>
+ </xs:sequence>
+ <xs:attribute name="name" use="required" type="xs:NCName"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="ibiblio">
+ <xs:complexType>
+ <xs:attribute name="m2compatible" use="required" type="xs:boolean"/>
+ <xs:attribute name="name" use="required" type="xs:NCName"/>
+ <xs:attribute name="root" type="xs:anyURI"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="url">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element maxOccurs="unbounded" ref="artifact"/>
+ </xs:sequence>
+ <xs:attribute name="name" use="required" type="xs:NCName"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="artifact">
+ <xs:complexType>
+ <xs:attribute name="pattern" use="required"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="triggers">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="ant-call"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="ant-call">
+ <xs:complexType>
+ <xs:attribute name="event" use="required" type="xs:NCName"/>
+ <xs:attribute name="filter" use="required"/>
+ <xs:attribute name="prefix" use="required" type="xs:NCName"/>
+ <xs:attribute name="target" use="required" type="xs:NMTOKEN"/>
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
=======================================
--- /dev/null
+++ /branches/red5sip/lib/openmeetings-3.0.0-SNAPSHOT.jar Tue Mar 19
09:33:55 2013
File is too large to display a diff.
=======================================
--- /dev/null
+++ /branches/red5sip/lib/red5-client-1.0.2-SNAPSHOT.jar Tue Mar 19
09:33:55 2013
Binary file, no diff available.
=======================================
--- /dev/null
+++ /branches/red5sip/lib/red5-server.jar Tue Mar 19 09:33:55 2013
Binary file, no diff available.
=======================================
--- /branches/red5sip/lib/bcprov-jdk16-145.jar Fri Feb 10 07:37:46 2012
+++ /dev/null
File is too large to display a diff.
=======================================
--- /branches/red5sip/lib/cglib-2.2.2.jar Fri Feb 10 07:37:46 2012
+++ /dev/null
Binary file, no diff available.
=======================================
--- /branches/red5sip/lib/com.springsource.javax.xml.stream-1.0.1.jar Fri
Feb 10 07:37:46 2012
+++ /dev/null
Binary file, no diff available.
=======================================
--- /branches/red5sip/lib/com.springsource.org.antlr-3.1.3.jar Fri Feb 10
07:37:46 2012
+++ /dev/null
File is too large to display a diff.
=======================================
--- /branches/red5sip/lib/com.springsource.org.aopalliance-1.0.0.jar Fri
Feb 10 07:37:46 2012
+++ /dev/null
Binary file, no diff available.
=======================================
---
/branches/red5sip/lib/com.springsource.org.apache.commons.codec-1.4.0.jar
Fri Feb 10 07:37:46 2012
+++ /dev/null
Binary file, no diff available.
=======================================
---
/branches/red5sip/lib/com.springsource.org.apache.commons.collections-3.2.1.jar
Fri Feb 10 07:37:46 2012
+++ /dev/null
Binary file, no diff available.
=======================================
---
/branches/red5sip/lib/com.springsource.org.apache.commons.httpclient-3.1.0.jar
Fri Feb 10 07:37:46 2012
+++ /dev/null
Binary file, no diff available.
=======================================
---
/branches/red5sip/lib/com.springsource.org.apache.commons.lang-2.4.0.jar
Fri Feb 10 07:37:46 2012
+++ /dev/null
Binary file, no diff available.
=======================================
---
/branches/red5sip/lib/com.springsource.org.apache.commons.modeler-2.0.1.jar
Fri Feb 10 07:37:46 2012
+++ /dev/null
Binary file, no diff available.
=======================================
---
/branches/red5sip/lib/com.springsource.org.apache.commons.pool-1.5.3.jar
Fri Feb 10 07:37:46 2012
+++ /dev/null
Binary file, no diff available.
=======================================
--- /branches/red5sip/lib/com.springsource.org.apache.xerces-2.9.1.jar Fri
Feb 10 07:37:46 2012
+++ /dev/null
File is too large to display a diff.
=======================================
--- /branches/red5sip/lib/com.springsource.org.codehaus.groovy-1.7.0.jar
Fri Feb 10 07:37:46 2012
+++ /dev/null
File is too large to display a diff.
=======================================
---
/branches/red5sip/lib/com.springsource.org.mozilla.javascript-1.7.0.R2.jar
Fri Feb 10 07:37:46 2012
+++ /dev/null
Binary file, no diff available.
=======================================
--- /branches/red5sip/lib/com.springsource.org.objectweb.asm-3.2.0.jar Fri
Feb 10 07:37:46 2012
+++ /dev/null
Binary file, no diff available.
=======================================
---
/branches/red5sip/lib/com.springsource.org.objectweb.asm.commons-3.2.0.jar
Fri Feb 10 07:37:46 2012
+++ /dev/null
Binary file, no diff available.
=======================================
--- /branches/red5sip/lib/com.springsource.slf4j.api-1.6.1.jar Fri Feb 10
07:37:46 2012
+++ /dev/null
Binary file, no diff available.
=======================================
--- /branches/red5sip/lib/com.springsource.slf4j.bridge-1.6.1.jar Fri Feb
10 07:37:46 2012
+++ /dev/null
Binary file, no diff available.
=======================================
--- /branches/red5sip/lib/commons-beanutils-1.8.2.jar Fri Feb 10 07:37:46
2012
+++ /dev/null
Binary file, no diff available.
=======================================
--- /branches/red5sip/lib/commons-daemon-1.0.3.jar Fri Feb 10 07:37:46 2012
+++ /dev/null
Binary file, no diff available.
=======================================
--- /branches/red5sip/lib/commons-io-1.4.jar Fri Feb 10 07:37:46 2012
+++ /dev/null
Binary file, no diff available.
=======================================
--- /branches/red5sip/lib/ehcache-2.2.0.jar Fri Feb 10 07:37:46 2012
+++ /dev/null
Binary file, no diff available.
=======================================
--- /branches/red5sip/lib/geronimo-jpa_2.0_spec-1.1.jar Fri Feb 10 07:37:46
2012
+++ /dev/null
Binary file, no diff available.
=======================================
--- /branches/red5sip/lib/javaee-api-5.1.2.jar Fri Feb 10 07:37:46 2012
+++ /dev/null
File is too large to display a diff.
=======================================
--- /branches/red5sip/lib/jcl-over-slf4j-1.6.1.jar Fri Feb 10 07:37:46 2012
+++ /dev/null
Binary file, no diff available.
=======================================
--- /branches/red5sip/lib/libresample4j-1.0.jar Sun Feb 10 12:42:20 2013
+++ /dev/null
Binary file, no diff available.
=======================================
--- /branches/red5sip/lib/logback-classic-0.9.26.jar Fri Feb 10 07:37:46
2012
+++ /dev/null
Binary file, no diff available.
=======================================
--- /branches/red5sip/lib/logback-core-0.9.26.jar Fri Feb 10 07:37:46 2012
+++ /dev/null
Binary file, no diff available.
=======================================
--- /branches/red5sip/lib/mina-core-2.0.2.jar Fri Feb 10 07:37:46 2012
+++ /dev/null
Binary file, no diff available.
=======================================
--- /branches/red5sip/lib/openjpa-2.1.0.jar Fri Feb 10 07:37:46 2012
+++ /dev/null
File is too large to display a diff.
=======================================
--- /branches/red5sip/lib/openmeetings.jar Mon Feb 4 23:34:05 2013
+++ /dev/null
File is too large to display a diff.
=======================================
--- /branches/red5sip/lib/org.springframework.aop-3.0.5.RELEASE.jar Fri Feb
10 07:37:46 2012
+++ /dev/null
Binary file, no diff available.
=======================================
--- /branches/red5sip/lib/org.springframework.asm-3.0.5.RELEASE.jar Fri Feb
10 07:37:46 2012
+++ /dev/null
Binary file, no diff available.
=======================================
--- /branches/red5sip/lib/org.springframework.aspects-3.0.5.RELEASE.jar Fri
Feb 10 07:37:46 2012
+++ /dev/null
Binary file, no diff available.
=======================================
--- /branches/red5sip/lib/org.springframework.beans-3.0.5.RELEASE.jar Fri
Feb 10 07:37:46 2012
+++ /dev/null
Binary file, no diff available.
=======================================
--- /branches/red5sip/lib/org.springframework.context-3.0.5.RELEASE.jar Fri
Feb 10 07:37:46 2012
+++ /dev/null
Binary file, no diff available.
=======================================
---
/branches/red5sip/lib/org.springframework.context.support-3.0.5.RELEASE.jar
Fri Feb 10 07:37:46 2012
+++ /dev/null
Binary file, no diff available.
=======================================
--- /branches/red5sip/lib/org.springframework.core-3.0.5.RELEASE.jar Fri
Feb 10 07:37:46 2012
+++ /dev/null
Binary file, no diff available.
=======================================
--- /branches/red5sip/lib/org.springframework.expression-3.0.5.RELEASE.jar
Fri Feb 10 07:37:46 2012
+++ /dev/null
Binary file, no diff available.
=======================================
--- /branches/red5sip/lib/org.springframework.jdbc-3.0.5.RELEASE.jar Fri
Feb 10 07:37:46 2012
+++ /dev/null
Binary file, no diff available.
=======================================
--- /branches/red5sip/lib/org.springframework.orm-3.0.5.RELEASE.jar Fri Feb
10 07:37:46 2012
+++ /dev/null
Binary file, no diff available.
=======================================
--- /branches/red5sip/lib/org.springframework.test-3.0.5.RELEASE.jar Fri
Feb 10 07:37:46 2012
+++ /dev/null
Binary file, no diff available.
=======================================
--- /branches/red5sip/lib/org.springframework.transaction-3.0.5.RELEASE.jar
Fri Feb 10 07:37:46 2012
+++ /dev/null
Binary file, no diff available.
=======================================
***Additional files exist in this changeset.***
