Author: solomax
Date: Mon Sep 10 06:51:24 2012
New Revision: 1382658
URL: http://svn.apache.org/viewvc?rev=1382658&view=rev
Log:
Package org.openmeetings is finally eliminated;
Red5 version is bumped (RTMPT and NetStream were fixed)
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/web.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/screensharing/logback.xml
incubator/openmeetings/trunk/singlewebapp/build.properties
incubator/openmeetings/trunk/singlewebapp/build.xml
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/emotes/TestChatParsing.java
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml?rev=1382658&r1=1382657&r2=1382658&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
Mon Sep 10 06:51:24 2012
@@ -46,7 +46,7 @@
<tx:annotation-driven transaction-manager="jpaTransactionManager" />
<context:annotation-config />
- <context:component-scan base-package="org.openmeetings" />
+ <context:component-scan base-package="org.apache.openmeetings" />
<!-- New Class for the Streaming Handlers -->
<bean id="web.handler"
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/web.xml?rev=1382658&r1=1382657&r2=1382658&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/web.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/web.xml Mon
Sep 10 06:51:24 2012
@@ -133,10 +133,6 @@
<load-on-startup>1</load-on-startup>
</servlet>
<servlet>
- <servlet-name>ServerUDP</servlet-name>
-
<servlet-class>org.openmeetings.server.servlets.ServerOutputHandler</servlet-class>
- </servlet>
- <servlet>
<servlet-name>Calendar</servlet-name>
<servlet-class>org.apache.openmeetings.servlet.outputhandler.CalendarServlet</servlet-class>
</servlet>
@@ -190,10 +186,6 @@
<servlet-name>AxisServlet</servlet-name>
<url-pattern>/services/*</url-pattern>
</servlet-mapping>
- <servlet-mapping>
- <servlet-name>ServerUDP</servlet-name>
- <url-pattern>/serverUDP</url-pattern>
- </servlet-mapping>
<servlet-mapping>
<servlet-name>Calendar</servlet-name>
<url-pattern>/Calendar</url-pattern>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/screensharing/logback.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/screensharing/logback.xml?rev=1382658&r1=1382657&r2=1382658&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/screensharing/logback.xml
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/screensharing/logback.xml
Mon Sep 10 06:51:24 2012
@@ -42,7 +42,7 @@
<pattern>%5p %d{MM-dd HH:mm:ss.SSS } %F %r %L %c [%t] - %m%n</pattern>
</layout>
</appender>
- <logger name="org.openmeetings">
+ <logger name="org.apache.openmeetings">
<level value="DEBUG"/>
</logger>
<root>
Modified: incubator/openmeetings/trunk/singlewebapp/build.properties
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/build.properties?rev=1382658&r1=1382657&r2=1382658&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/build.properties (original)
+++ incubator/openmeetings/trunk/singlewebapp/build.properties Mon Sep 10
06:51:24 2012
@@ -1,7 +1,7 @@
project.version=2.1.0
project.status=SNAPSHOT
ivy.install.version=2.3.0-rc1
-red5.server.revision=4393
-red5.client.revision=4393
+red5.server.revision=4414
+red5.client.revision=4414
laszlo.proxied=solo
db=derby
Modified: incubator/openmeetings/trunk/singlewebapp/build.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/build.xml?rev=1382658&r1=1382657&r2=1382658&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/build.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/build.xml Mon Sep 10 06:51:24 2012
@@ -560,15 +560,6 @@
<copy file="NOTICE" tofile="${main.out.dir}/META-INF/NOTICE"
overwrite="true" />
</target>
- <target name="doStartServer" depends="compile">
- <junit>
- <classpath refid="compile.classpath" />
- <formatter type="plain" />
-
- <test name="org.openmeetings.server.TestSocket" />
- </junit>
- </target>
-
<path id="jpa.enhancement.classpath">
<pathelement path="${main.out.dir}" />
<path refid="compile.classpath" />
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/emotes/TestChatParsing.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/emotes/TestChatParsing.java?rev=1382658&r1=1382657&r2=1382658&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/emotes/TestChatParsing.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/emotes/TestChatParsing.java
Mon Sep 10 06:51:24 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.openmeetings.test.emotes;
+package org.apache.openmeetings.test.emotes;
import java.util.LinkedList;
