aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
m---------deps/com.juick6
m---------deps/com.juick.json6
m---------deps/com.juick.server6
-rw-r--r--juick-ws/build.gradle30
-rw-r--r--juick-ws/src/main/java/com/juick/ws/WebsocketComponent.java (renamed from src/main/java/com/juick/ws/WebsocketComponent.java)0
-rw-r--r--juick-ws/src/main/java/com/juick/ws/XMPPConnection.java (renamed from src/main/java/com/juick/ws/XMPPConnection.java)0
-rw-r--r--juick-ws/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java (renamed from src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java)0
-rw-r--r--juick-ws/src/main/java/com/juick/ws/configuration/WebsocketInitializer.java (renamed from src/main/java/com/juick/ws/configuration/WebsocketInitializer.java)0
-rw-r--r--src/main/java/com/juick/xmpp/extensions/JuickMessage.java186
-rw-r--r--src/main/java/com/juick/xmpp/extensions/JuickUser.java75
10 files changed, 30 insertions, 279 deletions
diff --git a/deps/com.juick b/deps/com.juick
deleted file mode 160000
-Subproject 39ec74abe77cdab5aa8f50c2524e6f71c2dbbd0
diff --git a/deps/com.juick.json b/deps/com.juick.json
deleted file mode 160000
-Subproject 9dfad84fa487960fde4cc4b0ac6760c8dd5f4ac
diff --git a/deps/com.juick.server b/deps/com.juick.server
deleted file mode 160000
-Subproject a732644480ff8b5b2ee46124af4d8c62944e39e
diff --git a/juick-ws/build.gradle b/juick-ws/build.gradle
new file mode 100644
index 00000000..111c0d5d
--- /dev/null
+++ b/juick-ws/build.gradle
@@ -0,0 +1,30 @@
+apply plugin: 'java'
+apply plugin: 'war'
+apply plugin: 'org.akhikhl.gretty'
+
+repositories {
+ mavenCentral()
+}
+
+dependencies {
+ compile project(':juick-core')
+ compile project(':deps:com.juick.xmpp')
+ providedCompile 'javax.servlet:javax.servlet-api:3.1.0'
+ def springFrameworkVersion = '4.3.1.RELEASE'
+ compile "org.springframework:spring-jdbc:${springFrameworkVersion}"
+ compile "org.springframework:spring-webmvc:${springFrameworkVersion}"
+ compile "org.springframework:spring-websocket:${springFrameworkVersion}"
+ compile 'javax.inject:javax.inject:1'
+ compile 'org.apache.httpcomponents:httpclient:4.5.1'
+ testCompile 'junit:junit:4.12'
+ providedRuntime 'mysql:mysql-connector-java:5.1.39'
+}
+
+compileJava.options.encoding = 'UTF-8'
+
+gretty {
+ httpPort = 8080
+ contextPath = ''
+ servletContainer = 'tomcat8'
+}
+
diff --git a/src/main/java/com/juick/ws/WebsocketComponent.java b/juick-ws/src/main/java/com/juick/ws/WebsocketComponent.java
index e87b96a5..e87b96a5 100644
--- a/src/main/java/com/juick/ws/WebsocketComponent.java
+++ b/juick-ws/src/main/java/com/juick/ws/WebsocketComponent.java
diff --git a/src/main/java/com/juick/ws/XMPPConnection.java b/juick-ws/src/main/java/com/juick/ws/XMPPConnection.java
index 4a80eec5..4a80eec5 100644
--- a/src/main/java/com/juick/ws/XMPPConnection.java
+++ b/juick-ws/src/main/java/com/juick/ws/XMPPConnection.java
diff --git a/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java b/juick-ws/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java
index 223f8d63..223f8d63 100644
--- a/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java
+++ b/juick-ws/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java
diff --git a/src/main/java/com/juick/ws/configuration/WebsocketInitializer.java b/juick-ws/src/main/java/com/juick/ws/configuration/WebsocketInitializer.java
index 89017f8b..89017f8b 100644
--- a/src/main/java/com/juick/ws/configuration/WebsocketInitializer.java
+++ b/juick-ws/src/main/java/com/juick/ws/configuration/WebsocketInitializer.java
diff --git a/src/main/java/com/juick/xmpp/extensions/JuickMessage.java b/src/main/java/com/juick/xmpp/extensions/JuickMessage.java
deleted file mode 100644
index ac45f3d2..00000000
--- a/src/main/java/com/juick/xmpp/extensions/JuickMessage.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * Juick
- * Copyright (C) 2008-2011, Ugnich Anton
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package com.juick.xmpp.extensions;
-
-import com.juick.xmpp.utils.XmlUtils;
-import com.juick.xmpp.*;
-import java.io.IOException;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.TimeZone;
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
-/**
- *
- * @author Ugnich Anton
- */
-public class JuickMessage extends com.juick.Message implements StanzaChild {
-
- public final static String XMLNS = "http://juick.com/message";
- public final static String TagName = "juick";
-
- private SimpleDateFormat df;
-
- public JuickMessage() {
- df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- df.setTimeZone(TimeZone.getTimeZone("UTC"));
- }
-
- public JuickMessage(com.juick.Message msg) {
- super(msg);
- df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- df.setTimeZone(TimeZone.getTimeZone("UTC"));
- }
-
- @Override
- public String getXMLNS() {
- return XMLNS;
- }
-
- @Override
- public JuickMessage parse(XmlPullParser parser) throws XmlPullParserException, IOException, ParseException {
- JuickMessage jmsg = new JuickMessage();
-
- final String sMID = parser.getAttributeValue(null, "mid");
- if (sMID != null) {
- jmsg.setMID(Integer.parseInt(sMID));
- }
- final String sRID = parser.getAttributeValue(null, "rid");
- if (sRID != null) {
- jmsg.setRID(Integer.parseInt(sRID));
- }
- final String sReplyTo = parser.getAttributeValue(null, "replyto");
- if (sReplyTo != null) {
- jmsg.ReplyTo = Integer.parseInt(sReplyTo);
- }
- final String sPrivacy = parser.getAttributeValue(null, "privacy");
- if (sPrivacy != null) {
- jmsg.Privacy = Integer.parseInt(sPrivacy);
- }
- final String sFriendsOnly = parser.getAttributeValue(null, "friendsonly");
- if (sFriendsOnly != null) {
- jmsg.FriendsOnly = true;
- }
- final String sReadOnly = parser.getAttributeValue(null, "readonly");
- if (sReadOnly != null) {
- jmsg.ReadOnly = true;
- }
-
- String timestampString = parser.getAttributeValue(null, "ts");
- if (timestampString != null) {
- jmsg.setDate(df.parse(timestampString));
- }
- jmsg.AttachmentType = parser.getAttributeValue(null, "attach");
-
- while (parser.next() == XmlPullParser.START_TAG) {
- final String tag = parser.getName();
- final String xmlns = parser.getNamespace();
- if (tag.equals("body")) {
- jmsg.setText(XmlUtils.getTagText(parser));
- } else if (tag.equals(JuickUser.TagName) && xmlns != null && xmlns.equals(JuickUser.XMLNS)) {
- jmsg.setUser(new JuickUser().parse(parser));
- } else if (tag.equals("tag")) {
- jmsg.Tags.add(XmlUtils.getTagText(parser));
- } else {
- XmlUtils.skip(parser);
- }
- }
- return jmsg;
- }
-
- @Override
- public String toString() {
- String ret = "";
-
- ret = "<" + TagName + " xmlns=\"" + XMLNS + "\"";
- if (getMID() > 0) {
- ret += " mid=\"" + getMID() + "\"";
- }
- if (getRID() > 0) {
- ret += " rid=\"" + getRID() + "\"";
- }
- if (ReplyTo > 0) {
- ret += " replyto=\"" + ReplyTo + "\"";
- }
- ret += " privacy=\"" + Privacy + "\"";
- if (FriendsOnly) {
- ret += " friendsonly=\"1\"";
- }
- if (ReadOnly) {
- ret += " readonly=\"1\"";
- }
- if (getDate() != null) {
- ret += " ts=\"" + df.format(getDate()) + "\"";
- }
- if (AttachmentType != null) {
- ret += " attach=\"" + AttachmentType + "\"";
- }
- ret += ">";
- if (getUser() != null) {
- ret += JuickUser.toString(getUser());
- }
- if (getText() != null) {
- ret += "<body>" + XmlUtils.escape(getText()) + "</body>";
- }
- if (!Tags.isEmpty()) {
- for (String Tag : Tags) {
- ret += "<tag>" + XmlUtils.escape(Tag) + "</tag>";
- }
- }
- ret += "</" + TagName + ">";
-
- return ret;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (!(obj instanceof JuickMessage)) {
- return false;
- }
- JuickMessage jmsg = (JuickMessage) obj;
- return (this.getMID() == jmsg.getMID() && this.getRID() == jmsg.getRID());
- }
-
- @Override
- public int compareTo(Object obj) throws ClassCastException {
- if (!(obj instanceof JuickMessage)) {
- throw new ClassCastException();
- }
- JuickMessage jmsg = (JuickMessage) obj;
-
- if (this.getMID() != jmsg.getMID()) {
- if (this.getMID() > jmsg.getMID()) {
- return -1;
- } else {
- return 1;
- }
- }
-
- if (this.getRID() != jmsg.getRID()) {
- if (this.getRID() < jmsg.getRID()) {
- return -1;
- } else {
- return 1;
- }
- }
-
- return 0;
- }
-}
diff --git a/src/main/java/com/juick/xmpp/extensions/JuickUser.java b/src/main/java/com/juick/xmpp/extensions/JuickUser.java
deleted file mode 100644
index edc6749a..00000000
--- a/src/main/java/com/juick/xmpp/extensions/JuickUser.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Juick
- * Copyright (C) 2008-2011, Ugnich Anton
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package com.juick.xmpp.extensions;
-
-import com.juick.xmpp.utils.XmlUtils;
-import com.juick.xmpp.*;
-import java.io.IOException;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
-/**
- *
- * @author Ugnich Anton
- */
-public class JuickUser extends com.juick.User implements StanzaChild {
-
- public final static String XMLNS = "http://juick.com/user";
- public final static String TagName = "user";
-
- public JuickUser() {
- }
-
- public JuickUser(com.juick.User user) {
- super(user);
- }
-
- @Override
- public String getXMLNS() {
- return XMLNS;
- }
-
- @Override
- public JuickUser parse(final XmlPullParser parser) throws XmlPullParserException, IOException {
- JuickUser juser = new JuickUser();
- String strUID = parser.getAttributeValue(null, "uid");
- if (strUID != null) {
- juser.setUID(Integer.parseInt(strUID));
- }
- juser.setUName(parser.getAttributeValue(null, "uname"));
- XmlUtils.skip(parser);
- return juser;
- }
-
- public static String toString(com.juick.User user) {
- String str = "<" + TagName + " xmlns='" + XMLNS + "'";
- if (user.getUID() > 0) {
- str += " uid='" + user.getUID() + "'";
- }
- if (user.getUName() != null && user.getUName().length() > 0) {
- str += " uname='" + XmlUtils.escape(user.getUName()) + "'";
- }
- str += "/>";
- return str;
- }
-
- @Override
- public String toString() {
- return toString(this);
- }
-}
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-26 09:05:51 +0000