Author: solomax
Date: Fri Jun 3 10:55:59 2016
New Revision: 1746708
URL: http://svn.apache.org/viewvc?rev=1746708&view=rev
Log:
[OPENMEETINGS-1414] spring-mvc and batik are removed
Added:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/restCall.lzx
- copied, changed from r1746707,
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/restCall.lzx
openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/NetTestWebService.java
- copied unchanged from r1746687,
openmeetings/application/branches/3.2.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/NetTestWebService.java
Removed:
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/batik/
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/BatikMethods.java
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/WhiteboardMapToSVG.java
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/PrintService.java
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/ExportToImage.java
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/NetworkTestingController.java
openmeetings/application/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/jai/TestSVGTextExporterArrow.java
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/restCall.lzx
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/spring-mvc-servlet.xml
Modified:
openmeetings/application/branches/3.1.x/openmeetings-core/pom.xml
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/library.lzx
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/library.lzx
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/networkTesting/networktesting.lzx
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/networkTesting/tests/BaseURLLoadTest.lzx
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/networkTesting/tests/PortAvailabilityTest.lzx
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/networkTesting/tests/UploadSpeedTest.lzx
openmeetings/application/branches/3.1.x/openmeetings-web/pom.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/web.xml
openmeetings/application/branches/3.1.x/pom.xml
Modified: openmeetings/application/branches/3.1.x/openmeetings-core/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/pom.xml?rev=1746708&r1=1746707&r2=1746708&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-core/pom.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-core/pom.xml Fri Jun
3 10:55:59 2016
@@ -74,19 +74,6 @@
<version>1.4.9</version>
</dependency>
<dependency>
- <groupId>org.apache.xmlgraphics</groupId>
- <artifactId>batik-svg-dom</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.xmlgraphics</groupId>
- <artifactId>batik-svggen</artifactId>
- <version>${batik.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.xmlgraphics</groupId>
- <artifactId>batik-transcoder</artifactId>
- </dependency>
- <dependency>
<groupId>org.smslib</groupId>
<artifactId>smslib</artifactId>
<version>${smslib.version}</version>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java?rev=1746708&r1=1746707&r2=1746708&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
Fri Jun 3 10:55:59 2016
@@ -154,7 +154,7 @@ public class ScopeApplicationAdapter ext
}
@SuppressWarnings("unchecked")
- private Map<String, Object> getConnParams(Object[] params) {
+ private static Map<String, Object> getConnParams(Object[] params) {
if (params != null && params.length > 0) {
return (Map<String, Object>)params[0];
}
@@ -185,6 +185,9 @@ public class ScopeApplicationAdapter ext
return rejectClient();
}
}
+ if ("networktest".equals(uid)) {
+ return true;
+ }
Client parentClient = null;
//TODO add similar code for other connections
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/library.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/library.lzx?rev=1746708&r1=1746707&r2=1746708&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/library.lzx
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/library.lzx
Fri Jun 3 10:55:59 2016
@@ -23,4 +23,5 @@
<include href="baseVideoStream.lzx" />
<include href="baseVideoStreamDevice.lzx" />
<include href="rtmpConnection.lzx" />
+ <include href="restCall.lzx" />
</library>
Copied:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/restCall.lzx
(from r1746707,
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/restCall.lzx)
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/restCall.lzx?p2=openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/restCall.lzx&p1=openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/restCall.lzx&r1=1746707&r2=1746708&rev=1746708&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/restCall.lzx
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/restCall.lzx
Fri Jun 3 10:55:59 2016
@@ -218,11 +218,12 @@
}
}
- public function load(vars):void {
+ public function load(vars):URLRequest {
var request:URLRequest = new URLRequest(url +
'?sid=' + canvas.sessionId); //FIXME TODO
request.method = method;
if (contentType) {
- request.contentType = contentType;
+ var header:URLRequestHeader = new
URLRequestHeader('Content-type', contentType);
+ request.requestHeaders.push(header);
}
for (var i = 0; i < hdrs.length; ++i) {
request.requestHeaders.push(hdrs[i]);
@@ -234,7 +235,9 @@
requestor.load(request);
} catch (e:Error) {
if ($debug) Debug.error(e);
+ errorCallback(e);
}
+ return request;
}
}
]]>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/library.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/library.lzx?rev=1746708&r1=1746707&r2=1746708&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/library.lzx
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/library.lzx
Fri Jun 3 10:55:59 2016
@@ -27,7 +27,6 @@
<include href="dynamicFileName.lzx" />
<include href="dragItemFileExplorer.lzx" />
<include href="fileExplorer.lzx" />
- <include href="restCall.lzx" />
<resource name="drag_n_drop_rsc">
<!-- APL Author sebawagner -->
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/networkTesting/networktesting.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/networkTesting/networktesting.lzx?rev=1746708&r1=1746707&r2=1746708&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/networkTesting/networktesting.lzx
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/networkTesting/networktesting.lzx
Fri Jun 3 10:55:59 2016
@@ -41,6 +41,8 @@
</switch>
<include href="testsView.lzx" />
+ <include href="../base/remote/restCall.lzx" />
+
<handler name="oninit"><![CDATA[
flash.external.ExternalInterface.call("loadingComplete");
doDebugInit();
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/networkTesting/tests/BaseURLLoadTest.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/networkTesting/tests/BaseURLLoadTest.lzx?rev=1746708&r1=1746707&r2=1746708&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/networkTesting/tests/BaseURLLoadTest.lzx
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/networkTesting/tests/BaseURLLoadTest.lzx
Fri Jun 3 10:55:59 2016
@@ -49,7 +49,7 @@
<attribute name="loader" value="null" />
<method name="initLoader">
- hostUrl = getBaseUrl() + "networktest.upload?testType=" +
testTypeParameter;
+ hostUrl = getBaseUrl() + "services/networktest?type=" +
testTypeParameter;
request = new URLRequest(hostUrl);
loader = new URLLoader();
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/networkTesting/tests/PortAvailabilityTest.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/networkTesting/tests/PortAvailabilityTest.lzx?rev=1746708&r1=1746707&r2=1746708&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/networkTesting/tests/PortAvailabilityTest.lzx
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/networkTesting/tests/PortAvailabilityTest.lzx
Fri Jun 3 10:55:59 2016
@@ -43,6 +43,7 @@
rtmp.setAttribute("src", hostUrl);
this.log(": start test... " + hostUrl);
+ canvas.publicSID = "networktest";
rtmp.connect();
</method>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/networkTesting/tests/UploadSpeedTest.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/networkTesting/tests/UploadSpeedTest.lzx?rev=1746708&r1=1746707&r2=1746708&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/networkTesting/tests/UploadSpeedTest.lzx
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/networkTesting/tests/UploadSpeedTest.lzx
Fri Jun 3 10:55:59 2016
@@ -36,6 +36,7 @@
<attribute name="hostUrl" type="string" value="" />
<attribute name="loaderInited" type="boolean" value="false" />
+ <attribute name="vars" value="null" />
<attribute name="request" value="null" />
<attribute name="loader" value="null" />
@@ -45,27 +46,31 @@
</handler>
<method name="initLoader">
- hostUrl = getBaseUrl() + "networktest.upload";
- request = new URLRequest(hostUrl);
- request.method = URLRequestMethod.POST;
- request.data = getDataString();
-
- loader = new URLLoader();
- loader.addEventListener(Event.COMPLETE, this.onComplete);
- loader.addEventListener(IOErrorEvent.IO_ERROR, this.onError);
- loader.addEventListener(SecurityErrorEvent.SECURITY_ERROR,
this.onError);
-
+ hostUrl = getBaseUrl() + "services/networktest";
+ loader = new RestCall({
+ url: hostUrl
+ , method: URLRequestMethod.POST
+ , dataFormat: URLLoaderDataFormat.BINARY
+ , contentType: "multipart/form-data; charset=utf-8;
boundary=" + UploadPostHelper.getBoundary()
+ , errorCallback: onError
+ , successCallback: onComplete
+ });
+ vars = UploadPostHelper.getPostData('aaa', getData());
+ if ($debug) Debug.write("initLoader:: ");//, vars
loaderInited = true;
</method>
<method name="start">
+ if ($debug) Debug.write("start:: ", request);
if (!loaderInited) {
this.initLoader();
}
+ if ($debug) Debug.write("going to start:: ", loader);
this.log("start test... " + hostUrl);
startTime = getTimer();
- loader.load(request);
+ request = loader.load(vars);
+ if ($debug) Debug.write("load:: ", request);
</method>
<method name="forcedStop">
@@ -74,6 +79,7 @@
</method>
<method name="onComplete" args="e">
+ if ($debug) Debug.write("onComplete:: ", e);
if (running) {
var endTime = getTimer();
var loadTime = endTime - startTime;
@@ -94,6 +100,7 @@
</method>
<method name="onError" args="e">
+ if ($debug) Debug.write("onError:: ", e);
if (running) {
this.log("error - " + e);
this.setFailed();
@@ -101,15 +108,15 @@
</method>
<!-- returns a 1 Mb string-->
- <method name="getDataString">
- <![CDATA[
- var result = "";
- var str64 =
"0000000000000000000000000000000000000000000000000000000000000000";
- for (var i=0; i<16384; i++) {
- result += str64;
+ <method name="getData">
+ <![CDATA[
+ var result:ByteArray = new ByteArray();
+ for (var i = 0; i < 64 * 16384; ++i) {
+ result.writeByte(i % 256);
}
+ result.position = 0;
return result;
- ]]>
+ ]]>
</method>
</class>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/pom.xml?rev=1746708&r1=1746707&r2=1746708&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/pom.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/pom.xml Fri Jun 3
10:55:59 2016
@@ -553,10 +553,6 @@
<groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
</dependency>
- <dependency> <!-- TODO most probably should be removed -->
- <groupId>org.springframework</groupId>
- <artifactId>spring-webmvc</artifactId>
- </dependency>
<dependency>
<groupId>org.wicketstuff</groupId>
<artifactId>wicketstuff-dashboard-core</artifactId>
@@ -699,5 +695,11 @@
<version>${derby.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>1.4.01</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml?rev=1746708&r1=1746707&r2=1746708&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml
Fri Jun 3 10:55:59 2016
@@ -21,7 +21,6 @@
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:tx="http://www.springframework.org/schema/tx";
- xmlns:mvc="http://www.springframework.org/schema/mvc";
xmlns:context="http://www.springframework.org/schema/context";
xmlns:jaxrs="http://cxf.apache.org/jaxrs";
xmlns:jaxws="http://cxf.apache.org/jaxws";
@@ -29,7 +28,6 @@
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/tx
http://www.springframework.org/schema/tx/spring-tx.xsd
- http://www.springframework.org/schema/mvc
http://www.springframework.org/schema/mvc/spring-mvc.xsd
http://cxf.apache.org/jaxws
http://cxf.apache.org/schemas/jaxws.xsd
http://cxf.apache.org/jaxrs
http://cxf.apache.org/schemas/jaxrs.xsd";
>
@@ -39,13 +37,8 @@
<bean id="transactionManager"
class="org.springframework.orm.jpa.JpaTransactionManager">
<property name="entityManagerFactory"
ref="entityManagerFactory" />
</bean>
-
<bean
class="org.springframework.orm.jpa.support.PersistenceAnnotationBeanPostProcessor"
/>
- <bean id="multipartResolver"
class="org.springframework.web.multipart.commons.CommonsMultipartResolver" />
- <!-- Configures the @Controller programming model -->
- <mvc:annotation-driven />
-
<tx:annotation-driven transaction-manager="transactionManager"
proxy-target-class="true" />
<context:annotation-config />
<context:component-scan base-package="org.apache.openmeetings" />
@@ -84,7 +77,6 @@
<!-- Start of Services -->
<bean id="xmlcrm.service"
class="org.apache.openmeetings.core.remote.MainService" />
- <bean id="printservice.service"
class="org.apache.openmeetings.core.remote.PrintService" />
<bean id="languageservice.service"
class="org.apache.openmeetings.core.remote.LanguageService" />
<bean id="invitationservice.service"
class="org.apache.openmeetings.core.remote.InvitationService" />
<bean id="whiteboardservice.service"
class="org.apache.openmeetings.core.remote.WhiteBoardService" />
@@ -276,6 +268,7 @@
<bean id="roomWebService"
class="org.apache.openmeetings.webservice.RoomWebService" />
<bean id="serverWebService"
class="org.apache.openmeetings.webservice.ServerWebService" />
<bean id="userWebService"
class="org.apache.openmeetings.webservice.UserWebService" />
+ <bean id="netTestWebService"
class="org.apache.openmeetings.webservice.NetTestWebService" />
<!-- (writeXsiType=false) -->
<jaxrs:server id="server" address="/">
@@ -288,6 +281,7 @@
<ref bean="roomWebService"/>
<ref bean="serverWebService"/>
<ref bean="userWebService"/>
+ <ref bean="netTestWebService"/> <!-- JaxRs only -->
</jaxrs:serviceBeans>
</jaxrs:server>
<jaxws:endpoint id="calendarServiceWS" address="/CalendarService"
implementor="#calendarWebService"/>
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=1746708&r1=1746707&r2=1746708&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 Jun 3 10:55:59 2016
@@ -51,7 +51,7 @@
<filter-mapping>
<filter-name>LoggerContextFilter</filter-name>
<url-pattern>/*</url-pattern>
- </filter-mapping>
+ </filter-mapping>
<filter>
<filter-name>OpenmeetingsApplication</filter-name>
@@ -66,7 +66,7 @@
</init-param>
<init-param>
<param-name>ignorePaths</param-name>
-
<param-value>conf,css,default,docs,images,js,persistence,public,screenshare,streams,upload,uploadtemp,services,networktest.,DownloadHandler</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,10 +89,6 @@
<!-- remove the following servlet tags if you want to disable remoting
for this application -->
<servlet>
- <servlet-name>spring-mvc</servlet-name>
-
<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
- </servlet>
- <servlet>
<servlet-name>gateway</servlet-name>
<servlet-class>org.red5.server.net.servlet.AMFGatewayServlet</servlet-class>
</servlet>
@@ -100,23 +96,11 @@
<servlet-name>DownloadHandler</servlet-name>
<servlet-class>org.apache.openmeetings.core.servlet.outputhandler.DownloadHandler</servlet-class>
</servlet>
- <servlet>
- <servlet-name>ExportToImage</servlet-name>
-
<servlet-class>org.apache.openmeetings.core.servlet.outputhandler.ExportToImage</servlet-class>
- </servlet>
<servlet-mapping>
- <servlet-name>spring-mvc</servlet-name>
- <url-pattern>*.upload</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
<servlet-name>DownloadHandler</servlet-name>
<url-pattern>/DownloadHandler</url-pattern>
</servlet-mapping>
- <servlet-mapping>
- <servlet-name>ExportToImage</servlet-name>
- <url-pattern>/ExportToImage</url-pattern>
- </servlet-mapping>
<mime-mapping>
<extension>inc</extension>
<mime-type>text/plain</mime-type>
Modified: openmeetings/application/branches/3.1.x/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/pom.xml?rev=1746708&r1=1746707&r2=1746708&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/pom.xml (original)
+++ openmeetings/application/branches/3.1.x/pom.xml Fri Jun 3 10:55:59 2016
@@ -46,7 +46,6 @@
<wickets.version>7.3.0</wickets.version>
<red5-server.version>1.0.8-M2</red5-server.version>
<red5-client.version>1.0.8-M2</red5-client.version>
- <batik.version>1.8</batik.version>
<commons-transaction.version>1.2</commons-transaction.version>
<ical4j.version>2.0-beta1</ical4j.version>
<cxf.version>3.1.6</cxf.version>
@@ -485,28 +484,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency> <!-- TODO most probably should be removed
-->
- <groupId>org.springframework</groupId>
- <artifactId>spring-webmvc</artifactId>
- <version>${spring.version}</version>
- <exclusions>
- <exclusion>
-
<groupId>commons-logging</groupId>
-
<artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.xmlgraphics</groupId>
- <artifactId>batik-transcoder</artifactId>
- <version>${batik.version}</version>
- <exclusions>
- <exclusion>
-
<groupId>commons-logging</groupId>
-
<artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>commons-transaction</groupId>
<artifactId>commons-transaction</artifactId>
@@ -612,24 +589,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.xmlgraphics</groupId>
- <artifactId>batik-svg-dom</artifactId>
- <version>${batik.version}</version>
- <exclusions>
- <exclusion>
-
<artifactId>xml-apis-ext</artifactId>
- <groupId>xml-apis</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <!-- dependency>
- <groupId>org.apache.flex</groupId>
- <artifactId>framework</artifactId>
- <version>4.12.0.20140303</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency-->
- <dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-servlet-api</artifactId>
<version>${tomcat.version}</version>
