From aff849da4fe7d36562d0868fdc4eb20445b9450c Mon Sep 17 00:00:00 2001
From: Christoph Thelen <christoph.thelen@mni.thm.de>
Date: Wed, 2 Oct 2013 15:19:46 +0200
Subject: [PATCH] Removed dependencies that are not relevant for ecollab.eu
---
pom.xml | 13 -------------
src/main/webapp/WEB-INF/spring/spring-main.xml | 6 ++----
2 files changed, 2 insertions(+), 17 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9b5f46045..73b2e9d50 100644
--- a/pom.xml
+++ b/pom.xml
@@ -135,12 +135,6 @@
</repositories>
<dependencies>
- <dependency>
- <groupId>de.thm.arsnova</groupId>
- <artifactId>arsnova-light-js</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <type>war</type>
- </dependency>
<dependency>
<groupId>de.thm.arsnova</groupId>
<artifactId>arsnova-st2-js-ecollab</artifactId>
@@ -318,13 +312,6 @@
<artifactId>connector-client</artifactId>
<version>0.14.0-SNAPSHOT</version>
</dependency>
-
- <!-- Needed to allow cross origin requests to the API -->
- <dependency>
- <groupId>de.thm.utils</groupId>
- <artifactId>http-utils</artifactId>
- <version>0.1.0-SNAPSHOT</version>
- </dependency>
</dependencies>
<build>
<plugins>
diff --git a/src/main/webapp/WEB-INF/spring/spring-main.xml b/src/main/webapp/WEB-INF/spring/spring-main.xml
index b8d4d6692..505764fa4 100644
--- a/src/main/webapp/WEB-INF/spring/spring-main.xml
+++ b/src/main/webapp/WEB-INF/spring/spring-main.xml
@@ -54,11 +54,9 @@
<!-- Example of connector client configuration -->
<!-- Uncomment bean definition to activate connector -->
- <bean id="connectorClient" scope="singleton" class="de.thm.arsnova.connector.client.ConnectorClientImpl">
+ <!-- bean id="connectorClient" scope="singleton" class="de.thm.arsnova.connector.client.ConnectorClientImpl">
<property name="serviceLocation" value="${connector.uri}"></property>
<property name="username" value="${connector.username}"></property>
<property name="password" value="${connector.password}"></property>
- </bean>
-
- <http:access-control allow-origin="*" allow-methods="GET" />
+ </bean -->
</beans>
--
GitLab