Skip to content
This repository has been archived by the owner on Jun 24, 2024. It is now read-only.

Commit

Permalink
Move the gateway under tools/
Browse files Browse the repository at this point in the history
  • Loading branch information
pvcnt committed Mar 30, 2018
1 parent 098dd0e commit 442a767
Show file tree
Hide file tree
Showing 87 changed files with 18 additions and 18 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* along with Accio. If not, see <http://www.gnu.org/licenses/>.
*/

package fr.cnrs.liris.accio.gateway
package fr.cnrs.liris.accio.tools.gateway

import com.fasterxml.jackson.annotation.JsonInclude
import com.fasterxml.jackson.databind.Module
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* along with Accio. If not, see <http://www.gnu.org/licenses/>.
*/

package fr.cnrs.liris.accio.gateway
package fr.cnrs.liris.accio.tools.gateway

import com.fasterxml.jackson.core.JsonGenerator
import com.fasterxml.jackson.databind.SerializerProvider
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* along with Accio. If not, see <http://www.gnu.org/licenses/>.
*/

package fr.cnrs.liris.accio.gateway
package fr.cnrs.liris.accio.tools.gateway

import com.google.inject.{Inject, Singleton}
import com.twitter.finagle.http.Request
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ scala_binary(
"//3rdparty/jvm/com/twitter:finatra_httpclient",
],
resources = [
"//accio/node/fr/cnrs/liris/accio/gateway:index.bundle.js",
"//accio/node/fr/cnrs/liris/accio/gateway:assets",
"//accio/node/fr/cnrs/liris/accio/tools/gateway:index.bundle.js",
"//accio/node/fr/cnrs/liris/accio/tools/gateway:assets",
],
resource_strip_prefix = "accio/node/fr/cnrs/liris/accio/gateway",
main_class = "fr.cnrs.liris.accio.gateway.GatewayServerMain",
resource_strip_prefix = "accio/node/fr/cnrs/liris/accio/tools/gateway",
main_class = "fr.cnrs.liris.accio.tools.gateway.GatewayServerMain",
)
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* along with Accio. If not, see <http://www.gnu.org/licenses/>.
*/

package fr.cnrs.liris.accio.gateway
package fr.cnrs.liris.accio.tools.gateway

import com.twitter.finagle.http.filter.Cors
import com.twitter.finagle.http.{Request, Response}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* along with Accio. If not, see <http://www.gnu.org/licenses/>.
*/

package fr.cnrs.liris.accio.gateway
package fr.cnrs.liris.accio.tools.gateway

import com.google.inject.{Provides, Singleton}
import com.twitter.finagle.Thrift
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* along with Accio. If not, see <http://www.gnu.org/licenses/>.
*/

package fr.cnrs.liris.accio.gateway
package fr.cnrs.liris.accio.tools.gateway

import com.twitter.finagle.http.{Request, Response}
import com.twitter.finatra.http.HttpServer
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* along with Accio. If not, see <http://www.gnu.org/licenses/>.
*/

package fr.cnrs.liris.accio.gateway
package fr.cnrs.liris.accio.tools.gateway

import com.google.inject.Singleton
import com.twitter.finagle.http.Request
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* along with Accio. If not, see <http://www.gnu.org/licenses/>.
*/

package fr.cnrs.liris.accio.gateway
package fr.cnrs.liris.accio.tools.gateway

import com.fasterxml.jackson.annotation.JsonProperty

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* along with Accio. If not, see <http://www.gnu.org/licenses/>.
*/

package fr.cnrs.liris.accio.gateway
package fr.cnrs.liris.accio.tools.gateway

import com.google.inject.Singleton
import com.twitter.finagle.http.Request
Expand Down
4 changes: 2 additions & 2 deletions bin/run-gateway.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
# You should have received a copy of the GNU General Public License
# along with Accio. If not, see <http://www.gnu.org/licenses/>.

bazel build accio/java/fr/cnrs/liris/accio/gateway
./bazel-bin/accio/java/fr/cnrs/liris/accio/gateway/gateway \
bazel build accio/java/fr/cnrs/liris/accio/tools/gateway
./bazel-bin/accio/java/fr/cnrs/liris/accio/tools/gateway/gateway \
-admin.port=":9991" \
-http.port=":8888" \
-ui \
Expand Down
2 changes: 1 addition & 1 deletion docs/_contribute/gateway.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ title: Developing the gateway
## Server

The gateway is an HTTP interface to Accio, providing a REST API and a Web interface.
Source code for the gateway is located under the `fr.cnrs.liris.accio.gateway` package.
Source code for the gateway is located under the `fr.cnrs.liris.accio.tools.gateway` package.

Finatra is used for the REST API and Web UI serving.
This time, we use its HTTP version designed to build HTTP servers.
Expand Down
4 changes: 2 additions & 2 deletions etc/vagrant/acciobuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ function build_executor {

function build_gateway {
bazel run @yarn//:yarn
bazel build accio/java/fr/cnrs/liris/accio/gateway:gateway_deploy.jar
sudo cp bazel-bin/accio/java/fr/cnrs/liris/accio/gateway/gateway_deploy.jar /usr/local/bin/accio-gateway.jar
bazel build accio/java/fr/cnrs/liris/accio/tools/gateway:gateway_deploy.jar
sudo cp bazel-bin/accio/java/fr/cnrs/liris/accio/tools/gateway/gateway_deploy.jar /usr/local/bin/accio-gateway.jar
upstart_update accio-gateway
}

Expand Down

0 comments on commit 442a767

Please sign in to comment.