Skip to content

Commit 125c56e

Browse files
louiscyphrelouiscyphre
committed
Added GPL license.
1 parent 71c3f05 commit 125c56e

40 files changed

+772
-86
lines changed

‎WebContent/WEB-INF/web.xml‎

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,27 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" id="WebApp_ID" version="2.5">
3-
<display-name>webapp</display-name>
2+
<!--
3+
~ webapp-otc - an online collaboration tool .
4+
~ Copyright (C) 2017 Ilia Butvinnik and Michael Goldman
5+
~
6+
~ This program is free software: you can redistribute it and/or modify
7+
~ it under the terms of the GNU General Public License as published by
8+
~ the Free Software Foundation, either version 3 of the License, or
9+
~ (at your option) any later version.
10+
~
11+
~ This program is distributed in the hope that it will be useful,
12+
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+
~ GNU General Public License for more details.
15+
~
16+
~ You should have received a copy of the GNU General Public License
17+
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
18+
-->
19+
20+
<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
21+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
22+
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
23+
version="3.1">
24+
<display-name>webapp</display-name>
425
<welcome-file-list>
526
<welcome-file>index.html</welcome-file>
627
</welcome-file-list>
@@ -24,4 +45,4 @@
2445
<res-type>javax.sql.DataSource</res-type>
2546
<res-auth>Container</res-auth>
2647
</resource-ref>
27-
</web-app>
48+
</web-app>

‎WebContent/css/main.css‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,22 @@
1+
/*
2+
* webapp-otc - an online collaboration tool .
3+
* Copyright (C) 2017 Ilia Butvinnik and Michael Goldman
4+
*
5+
* This program is free software: you can redistribute it and/or modify
6+
* it under the terms of the GNU General Public License as published by
7+
* the Free Software Foundation, either version 3 of the License, or
8+
* (at your option) any later version.
9+
*
10+
* This program is distributed in the hope that it will be useful,
11+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13+
* GNU General Public License for more details.
14+
*
15+
* You should have received a copy of the GNU General Public License
16+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
17+
*/
18+
19+
120
/* This are settings for login-form,
221
the first screen user see when enters a chat */
322

‎WebContent/index.html‎

Lines changed: 29 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,22 @@
11
<!DOCTYPE html>
2+
<!--
3+
~ webapp-otc - an online collaboration tool .
4+
~ Copyright (C) 2017 Ilia Butvinnik and Michael Goldman
5+
~
6+
~ This program is free software: you can redistribute it and/or modify
7+
~ it under the terms of the GNU General Public License as published by
8+
~ the Free Software Foundation, either version 3 of the License, or
9+
~ (at your option) any later version.
10+
~
11+
~ This program is distributed in the hope that it will be useful,
12+
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+
~ GNU General Public License for more details.
15+
~
16+
~ You should have received a copy of the GNU General Public License
17+
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
18+
-->
19+
220
<html lang="en">
321

422
<head>
@@ -64,8 +82,8 @@ <h1 class="text-center login-title ">Would you like to register?</h1>
6482
<!-- main chat interface section, visible after login or register -->
6583
<div class="chat-container" data-ng-controller="chatRoomsCtrl" data-ng-hide="chatRoomsScreenHidden">
6684
<div class="side side-left col-md-3">
67-
<!-- user information section, resides on the left. this includes user avatar, user description,
68-
create channel button, and channel discovery field. -->
85+
<!-- user information section, resides on the left. this includes user avatar, user description,
86+
create channel button, and channel discovery field. -->
6987
<div class="user-information table-row">
7088
<div class="media">
7189
<div class="media-left">
@@ -83,7 +101,7 @@ <h4>{{user.nickname}}</h4>
83101
</div>
84102

85103
<!-- this section on the left, that contains public channels list, when they discovered,
86-
list of subscribed channels, and list of private channels. -->
104+
list of subscribed channels, and list of private channels. -->
87105
<div class="side-inner">
88106
<!-- this section contains public channels list, when they discovered. -->
89107
<div class="search-results" id="searched" data-click-outside="query=''" data-ng-hide="query === ''">
@@ -122,9 +140,9 @@ <h4>{{user.nickname}}</h4>
122140
</ul>
123141
</div>
124142
</div>
125-
<!-- chat text area main container, where all messages shown. also contains form for
126-
creating a channel, this is because we want it to appear on the right section,
127-
side of the left side just near "create channel" button. -->
143+
<!-- chat text area main container, where all messages shown. also contains form for
144+
creating a channel, this is because we want it to appear on the right section,
145+
side of the left side just near "create channel" button. -->
128146
<div class="chat-text-area col-md-7">
129147
<div class="create-channel" data-ng-show="showCreateChannelForm">
130148
<form class="form-login">
@@ -141,9 +159,9 @@ <h4>{{user.nickname}}</h4>
141159
</form>
142160
</div>
143161
<!-- chat text area inner section. contains channel discussion shown in threaded manner,
144-
and footer with send message option, which intended to send messages that are not
145-
replying to any specific message in the chat. callback downloadMessages is called
146-
each time that thread fully scrolled down. -->
162+
and footer with send message option, which intended to send messages that are not
163+
replying to any specific message in the chat. callback downloadMessages is called
164+
each time that thread fully scrolled down. -->
147165
<div class="chat-text-area-inner" data-scrolled-down-callback="downloadMessages(currentChannel)" data-ng-show="channelSelected">
148166
<data-discussion discussion="currentChannelThread" data-ng-model="currentChannelThread" data-enter-private-channel="enterPrivateChannel" data-set-reply="setReply" data-send-message="sendMessage"></data-discussion>
149167
</div>
@@ -159,11 +177,11 @@ <h4>{{user.nickname}}</h4>
159177
</div>
160178
</div>
161179
<!-- right side of the main chat interface, that contains channel control
162-
(description and unsubscribe option) and list of users subscribed to channel. -->
180+
(description and unsubscribe option) and list of users subscribed to channel. -->
163181
<div class="side side-right col-md-2">
164182
<div class="channel-control-section table-row" data-ng-show="channelSelected">
165183
<!-- this part contains channel control
166-
(description and unsubscribe option). -->
184+
(description and unsubscribe option). -->
167185
<div>
168186
<div class="block-left">
169187
<span class="badge badge-channel" data-ng-mouseenter="displayInfo=true" data-ng-mouseleave="displayInfo=false"><img class="badge-icon" data-ng-src="css/img/glyphicons-info-sign.png" alt="description" src="data:image/gif;base64,R0lGODlhAQABAAD/ACwAAAAAAQABAAACADs=" /></span>

‎WebContent/js/controllers.js‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
/*
2+
* webapp-otc - an online collaboration tool .
3+
* Copyright (C) 2017 Ilia Butvinnik and Michael Goldman
4+
*
5+
* This program is free software: you can redistribute it and/or modify
6+
* it under the terms of the GNU General Public License as published by
7+
* the Free Software Foundation, either version 3 of the License, or
8+
* (at your option) any later version.
9+
*
10+
* This program is distributed in the hope that it will be useful,
11+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13+
* GNU General Public License for more details.
14+
*
15+
* You should have received a copy of the GNU General Public License
16+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
17+
*/
18+
119
(function (global) {
220

321
'use strict';

‎WebContent/js/directives.js‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
/*
2+
* webapp-otc - an online collaboration tool .
3+
* Copyright (C) 2017 Ilia Butvinnik and Michael Goldman
4+
*
5+
* This program is free software: you can redistribute it and/or modify
6+
* it under the terms of the GNU General Public License as published by
7+
* the Free Software Foundation, either version 3 of the License, or
8+
* (at your option) any later version.
9+
*
10+
* This program is distributed in the hope that it will be useful,
11+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13+
* GNU General Public License for more details.
14+
*
15+
* You should have received a copy of the GNU General Public License
16+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
17+
*/
18+
119
(function (global) {
220

321
'use strict';

‎WebContent/js/services.js‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
/*
2+
* webapp-otc - an online collaboration tool .
3+
* Copyright (C) 2017 Ilia Butvinnik and Michael Goldman
4+
*
5+
* This program is free software: you can redistribute it and/or modify
6+
* it under the terms of the GNU General Public License as published by
7+
* the Free Software Foundation, either version 3 of the License, or
8+
* (at your option) any later version.
9+
*
10+
* This program is distributed in the hope that it will be useful,
11+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13+
* GNU General Public License for more details.
14+
*
15+
* You should have received a copy of the GNU General Public License
16+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
17+
*/
18+
119
(function (global) {
220

321
'use strict';

‎src/server/AppConstants.java‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
/*
2+
* webapp-otc - an online collaboration tool .
3+
* Copyright (C) 2017 Ilia Butvinnik and Michael Goldman
4+
*
5+
* This program is free software: you can redistribute it and/or modify
6+
* it under the terms of the GNU General Public License as published by
7+
* the Free Software Foundation, either version 3 of the License, or
8+
* (at your option) any later version.
9+
*
10+
* This program is distributed in the hope that it will be useful,
11+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13+
* GNU General Public License for more details.
14+
*
15+
* You should have received a copy of the GNU General Public License
16+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
17+
*/
18+
119
package server;
220

321
/**

‎src/server/DataManager.java‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
/*
2+
* webapp-otc - an online collaboration tool .
3+
* Copyright (C) 2017 Ilia Butvinnik and Michael Goldman
4+
*
5+
* This program is free software: you can redistribute it and/or modify
6+
* it under the terms of the GNU General Public License as published by
7+
* the Free Software Foundation, either version 3 of the License, or
8+
* (at your option) any later version.
9+
*
10+
* This program is distributed in the hope that it will be useful,
11+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13+
* GNU General Public License for more details.
14+
*
15+
* You should have received a copy of the GNU General Public License
16+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
17+
*/
18+
119
package server;
220

321
import java.sql.Connection;

‎src/server/listeners/DatabaseCreator.java‎

Lines changed: 33 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,31 @@
1+
/*
2+
* webapp-otc - an online collaboration tool .
3+
* Copyright (C) 2017 Ilia Butvinnik and Michael Goldman
4+
*
5+
* This program is free software: you can redistribute it and/or modify
6+
* it under the terms of the GNU General Public License as published by
7+
* the Free Software Foundation, either version 3 of the License, or
8+
* (at your option) any later version.
9+
*
10+
* This program is distributed in the hope that it will be useful,
11+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13+
* GNU General Public License for more details.
14+
*
15+
* You should have received a copy of the GNU General Public License
16+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
17+
*/
18+
119
package server.listeners;
220

3-
import java.io.BufferedReader;
4-
import java.io.File;
5-
import java.io.IOException;
6-
import java.io.InputStream;
7-
import java.io.InputStreamReader;
8-
import java.lang.reflect.Type;
9-
import java.sql.Connection;
10-
import java.sql.PreparedStatement;
11-
import java.sql.SQLException;
12-
import java.sql.Statement;
13-
import java.util.Collection;
21+
import com.google.gson.Gson;
22+
import com.google.gson.reflect.TypeToken;
23+
import org.apache.tomcat.dbcp.dbcp.BasicDataSource;
24+
import server.AppConstants;
25+
import server.model.Channel;
26+
import server.model.MessageDB;
27+
import server.model.Subscription;
28+
import server.model.User;
1429

1530
import javax.naming.Context;
1631
import javax.naming.InitialContext;
@@ -19,17 +34,13 @@
1934
import javax.servlet.ServletContextEvent;
2035
import javax.servlet.ServletContextListener;
2136
import javax.servlet.annotation.WebListener;
22-
23-
import org.apache.tomcat.dbcp.dbcp.BasicDataSource;
24-
25-
import com.google.gson.Gson;
26-
import com.google.gson.reflect.TypeToken;
27-
28-
import server.AppConstants;
29-
import server.model.Channel;
30-
import server.model.MessageDB;
31-
import server.model.Subscription;
32-
import server.model.User;
37+
import java.io.*;
38+
import java.lang.reflect.Type;
39+
import java.sql.Connection;
40+
import java.sql.PreparedStatement;
41+
import java.sql.SQLException;
42+
import java.sql.Statement;
43+
import java.util.Collection;
3344

3445

3546

‎src/server/messages/AuthFailure.java‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
/*
2+
* webapp-otc - an online collaboration tool .
3+
* Copyright (C) 2017 Ilia Butvinnik and Michael Goldman
4+
*
5+
* This program is free software: you can redistribute it and/or modify
6+
* it under the terms of the GNU General Public License as published by
7+
* the Free Software Foundation, either version 3 of the License, or
8+
* (at your option) any later version.
9+
*
10+
* This program is distributed in the hope that it will be useful,
11+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13+
* GNU General Public License for more details.
14+
*
15+
* You should have received a copy of the GNU General Public License
16+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
17+
*/
18+
119
package server.messages;
220

321
/**

0 commit comments

Comments
 (0)