Skip to content
This repository was archived by the owner on Aug 3, 2025. It is now read-only.

Commit 7fb22db

Browse files
narendasannarendasan
authored
Merge pull request #77 from acm-uiuc/arbor-dev
port to arbor-dev and 0.2.5
2 parents 41b2256 + d982507 commit 7fb22db

18 files changed

+116
-116
lines changed

‎Gopkg.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11

22
[[constraint]]
3-
name = "github.com/acm-uiuc/arbor"
4-
version = ">=0.2.4, <1.0.0"
3+
name = "github.com/arbor-dev/arbor"
4+
version = ">=0.2.5, <1.0.0"

‎build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ mkdir -p log/prod
99
# #
1010
# #
1111
#########################################################################
12-
go get -u github.com/acm-uiuc/arbor/...
12+
go get -u github.com/arbor-dev/arbor/...
1313

1414
echo Building config
1515
go install github.com/acm-uiuc/groot-api-gateway/config

‎config/config.go.template‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package config
22

33
import (
4-
"github.com/acm-uiuc/arbor/proxy"
5-
"github.com/acm-uiuc/arbor/security"
4+
"github.com/arbor-dev/arbor/proxy"
5+
"github.com/arbor-dev/arbor/security"
66
)
77

88
//Groot Specific configurations

‎server.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package main
22

33
import (
4-
"github.com/acm-uiuc/arbor"
54
"github.com/acm-uiuc/groot-api-gateway/config"
65
"github.com/acm-uiuc/groot-api-gateway/services"
6+
"github.com/arbor-dev/arbor"
77
)
88

99
func main() {

‎services/auth.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ package services
1313
import (
1414
"net/http"
1515

16-
"github.com/acm-uiuc/arbor"
1716
"github.com/acm-uiuc/groot-api-gateway/config"
17+
"github.com/arbor-dev/arbor"
1818
)
1919

2020
//Location

‎services/credits.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ package services
1313
import (
1414
"net/http"
1515

16-
"github.com/acm-uiuc/arbor"
1716
"github.com/acm-uiuc/groot-api-gateway/config"
17+
"github.com/arbor-dev/arbor"
1818
)
1919

2020
//Location

‎services/events.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ package services
1313
import (
1414
"net/http"
1515

16-
"github.com/acm-uiuc/arbor"
1716
"github.com/acm-uiuc/groot-api-gateway/config"
17+
"github.com/arbor-dev/arbor"
1818
)
1919

2020
//Location

‎services/gigs.go‎

Lines changed: 62 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ package services
1313
import (
1414
"net/http"
1515

16-
"github.com/acm-uiuc/arbor"
1716
"github.com/acm-uiuc/groot-api-gateway/config"
17+
"github.com/arbor-dev/arbor"
1818
)
1919

2020
//Location
@@ -25,66 +25,66 @@ const GigFormat string = "JSON"
2525

2626
//API Interface
2727
var GigsRoutes = arbor.RouteCollection{
28-
arbor.Route{
29-
"ListGigs",
30-
"GET",
31-
"/gigs",
32-
ListGigs,
33-
},
34-
arbor.Route{
35-
"NewGig",
36-
"POST",
37-
"/gigs",
38-
NewGig,
39-
},
40-
arbor.Route{
41-
"GigInfo",
42-
"GET",
43-
"/gigs/{gig_id}",
44-
GigInfo,
45-
},
46-
arbor.Route{
47-
"EditGig",
48-
"PUT",
49-
"/gigs/{gig_id}",
50-
EditGig,
51-
},
52-
arbor.Route{
53-
"DeleteGig",
54-
"DELETE",
55-
"/gigs/{gig_id}",
56-
DeleteGig,
57-
},
58-
arbor.Route{
59-
"ListClaims",
60-
"GET",
61-
"/gigs/claims",
62-
ListClaims,
63-
},
64-
arbor.Route{
65-
"CreateClaim",
66-
"POST",
67-
"/gigs/claims",
68-
CreateClaim,
69-
},
70-
arbor.Route{
71-
"ListSingleClaim",
72-
"GET",
73-
"/gigs/claims/{claim_id}",
74-
ListSingleClaim,
75-
},
76-
arbor.Route{
77-
"AcceptClaim",
78-
"PUT",
79-
"/gigs/claims/{claim_id}",
80-
AcceptClaim,
81-
},
82-
arbor.Route{
83-
"DeleteClaim",
84-
"DELETE",
85-
"/gigs/claims/{claim_id}",
86-
DeleteClaim,
87-
},
28+
arbor.Route{
29+
"ListGigs",
30+
"GET",
31+
"/gigs",
32+
ListGigs,
33+
},
34+
arbor.Route{
35+
"NewGig",
36+
"POST",
37+
"/gigs",
38+
NewGig,
39+
},
40+
arbor.Route{
41+
"GigInfo",
42+
"GET",
43+
"/gigs/{gig_id}",
44+
GigInfo,
45+
},
46+
arbor.Route{
47+
"EditGig",
48+
"PUT",
49+
"/gigs/{gig_id}",
50+
EditGig,
51+
},
52+
arbor.Route{
53+
"DeleteGig",
54+
"DELETE",
55+
"/gigs/{gig_id}",
56+
DeleteGig,
57+
},
58+
arbor.Route{
59+
"ListClaims",
60+
"GET",
61+
"/gigs/claims",
62+
ListClaims,
63+
},
64+
arbor.Route{
65+
"CreateClaim",
66+
"POST",
67+
"/gigs/claims",
68+
CreateClaim,
69+
},
70+
arbor.Route{
71+
"ListSingleClaim",
72+
"GET",
73+
"/gigs/claims/{claim_id}",
74+
ListSingleClaim,
75+
},
76+
arbor.Route{
77+
"AcceptClaim",
78+
"PUT",
79+
"/gigs/claims/{claim_id}",
80+
AcceptClaim,
81+
},
82+
arbor.Route{
83+
"DeleteClaim",
84+
"DELETE",
85+
"/gigs/claims/{claim_id}",
86+
DeleteClaim,
87+
},
8888
}
8989

9090
//Route handler
@@ -105,7 +105,7 @@ func CreateClaim(w http.ResponseWriter, r *http.Request) {
105105
}
106106

107107
func EditGig(w http.ResponseWriter, r *http.Request) {
108-
arbor.PUT(w, GigsURL+r.URL.String(), GigFormat, "", r)
108+
arbor.PUT(w, GigsURL+r.URL.String(), GigFormat, "", r)
109109
}
110110

111111
func DeleteGig(w http.ResponseWriter, r *http.Request) {

‎services/groups.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ package services
1313
import (
1414
"net/http"
1515

16-
"github.com/acm-uiuc/arbor"
1716
"github.com/acm-uiuc/groot-api-gateway/config"
17+
"github.com/arbor-dev/arbor"
1818
)
1919

2020
//Location

‎services/hardware.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ package services
1313
import (
1414
"net/http"
1515

16-
"github.com/acm-uiuc/arbor"
1716
"github.com/acm-uiuc/groot-api-gateway/config"
17+
"github.com/arbor-dev/arbor"
1818
)
1919

2020
//Location

0 commit comments

Comments
 (0)