ambiser
/
openvidu
mirror of https://github.com/OpenVidu/openvidu.git
8
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Configuration parameters updated. JAR building process fixed by pom.xml

pull/3/merge
pabloFuente 2017-05-05 18:47:52 +02:00
parent abe526365d
commit 76a7531a69
6 changed files with 9814 additions and 9398 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openvidu-browser/src/main/resources/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "openvidu-browser", "name": "openvidu-browser",
"version": "0.1.1", "version": "0.2.0",
"description": "OpenVidu Browser", "description": "OpenVidu Browser",
"main": "lib/index.js", "main": "lib/index.js",
"types": "lib/index.d.ts", "types": "lib/index.d.ts",

19135
openvidu-browser/src/main/resources/static/js/OpenViduTokBox.js
View File

File diff suppressed because one or more lines are too long

2
openvidu-demo/src/main/java/org/openvidu/demo/DemoJsonRpcUserControl.java
View File

@ -54,7 +54,7 @@ public class DemoJsonRpcUserControl extends JsonRpcUserControl {
private SortedMap<Integer, String> markerUrls; private SortedMap<Integer, String> markerUrls;
public DemoJsonRpcUserControl(NotificationRoomManager roomManager) { public DemoJsonRpcUserControl(NotificationRoomManager roomManager) {
super(roomManager); //super(roomManager);
} }
public void setFilterType(KmsFilterType type) { public void setFilterType(KmsFilterType type) {

6
openvidu-demo/src/main/java/org/openvidu/demo/OpenViduSampleApp.java
View File

@ -103,7 +103,7 @@ public class OpenViduSampleApp extends OpenViduServer {
@Override @Override
public JsonRpcUserControl userControl() { public JsonRpcUserControl userControl() {
DemoJsonRpcUserControl uc = new DemoJsonRpcUserControl(roomManager()); DemoJsonRpcUserControl uc = new DemoJsonRpcUserControl(notificationRoomManager());
KmsFilterType type = KmsFilterType.parseType(DEMO_FILTER_TYPE); KmsFilterType type = KmsFilterType.parseType(DEMO_FILTER_TYPE);
log.info("Configuring demo with filter type: {} (parsed is {})", DEMO_FILTER_TYPE, type); log.info("Configuring demo with filter type: {} (parsed is {})", DEMO_FILTER_TYPE, type);
@ -126,7 +126,7 @@ public class OpenViduSampleApp extends OpenViduServer {
} }
@Bean @Bean
public NotificationRoomManager roomManager() { public NotificationRoomManager notificationRoomManager() {
DemoNotificationRoomHandler notificationRoomHandler = DemoNotificationRoomHandler notificationRoomHandler =
new DemoNotificationRoomHandler(notificationService()); new DemoNotificationRoomHandler(notificationService());
@ -142,7 +142,7 @@ public class OpenViduSampleApp extends OpenViduServer {
default: default:
} }
return new NotificationRoomManager(notificationRoomHandler, kmsManager()); return new NotificationRoomManager();
} }
private void getMarkerUrls(SortedMap<Integer, String> sortedUrls) { private void getMarkerUrls(SortedMap<Integer, String> sortedUrls) {

4
openvidu-sample-app/src/main/resources/application.properties
View File

@ -1,7 +1,7 @@
server.port: 5000 server.port: 5000
spring.datasource.url: jdbc:mysql://localhost/full_teaching spring.datasource.url: jdbc:mysql://localhost/openvidu_sample_app
spring.datasource.username: ft-root spring.datasource.username: root
spring.datasource.password: pass spring.datasource.password: pass
spring.datasource.driverClassName: com.mysql.jdbc.Driver spring.datasource.driverClassName: com.mysql.jdbc.Driver
spring.jpa.hibernate.ddl-auto: create-drop spring.jpa.hibernate.ddl-auto: create-drop

63
openvidu-server/pom.xml
View File

@ -45,7 +45,7 @@
<organizationUrl>http://www.kurento.org</organizationUrl> <organizationUrl>http://www.kurento.org</organizationUrl>
</developer> </developer>
</developers> </developers>
<properties> <properties>
<!-- Main class --> <!-- Main class -->
<start-class>org.openvidu.server.OpenViduServer</start-class> <start-class>org.openvidu.server.OpenViduServer</start-class>
@ -65,8 +65,27 @@
</includes> </includes>
</resource> </resource>
</resources> </resources>
<plugins> <plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<mainClass>${start-class}</mainClass>
<layout>ZIP</layout>
</configuration>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId> <artifactId>exec-maven-plugin</artifactId>
@ -77,7 +96,7 @@
</plugins> </plugins>
</build> </build>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.kurento</groupId> <groupId>org.kurento</groupId>
<artifactId>kurento-jsonrpc-server</artifactId> <artifactId>kurento-jsonrpc-server</artifactId>
@ -101,7 +120,7 @@
<groupId>org.mockito</groupId> <groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId> <artifactId>mockito-core</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.kurento</groupId> <groupId>org.kurento</groupId>
<artifactId>kurento-client</artifactId> <artifactId>kurento-client</artifactId>
@ -138,34 +157,12 @@
</dependency> </dependency>
</dependencies> </dependencies>
<profiles> <!-- <profiles> <profile> <id>default</id> <activation> <property> <name>default</name>
<profile> <value>true</value> </property> </activation> <build> <plugins> <plugin>
<id>default</id> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId>
<activation> <configuration> <skipTests>true</skipTests> </configuration> </plugin> <plugin>
<property> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId>
<name>default</name> <configuration> <skipTests>true</skipTests> </configuration> </plugin> </plugins>
<value>true</value> </build> </profile> </profiles> -->
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skipTests>true</skipTests>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<skipTests>true</skipTests>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project> </project>