Minecraft/asys
Archived
0
Fork 0
Code Activity

SpacePort:fix: остатки прошлого наименования

Browse Source
This commit is contained in:
DmitriyMX
2017-08-13 23:51:14 +03:00
parent bc2b7032a6
commit 29c69c1a42
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spaceport/build.gradle
View File

@@ -15,9 +15,9 @@ compileJava {
jar { jar {
manifest { manifest {
name = 'ASys MC server manager' name = 'ASys MC server manager'
instruction 'Bundle-Activator', 'asys.mcsmanager.Activator' instruction 'Bundle-Activator', 'asys.spaceport.Activator'
instruction 'Import-Package', instruction 'Import-Package',
'!asys.mcsmanager.packets.*', '!asys.spaceport.packets.*',
'io.netty.buffer;version="[4.0,5)"', 'io.netty.buffer;version="[4.0,5)"',
'io.netty.handler.codec;version="[4.0,5)"', 'io.netty.handler.codec;version="[4.0,5)"',
'io.netty.handler.codec.http;version="[4.0,5)"', 'io.netty.handler.codec.http;version="[4.0,5)"',

10
spaceport/src/main/java/asys/spaceport/Activator.java
View File

@@ -37,15 +37,15 @@ public class Activator implements BundleActivator, ServiceListener {
logger.debug("Register service listener"); logger.debug("Register service listener");
context.addServiceListener(this); context.addServiceListener(this);
String host = config.getString("asys.mcsmanager.host", "127.0.0.1"); String host = config.getString("asys.spaceport.host", "127.0.0.1");
int port = config.getInt("asys.mcsmanager.port", 8779); int port = config.getInt("asys.spaceport.port", 8779);
String passcode = config.getString("asys.mcsmanager.passcode", "testpasscode"); String passcode = config.getString("asys.spaceport.passcode", "testpasscode");
logger.debug("Start server manager: {}:{}", host, port); logger.debug("Start server manager: {}:{}", host, port);
serverManager = new asys.spaceport.server.Server(); serverManager = new asys.spaceport.server.Server();
serverManager.start(host, port, passcode); serverManager.start(host, port, passcode);
host = config.getString("asys.mcsmanager.webconsole.host", "127.0.0.1"); host = config.getString("asys.spaceport.webconsole.host", "127.0.0.1");
port = config.getInt("asys.mcsmanager.webconsole.port", 8770); port = config.getInt("asys.spaceport.webconsole.port", 8770);
logger.debug("Start webconsole server: {}:{}", host, port); logger.debug("Start webconsole server: {}:{}", host, port);
webconsoleServer = new asys.spaceport.websocket.Server(); webconsoleServer = new asys.spaceport.websocket.Server();
webconsoleServer.start(host, port); webconsoleServer.start(host, port);

2
spaceport/src/main/java/asys/spaceport/MCSM_WebModule.java
View File

@@ -23,7 +23,7 @@ public class MCSM_WebModule extends WebModule {
.registerTypeAdapter(ServerInfo.class, new ServerInfoSerializer()) .registerTypeAdapter(ServerInfo.class, new ServerInfoSerializer())
.registerTypeAdapter(CS_Ping.class, new CSPingJsonSerializer()) .registerTypeAdapter(CS_Ping.class, new CSPingJsonSerializer())
.create(); .create();
private final String MODULE_NAME = "mcsmanager"; private final String MODULE_NAME = "spaceport";
private final String MODULE_URL = "/"+MODULE_NAME; private final String MODULE_URL = "/"+MODULE_NAME;
private final Pattern URL_PATTERN_JS = Pattern.compile(MODULE_URL+"/(\\w+)\\.js"); private final Pattern URL_PATTERN_JS = Pattern.compile(MODULE_URL+"/(\\w+)\\.js");
private final Pattern URL_PATTERN_CSS = Pattern.compile(MODULE_URL+"/(\\w+)\\.css"); private final Pattern URL_PATTERN_CSS = Pattern.compile(MODULE_URL+"/(\\w+)\\.css");

10
spaceport/src/main/resources/module.js
View File

@@ -1,7 +1,7 @@
var ContentModule = React.createClass({ var ContentModule = React.createClass({
requestServerList: function() { requestServerList: function() {
var _this = this; var _this = this;
fetch('/mcsmanager/servers.json') fetch('/spaceport/servers.json')
.then(function(response) { .then(function(response) {
response.json().then(function(data) { response.json().then(function(data) {
console.debug(data); console.debug(data);
@@ -21,7 +21,7 @@ var ContentModule = React.createClass({
}, },
clickServerListItem: function(title) { clickServerListItem: function(title) {
var _this = this; var _this = this;
fetch('/mcsmanager/servers.json?clientid='+title) fetch('/spaceport/servers.json?clientid='+title)
.then(function(response){ .then(function(response){
response.json().then(function(data){ response.json().then(function(data){
console.debug(data); console.debug(data);
@@ -43,7 +43,7 @@ var ContentModule = React.createClass({
componentWillMount: function(){ componentWillMount: function(){
var _this = this; var _this = this;
loadScript("/mcsmanager/components.js", loadScript("/spaceport/components.js",
function(){ _this.setState({nvScriptReady: _this.state.nvScriptReady+1}); console.debug('components - ok'); }, function(){ _this.setState({nvScriptReady: _this.state.nvScriptReady+1}); console.debug('components - ok'); },
function(){ _this.setState({nvScriptReady: -5}); console.debug('components - error'); } function(){ _this.setState({nvScriptReady: -5}); console.debug('components - error'); }
); );
@@ -60,12 +60,12 @@ var ContentModule = React.createClass({
function(){ _this.setState({nvScriptReady: -5}); console.error('d3 - error'); } function(){ _this.setState({nvScriptReady: -5}); console.error('d3 - error'); }
); );
loadScript("/mcsmanager/ansi_up.js", loadScript("/spaceport/ansi_up.js",
function(){ console.debug('ansi_up - ok'); }, function(){ console.debug('ansi_up - ok'); },
function(){ console.debug('ansi_up - error'); } function(){ console.debug('ansi_up - error'); }
); );
loadStyle("/mcsmanager/moduleStyle.css"); loadStyle("/spaceport/moduleStyle.css");
this.requestServerList(); this.requestServerList();
}, },