Skip to content
This repository has been archived by the owner on Oct 20, 2018. It is now read-only.

Akka http #2

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Akka http #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cc55ca9
change to akka http
Oct 26, 2016
caf5c61
add object messages support for websocket
Oct 26, 2016
cf1e743
add object messages support for websocket
Oct 26, 2016
40e091f
add responces from task operations
Oct 27, 2016
f1e4b46
add responces from task operations
Oct 27, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
.idea
target
.idea
target
54 changes: 0 additions & 54 deletions build.sbt
View file
Open in desktop

This file was deleted.

147 changes: 52 additions & 95 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,48 +2,21 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>ru.sbt</groupId>
<artifactId>phinp-mv</artifactId>
<artifactId>Sbira</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<spray.version>1.3.3</spray.version>
<orient.version>2.2.8</orient.version>
<akka.version>2.4.9</akka.version>
<orient.version>2.2.12</orient.version>
<akka.version>2.4.11</akka.version>
</properties>

<dependencies>
<dependency>
<groupId>io.spray</groupId>
<artifactId>spray-can_2.11</artifactId>
<version>${spray.version}</version>
</dependency>
<dependency>
<groupId>io.spray</groupId>
<artifactId>spray-routing_2.11</artifactId>
<version>${spray.version}</version>
</dependency>
<dependency>
<groupId>io.spray</groupId>
<artifactId>spray-caching_2.11</artifactId>
<version>${spray.version}</version>
</dependency>
<dependency>
<groupId>io.spray</groupId>
<artifactId>spray-json_2.11</artifactId>
<version>1.3.2</version>
</dependency>
<dependency>
<groupId>io.spray</groupId>
<artifactId>spray-util_2.11</artifactId>
<version>${spray.version}</version>
</dependency>

<!--
Akka
-->
<!-- <dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-http-core_2.11</artifactId>
<version>${akka.version}</version>
Expand All @@ -53,58 +26,21 @@
<artifactId>akka-http-experimental_2.11</artifactId>
<version>${akka.version}</version>
</dependency>
<dependency>
<!-- <dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-http-jackson-experimental_2.11</artifactId>
<version>${akka.version}</version>
</dependency>

<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-http-spray-json-experimental_2.11</artifactId>
<version>${akka.version}</version>
</dependency>
</dependency>-->
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-http-xml-experimental_2.11</artifactId>
<version>${akka.version}</version>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-sample-cluster-experimental_2.11.0-M3</artifactId>
<version>${akka.version}</version>
</dependency> -->
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-actor_2.11</artifactId>
<version>${akka.version}</version>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.8.1</version>
</dependency>

<!--
Spray WebSocket
-->
<dependency>
<groupId>com.wandoulabs.akka</groupId>
<artifactId>spray-websocket_2.11</artifactId>
<version>0.1.4</version>
</dependency>

<!-- <dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-cluster_2.11</artifactId>
<version>2.4.8</version>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-cluster-metrics_2.11</artifactId>
<version>2.4.8</version>
</dependency>-->
<!--
Joda time
-->
Expand All @@ -113,20 +49,6 @@
<artifactId>joda-time</artifactId>
<version>2.9.4</version>
</dependency>
<!--
Json
-->
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-scala_2.11</artifactId>
<version>2.8.0.rc2</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-joda</artifactId>
<version>2.8.0.rc2</version>
</dependency>

<!--
OrientDB
-->
Expand All @@ -150,7 +72,38 @@
<artifactId>blueprints-core</artifactId>
<version>2.6.0</version>
</dependency>

<!--
Jackson
-->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.8.4</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-scala_2.11</artifactId>
<version>2.8.3</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-joda</artifactId>
<version>2.8.4</version>
</dependency>
<!--
Akka-http Session
-->
<dependency>
<groupId>com.softwaremill.akka-http-session</groupId>
<artifactId>core_2.11</artifactId>
<version>0.2.7</version>
</dependency>
<dependency>
<groupId>com.softwaremill.akka-http-session</groupId>
<artifactId>jwt_2.11</artifactId>
<version>0.2.7</version>
</dependency>

<!--
Scala dependencies
-->
Expand All @@ -165,25 +118,29 @@
<artifactId>junit</artifactId>
<version>4.12</version>
</dependency>

<!--
Scala tests
-->
<!-- https://mvnrepository.com/artifact/org.scalatest/scalatest_2.11 -->
<dependency>
<groupId>org.scalatest</groupId>
<artifactId>scalatest_2.11</artifactId>
<version>3.0.0-SNAP6</version>
<version>3.0.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.spray</groupId>
<artifactId>spray-testkit_2.11</artifactId>
<version>1.3.3</version>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-testkit_2.11</artifactId>
<version>${akka.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-http-testkit_2.11</artifactId>
<version>${akka.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<pluginManagement>
<plugins>
Expand All @@ -207,7 +164,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.7</version>
<version>2.19.1</version>
<configuration>
<skipTests>true</skipTests>
</configuration>
Expand Down Expand Up @@ -272,7 +229,7 @@
<archive>
<manifest>
<addClasspath>true</addClasspath>
<mainClass>org.asem.Boot</mainClass>
<mainClass>ru.sbt.Main</mainClass>
<classpathPrefix>lib</classpathPrefix>
</manifest>
</archive>
Expand Down
1 change: 0 additions & 1 deletion project/build.properties
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions project/plugins.sbt
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/main/java/org/asem/orient/AGraph.java → src/main/java/ru/sbt/orient/AGraph.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.asem.orient;
package ru.sbt.orient;

import com.tinkerpop.blueprints.impls.orient.OrientGraph;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/asem/orient/Query.java → src/main/java/ru/sbt/orient/Query.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.asem.orient;
package ru.sbt.orient;

import com.orientechnologies.orient.core.sql.query.OSQLSynchQuery;
import com.tinkerpop.blueprints.impls.orient.OrientDynaElementIterable;
Expand Down
18 changes: 0 additions & 18 deletions src/main/resources/address.sql
View file
Open in desktop

This file was deleted.

43 changes: 18 additions & 25 deletions src/main/resources/application.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,26 @@
akka {
loglevel = INFO
loglevel = DEBUG
}

spray.can.server {
host = 0.0.0.0
port = 8080
request-timeout = 10s
ssl-encryption = off

idle-timeout = 1800 s
request-chunk-aggregation-limit = 0

parsing.max-content-length = 5g
parsing.incoming-auto-chunking-threshold-size = 45k
akka {
http {
session {
encrypt-data = true
# max-age = 10
}
}
}

spray.websocket {
# Supported Per-message Compression Extensions. To disable, set to []
#pmce = []
pmce = ["permessage-deflate"]
http {
interface = "0.0.0.0"
port = 9080
sslPort = 9443
}

spray.routing {
file-chunking-threshold-size = 512k
database {
url: "remote:localhost/probe"
user: root
password: 123456
}

secureKey {
Expand All @@ -32,16 +30,11 @@ secureKey {
keyPassword: "123456"
}

cors.allowed-origin = "*"

mainPage = "/pub/app/simple.html"
loginPage = "/pub/login.html"

database {
url: "remote:localhost/probe"
user: root
password: 123456
}


#akka {
# actor {
# provider = "akka.cluster.ClusterActorRefProvider"
Expand Down
Loading