Skip to content

Commit

Permalink
Removed workaround for eclipse/xtext-core#57 (see eclipse/xtext-core#372
Browse files Browse the repository at this point in the history
)
  • Loading branch information
spoenemann committed Jul 6, 2017
1 parent a1dafca commit 43d3de1
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 139 deletions.
1 change: 0 additions & 1 deletion server/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ ext.versions = [
subprojects {
repositories {
jcenter()
mavenLocal()
maven {
name 'sonatype-snapshots'
url 'https://oss.sonatype.org/content/repositories/snapshots/'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ package de.cau.cs.kieler.elkgraph.web
import com.google.inject.Guice
import com.google.inject.Inject
import com.google.inject.Provider
import de.cau.cs.kieler.elkgraph.web.xtext.InMemoryServerModule
import java.net.InetSocketAddress
import javax.websocket.server.ServerEndpointConfig
import org.eclipse.elk.alg.layered.options.LayeredOptions
Expand All @@ -25,12 +24,16 @@ import org.eclipse.jetty.util.log.Slf4jLog
import org.eclipse.jetty.webapp.WebAppContext
import org.eclipse.jetty.websocket.jsr356.server.deploy.WebSocketServerContainerInitializer
import org.eclipse.xtext.ide.server.ServerModule
import org.eclipse.xtext.resource.IResourceServiceProvider
import org.eclipse.xtext.util.Modules2

class ServerLauncher {

def static void main(String[] args) {
val launcher = Guice.createInjector(Modules2.mixin(new ServerModule, new InMemoryServerModule)).getInstance(ServerLauncher)
val injector = Guice.createInjector(Modules2.mixin(new ServerModule, [
bind(IResourceServiceProvider.Registry).toProvider(IResourceServiceProvider.Registry.RegistryProvider)
]))
val launcher = injector.getInstance(ServerLauncher)
launcher.initialize()
launcher.start()
}
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

0 comments on commit 43d3de1

Please # to comment.