Commit ae3b0ab6 by Juho Juopperi

undo some changes that were made elsewhere

1 parent f173b9d8
...@@ -35,16 +35,6 @@ public class EventUserRestPojo { ...@@ -35,16 +35,6 @@ public class EventUserRestPojo {
private String firstname = ""; private String firstname = "";
private String lastname = ""; private String lastname = "";
// foo..
private String birthday;
private String gender;
private String phoneNumber;
// address info
private String streetAddress;
private String zipCode;
private String postOffice;
public EventUserRestPojo() { public EventUserRestPojo() {
} }
......
...@@ -63,8 +63,6 @@ ...@@ -63,8 +63,6 @@
<url-pattern>*.jsf</url-pattern> <url-pattern>*.jsf</url-pattern>
</servlet-mapping> </servlet-mapping>
<!-- <servlet> <servlet-name>ViewStatusMessages</servlet-name> <servlet-class>ch.qos.logback.classic.ViewStatusMessagesServlet <!-- <servlet> <servlet-name>ViewStatusMessages</servlet-name> <servlet-class>ch.qos.logback.classic.ViewStatusMessagesServlet
</servlet-class> </servlet> <servlet-mapping> <servlet-name>ViewStatusMessages</servlet-name> </servlet-class> </servlet> <servlet-mapping> <servlet-name>ViewStatusMessages</servlet-name>
<url-pattern>/logback</url-pattern> </servlet-mapping> --> <url-pattern>/logback</url-pattern> </servlet-mapping> -->
......
...@@ -89,9 +89,6 @@ public class UserRestView { ...@@ -89,9 +89,6 @@ public class UserRestView {
@EJB @EJB
private PlaceBeanLocal placebean; private PlaceBeanLocal placebean;
@EJB
private RoleBeanLocal roleBean;
@POST @POST
@Path("/giveplace/{placeId}") @Path("/giveplace/{placeId}")
@Consumes(MediaType.APPLICATION_FORM_URLENCODED) @Consumes(MediaType.APPLICATION_FORM_URLENCODED)
...@@ -266,23 +263,6 @@ public class UserRestView { ...@@ -266,23 +263,6 @@ public class UserRestView {
return new EventUserRestPojo(); return new EventUserRestPojo();
} }
@POST
@Path("/create")
@Produces({ MediaType.APPLICATION_JSON })
@Consumes(MediaType.APPLICATION_FORM_URLENCODED)
@ApiOperation(value = "Create user", response = EventUserRestPojo.class)
public Response createEventUser() {
// XXX
if (permbean.hasPermission(UserPermission.CREATE_NEW) == false) {
return Response.status(Status.FORBIDDEN).build();
}
return Response.status(Status.NOT_IMPLEMENTED).build();
}
@GET @GET
@Path("/") @Path("/")
@Produces({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON })
...@@ -394,12 +374,4 @@ public class UserRestView { ...@@ -394,12 +374,4 @@ public class UserRestView {
} }
} }
@GET
@Path("/{userid}/image")
@ApiOperation(value = "Download user image")
@Consumes(MediaType.MULTIPART_FORM_DATA)
public Response downloadUserImage(@PathParam("userid") @ApiParam("User ID") Integer userId) {
return Response.ok().build();
}
} }
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!