You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2016/10/14 07:00:14 UTC
svn commit: r1764820 - in /openmeetings/application:
branches/3.1.x/openmeetings-screenshare/src/main/jnlp/templates/
branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/
branches/3.2.x/openmeetings-screenshare/src/main/jnlp/templates/
branches/3.2...
Author: solomax
Date: Fri Oct 14 07:00:13 2016
New Revision: 1764820
URL: http://svn.apache.org/viewvc?rev=1764820&view=rev
Log:
no jira: code clean-up
Removed:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/velocity.properties
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/WEB-INF/velocity.properties
openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/velocity.properties
Modified:
openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/jnlp/templates/template.jnlp
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/red5-web.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/web.xml
openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/jnlp/templates/template.jnlp
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/WEB-INF/red5-web.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/WEB-INF/web.xml
openmeetings/application/trunk/openmeetings-screenshare/src/main/jnlp/templates/template.jnlp
openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/red5-web.xml
openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/web.xml
Modified: openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/jnlp/templates/template.jnlp
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/jnlp/templates/template.jnlp?rev=1764820&r1=1764819&r2=1764820&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/jnlp/templates/template.jnlp (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/jnlp/templates/template.jnlp Fri Oct 14 07:00:13 2016
@@ -33,7 +33,7 @@
</security>
<resources>
<j2se version='1.8+'/>
- <jar href="bcprov-jdk15on-1.55.jar" main="true"/>
+ <jar href="bcprov-jdk15on-1.55.jar"/>
<jar href="openmeetings-screenshare-${project.version}-full.jar" main="true"/>
</resources>
<application-desc main-class='org.apache.openmeetings.screenshare.Core'>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/red5-web.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/red5-web.xml?rev=1764820&r1=1764819&r2=1764820&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/red5-web.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/red5-web.xml Fri Oct 14 07:00:13 2016
@@ -9,7 +9,7 @@
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
@@ -19,15 +19,15 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+
<bean id="placeholderConfig" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
- <property name="location" value="/WEB-INF/red5-web.properties" />
+ <property name="location" value="/WEB-INF/red5-web.properties" />
</bean>
-
+
<bean id="web.context" class="org.red5.server.Context" autowire="byType" />
-
+
<bean id="web.scope" class="org.red5.server.scope.WebScope" init-method="register">
<property name="server" ref="red5.server" />
<property name="parent" ref="global.scope" />
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/web.xml?rev=1764820&r1=1764819&r2=1764820&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/web.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/web.xml Fri Oct 14 07:00:13 2016
@@ -19,16 +19,17 @@
-->
<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
<context-param>
<param-name>globalScope</param-name>
<param-value>default</param-value>
</context-param>
-
+
<listener>
<listener-class>org.apache.openmeetings.util.OMContextListener</listener-class>
</listener>
-
+
<servlet>
<servlet-name>CXFServlet</servlet-name>
<servlet-class>org.apache.cxf.transport.servlet.CXFServlet</servlet-class>
@@ -43,18 +44,18 @@
<servlet-name>CXFServlet</servlet-name>
<url-pattern>/services/*</url-pattern>
</servlet-mapping>
-
+
<filter>
<filter-name>LoggerContextFilter</filter-name>
<filter-class>org.red5.logging.LoggerContextFilter</filter-class>
<async-supported>true</async-supported>
</filter>
-
+
<filter-mapping>
<filter-name>LoggerContextFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
-
+
<filter>
<filter-name>OpenmeetingsApplication</filter-name>
<filter-class>org.apache.wicket.protocol.ws.javax.JavaxWebSocketFilter</filter-class>
@@ -89,7 +90,7 @@
<param-name>parentContextKey</param-name>
<param-value>default.context</param-value>
</context-param>
-
+
<!-- remove the following servlet tags if you want to disable remoting for this application -->
<servlet>
<servlet-name>gateway</servlet-name>
@@ -100,7 +101,7 @@
<servlet-class>org.apache.openmeetings.core.servlet.outputhandler.DownloadHandler</servlet-class>
<async-supported>true</async-supported>
</servlet>
-
+
<servlet-mapping>
<servlet-name>DownloadHandler</servlet-name>
<url-pattern>/DownloadHandler</url-pattern>
@@ -109,7 +110,7 @@
<extension>inc</extension>
<mime-type>text/plain</mime-type>
</mime-mapping>
-
+
<security-constraint>
<web-resource-collection>
<web-resource-name>Forbidden</web-resource-name>
@@ -129,7 +130,4 @@
</web-resource-collection>
<auth-constraint/>
</security-constraint>
- <login-config>
- <auth-method>BASIC</auth-method>
- </login-config>
</web-app>
Modified: openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/jnlp/templates/template.jnlp
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/jnlp/templates/template.jnlp?rev=1764820&r1=1764819&r2=1764820&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/jnlp/templates/template.jnlp (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/jnlp/templates/template.jnlp Fri Oct 14 07:00:13 2016
@@ -33,7 +33,7 @@
</security>
<resources>
<j2se version='1.8+'/>
- <jar href="bcprov-jdk15on-1.55.jar" main="true"/>
+ <jar href="bcprov-jdk15on-1.55.jar"/>
<jar href="openmeetings-screenshare-${project.version}-full.jar" main="true"/>
</resources>
<application-desc main-class='org.apache.openmeetings.screenshare.Core'>
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/WEB-INF/red5-web.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/WEB-INF/red5-web.xml?rev=1764820&r1=1764819&r2=1764820&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/WEB-INF/red5-web.xml (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/WEB-INF/red5-web.xml Fri Oct 14 07:00:13 2016
@@ -9,7 +9,7 @@
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
@@ -19,15 +19,15 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+
<bean id="placeholderConfig" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
- <property name="location" value="/WEB-INF/red5-web.properties" />
+ <property name="location" value="/WEB-INF/red5-web.properties" />
</bean>
-
+
<bean id="web.context" class="org.red5.server.Context" autowire="byType" />
-
+
<bean id="web.scope" class="org.red5.server.scope.WebScope" init-method="register">
<property name="server" ref="red5.server" />
<property name="parent" ref="global.scope" />
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/WEB-INF/web.xml?rev=1764820&r1=1764819&r2=1764820&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/WEB-INF/web.xml (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/WEB-INF/web.xml Fri Oct 14 07:00:13 2016
@@ -19,16 +19,17 @@
-->
<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
<context-param>
<param-name>globalScope</param-name>
<param-value>default</param-value>
</context-param>
-
+
<listener>
<listener-class>org.apache.openmeetings.util.OMContextListener</listener-class>
</listener>
-
+
<servlet>
<servlet-name>CXFServlet</servlet-name>
<servlet-class>org.apache.cxf.transport.servlet.CXFServlet</servlet-class>
@@ -43,18 +44,18 @@
<servlet-name>CXFServlet</servlet-name>
<url-pattern>/services/*</url-pattern>
</servlet-mapping>
-
+
<filter>
<filter-name>LoggerContextFilter</filter-name>
<filter-class>org.red5.logging.LoggerContextFilter</filter-class>
<async-supported>true</async-supported>
</filter>
-
+
<filter-mapping>
<filter-name>LoggerContextFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
-
+
<filter>
<filter-name>OpenmeetingsApplication</filter-name>
<filter-class>org.apache.wicket.protocol.ws.javax.JavaxWebSocketFilter</filter-class>
@@ -69,7 +70,7 @@
</init-param>
<init-param>
<param-name>ignorePaths</param-name>
- <param-value>conf,css,default,docs,images,js,persistence,public,screenshare,streams,upload,services</param-value>
+ <param-value>conf,css,default,docs,images,js,persistence,public,screenshare,streams,upload,uploadtemp,services,DownloadHandler</param-value>
</init-param>
</filter>
<filter-mapping>
@@ -89,7 +90,7 @@
<param-name>parentContextKey</param-name>
<param-value>default.context</param-value>
</context-param>
-
+
<!-- remove the following servlet tags if you want to disable remoting for this application -->
<servlet>
<servlet-name>gateway</servlet-name>
@@ -100,7 +101,7 @@
<extension>inc</extension>
<mime-type>text/plain</mime-type>
</mime-mapping>
-
+
<security-constraint>
<web-resource-collection>
<web-resource-name>Forbidden</web-resource-name>
@@ -120,7 +121,4 @@
</web-resource-collection>
<auth-constraint/>
</security-constraint>
- <login-config>
- <auth-method>BASIC</auth-method>
- </login-config>
</web-app>
Modified: openmeetings/application/trunk/openmeetings-screenshare/src/main/jnlp/templates/template.jnlp
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-screenshare/src/main/jnlp/templates/template.jnlp?rev=1764820&r1=1764819&r2=1764820&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-screenshare/src/main/jnlp/templates/template.jnlp (original)
+++ openmeetings/application/trunk/openmeetings-screenshare/src/main/jnlp/templates/template.jnlp Fri Oct 14 07:00:13 2016
@@ -33,7 +33,7 @@
</security>
<resources>
<j2se version='1.8+'/>
- <jar href="bcprov-jdk15on-1.55.jar" main="true"/>
+ <jar href="bcprov-jdk15on-1.55.jar"/>
<jar href="openmeetings-screenshare-${project.version}-full.jar" main="true"/>
</resources>
<application-desc main-class='org.apache.openmeetings.screenshare.Core'>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/red5-web.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/red5-web.xml?rev=1764820&r1=1764819&r2=1764820&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/red5-web.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/red5-web.xml Fri Oct 14 07:00:13 2016
@@ -9,7 +9,7 @@
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
@@ -19,15 +19,15 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+
<bean id="placeholderConfig" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
- <property name="location" value="/WEB-INF/red5-web.properties" />
+ <property name="location" value="/WEB-INF/red5-web.properties" />
</bean>
-
+
<bean id="web.context" class="org.red5.server.Context" autowire="byType" />
-
+
<bean id="web.scope" class="org.red5.server.scope.WebScope" init-method="register">
<property name="server" ref="red5.server" />
<property name="parent" ref="global.scope" />
Modified: openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/web.xml?rev=1764820&r1=1764819&r2=1764820&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/web.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/web.xml Fri Oct 14 07:00:13 2016
@@ -19,16 +19,17 @@
-->
<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
<context-param>
<param-name>globalScope</param-name>
<param-value>default</param-value>
</context-param>
-
+
<listener>
<listener-class>org.apache.openmeetings.util.OMContextListener</listener-class>
</listener>
-
+
<servlet>
<servlet-name>CXFServlet</servlet-name>
<servlet-class>org.apache.cxf.transport.servlet.CXFServlet</servlet-class>
@@ -43,18 +44,18 @@
<servlet-name>CXFServlet</servlet-name>
<url-pattern>/services/*</url-pattern>
</servlet-mapping>
-
+
<filter>
<filter-name>LoggerContextFilter</filter-name>
<filter-class>org.red5.logging.LoggerContextFilter</filter-class>
<async-supported>true</async-supported>
</filter>
-
+
<filter-mapping>
<filter-name>LoggerContextFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
-
+
<filter>
<filter-name>OpenmeetingsApplication</filter-name>
<filter-class>org.apache.wicket.protocol.ws.javax.JavaxWebSocketFilter</filter-class>
@@ -69,7 +70,7 @@
</init-param>
<init-param>
<param-name>ignorePaths</param-name>
- <param-value>conf,css,default,docs,images,js,persistence,public,screenshare,streams,upload,services</param-value>
+ <param-value>conf,css,default,docs,images,js,persistence,public,screenshare,streams,upload,uploadtemp,services,DownloadHandler</param-value>
</init-param>
</filter>
<filter-mapping>
@@ -89,7 +90,7 @@
<param-name>parentContextKey</param-name>
<param-value>default.context</param-value>
</context-param>
-
+
<!-- remove the following servlet tags if you want to disable remoting for this application -->
<servlet>
<servlet-name>gateway</servlet-name>
@@ -100,7 +101,7 @@
<extension>inc</extension>
<mime-type>text/plain</mime-type>
</mime-mapping>
-
+
<security-constraint>
<web-resource-collection>
<web-resource-name>Forbidden</web-resource-name>
@@ -120,7 +121,4 @@
</web-resource-collection>
<auth-constraint/>
</security-constraint>
- <login-config>
- <auth-method>BASIC</auth-method>
- </login-config>
</web-app>