Restlet service provisioning on main server #41
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Conflicts: # dicoogle/src/main/java/pt/ua/dicoogle/Main.java # dicoogle/src/main/java/pt/ua/dicoogle/plugins/PluginController.java # dicoogle/src/main/java/pt/ua/dicoogle/rGUI/server/controllers/DirectorySettings.java # dicoogle/src/main/java/pt/ua/dicoogle/server/ControlServices.java # dicoogle/src/main/java/pt/ua/dicoogle/server/web/DicoogleWeb.java # dicoogle/src/main/java/pt/ua/dicoogle/webservices/WebservicePluginApplication.java
# Conflicts: # dicoogle/src/main/java/pt/ua/dicoogle/Main.java # dicoogle/src/main/java/pt/ua/dicoogle/plugins/PluginController.java # dicoogle/src/main/java/pt/ua/dicoogle/rGUI/server/controllers/DirectorySettings.java # dicoogle/src/main/java/pt/ua/dicoogle/server/ControlServices.java # dicoogle/src/main/java/pt/ua/dicoogle/server/web/DicoogleWeb.java # dicoogle/src/main/java/pt/ua/dicoogle/webservices/WebservicePluginApplication.java
# Conflicts: # dicoogle/src/main/java/pt/ua/dicoogle/Main.java
…ert more loggers from JUL to slf4j # Conflicts: # dicoogle/src/main/java/pt/ua/dicoogle/plugins/PluginController.java # dicoogle/src/main/java/pt/ua/dicoogle/webservices/DicoogleWebservice.java
|
@tmgodinho can you review this Pull Request (PR)? I'm also going to do it, but I would like to hear your opinion here. Also it will be nice to do a quick discussion face to face. |
| <groupId>org.restlet.jse</groupId> | ||
| <artifactId>org.restlet.ext.jetty</artifactId> | ||
| <version>2.3.1</version> | ||
| </dependency> --> |
There was a problem hiding this comment.
This comments could be removed.
|
Nice feature to have. |
bastiao
added a commit
that referenced
this pull request
May 13, 2015
Restlet service provisioning on main server
This was referenced Jun 7, 2015
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR merges all web service provisioning to the main server (usually on port 8080). This includes Restlet support in this server instance.
/legacy/subpath, but this can change./ext/ subpath.