Skip to content

Riina Antikainen / Moya

Go to a project
Commit 0dc54a2c by Tuukka Kivilahti
Options

Merge branch 'versionbump' into 'master' 

Update maven dependencies.

This commit should not introduce any functional changes.
Mainly this is a version bump for dependencies.
Some package names have changed, and there are few logical fixes.

This commit reduces the ear size from ~67M to ~37M (yay)

See merge request !365
2 parents 90417f92 8b96019e
Inline Side-by-side
Showing with 128 additions and 178 deletions
code/moya-cardprinter/pom.xml
......@@ -7,7 +7,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.1.2</version>
<version>${logback.version}</version>
</dependency>
</dependencies>
<parent>
......
code/moya-ear/pom.xml
......@@ -36,6 +36,16 @@
<artifactId>moya-web</artifactId>
<contextRoot>/MoyaWeb</contextRoot>
</webModule>
<webModule>
<groupId>fi.codecrew.moya</groupId>
<artifactId>moya-mgmt-web</artifactId>
<contextRoot>/mgmt</contextRoot>
</webModule>
<webModule>
<groupId>fi.codecrew.moya</groupId>
<artifactId>moya-terminal-web</artifactId>
<contextRoot>/terminal</contextRoot>
</webModule>
</modules>
</configuration>
</plugin>
......
code/moya-mgmt-web/pom.xml
......@@ -11,7 +11,7 @@
<configuration>
<warSourceDirectory>WebContent</warSourceDirectory>
<failOnMissingWebXml>false</failOnMissingWebXml>
<packagingIncludes>WEB-INF/lib/prettyfaces-core*,WEB-INF/lib/primefaces*,**/*.xml,**/*.xhtml,**/*.properties,**/*.class,**/*.png,**/*.css,**/*.js,resources/*</packagingIncludes>
<packagingExcludes>%regex[WEB-INF/lib/(?!rewrite-.*\.jar)(?!moya-restpojo.*\.jar)(?!primefaces.*\.jar)(?!all-themes.*\.jar).*]</packagingExcludes>
</configuration>
</plugin>
</plugins>
......
code/moya-parent/pom.xml
......@@ -24,7 +24,7 @@
<!-- Primefaces dependency -->
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>1.3.1</version>
<version>1.3.2</version>
</dependency>
<dependency>
<groupId>org.primefaces.extensions</groupId>
......@@ -61,7 +61,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.4</version>
<version>4.5.3</version>
</dependency>
<dependency>
<groupId>org.testng</groupId>
......@@ -78,12 +78,12 @@
<dependency>
<groupId>fi.iudex</groupId>
<artifactId>utils-standalone</artifactId>
<version>1.0.22</version>
<version>${iudex.standalone}</version>
</dependency>
<dependency>
<groupId>org.primefaces.extensions</groupId>
<artifactId>resources-ckeditor</artifactId>
<version>4.0.0</version>
<version>${primefaces.extensions}</version>
</dependency>
<dependency>
<groupId>net.sf.barcode4j</groupId>
......@@ -110,6 +110,11 @@
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.5</version>
</dependency>
<dependency>
<groupId>javax.json</groupId>
<artifactId>javax.json-api</artifactId>
<version>1.0</version>
......@@ -138,18 +143,13 @@
<version>1.0.4</version>
</dependency>
<dependency>
<groupId>net.matlux</groupId>
<artifactId>jvm-breakglass</artifactId>
<version>0.0.8</version>
</dependency>
<dependency>
<groupId>com.wordnik</groupId>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
<version>${swagger.version}</version>
</dependency>
<dependency>
<groupId>com.wordnik</groupId>
<artifactId>swagger-jersey2-jaxrs_2.11</artifactId>
<groupId>io.swagger</groupId>
<artifactId>swagger-jersey2-jaxrs</artifactId>
<version>${swagger.version}</version>
<exclusions>
<exclusion>
......@@ -163,8 +163,8 @@
</exclusions>
</dependency>
<dependency>
<groupId>com.wordnik</groupId>
<artifactId>swagger-servlet_2.11</artifactId>
<groupId>io.swagger</groupId>
<artifactId>swagger-servlet</artifactId>
<version>${swagger.version}</version>
</dependency>
<dependency>
......
code/moya-restpojo/pom.xml
......@@ -45,7 +45,7 @@
</build>
<dependencies>
<dependency>
<groupId>com.wordnik</groupId>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
<version>${swagger.version}</version>
</dependency>
......
code/moya-restpojo/src/main/java/fi/codecrew/moya/rest/pojo/appconfig/v1/EventPojo.java
package fi.codecrew.moya.rest.pojo.appconfig.v1;
import com.wordnik.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModel;
import javax.xml.bind.annotation.XmlElement;
import java.util.List;
......
code/moya-restpojo/src/main/java/fi/codecrew/moya/rest/pojo/map/v1/MapRoot.java
......@@ -18,8 +18,9 @@
*/
package fi.codecrew.moya.rest.pojo.map.v1;
import io.swagger.annotations.ApiModel;
import java.util.List;
import com.wordnik.swagger.annotations.ApiModel;
import javax.xml.bind.annotation.XmlRootElement;
......@@ -27,22 +28,22 @@ import javax.xml.bind.annotation.XmlRootElement;
@ApiModel("Map")
public class MapRoot {
private List<MapPojo> maps;
private List<MapPojo> maps;
public MapRoot() {
public MapRoot() {
}
}
public MapRoot(List<MapPojo> ret) {
this.setMaps(ret);
}
public MapRoot(List<MapPojo> ret) {
this.setMaps(ret);
}
public List<MapPojo> getMaps() {
return maps;
}
public List<MapPojo> getMaps() {
return maps;
}
public void setMaps(List<MapPojo> maps) {
this.maps = maps;
}
public void setMaps(List<MapPojo> maps) {
this.maps = maps;
}
}
code/moya-restpojo/src/main/java/fi/codecrew/moya/rest/pojo/map/v1/PlacePojo.java
......@@ -18,11 +18,12 @@
*/
package fi.codecrew.moya.rest.pojo.map.v1;
import io.swagger.annotations.ApiModel;
import java.util.Calendar;
import javax.xml.bind.annotation.XmlElement;
import com.wordnik.swagger.annotations.ApiModel;
@ApiModel
public class PlacePojo {
......
code/moya-restpojo/src/main/java/fi/codecrew/moya/rest/pojo/map/v1/PlaceRoot.java
......@@ -18,8 +18,9 @@
*/
package fi.codecrew.moya.rest.pojo.map.v1;
import io.swagger.annotations.ApiModel;
import java.util.List;
import com.wordnik.swagger.annotations.ApiModel;
import javax.xml.bind.annotation.XmlRootElement;
......
code/moya-restpojo/src/main/java/fi/codecrew/moya/rest/pojo/network/v1/NetworkAssociationInfoPojo.java
......@@ -18,7 +18,8 @@
*/
package fi.codecrew.moya.rest.pojo.network.v1;
import com.wordnik.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModel;
import javax.xml.bind.annotation.XmlElement;
......
code/moya-restpojo/src/main/java/fi/codecrew/moya/rest/pojo/network/v1/NetworkAssociationResponseRoot.java
......@@ -18,11 +18,12 @@
*/
package fi.codecrew.moya.rest.pojo.network.v1;
import io.swagger.annotations.ApiModel;
import java.util.ArrayList;
import java.util.List;
import com.wordnik.swagger.annotations.ApiModel;
@ApiModel
public class NetworkAssociationResponseRoot {
private RESTCallResultPojo result;
......
code/moya-restpojo/src/main/java/fi/codecrew/moya/rest/pojo/network/v1/RESTCallResultPojo.java
......@@ -18,9 +18,10 @@
*/
package fi.codecrew.moya.rest.pojo.network.v1;
import io.swagger.annotations.ApiModel;
import javax.xml.bind.annotation.XmlElement;
import com.wordnik.swagger.annotations.ApiModel;
@ApiModel
public class RESTCallResultPojo {
......
code/moya-restpojo/src/main/java/fi/codecrew/moya/rest/pojo/reader/v1/ReaderEventRestPojo.java
......@@ -24,8 +24,8 @@ import javax.xml.bind.annotation.XmlElement;
import fi.codecrew.moya.rest.pojo.userinfo.v1.EventUserRestPojo;
import fi.codecrew.moya.rest.pojo.userinfo.v1.PrintedCardRestPojo;
import io.swagger.annotations.ApiModel;
import com.wordnik.swagger.annotations.ApiModel;
@ApiModel
public class ReaderEventRestPojo {
......
code/moya-restpojo/src/main/java/fi/codecrew/moya/rest/pojo/reader/v1/ReaderRestPojo.java
......@@ -18,7 +18,8 @@
*/
package fi.codecrew.moya.rest.pojo.reader.v1;
import com.wordnik.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModel;
import javax.xml.bind.annotation.XmlElement;
......
code/moya-restpojo/src/main/java/fi/codecrew/moya/rest/pojo/userinfo/v1/EventUserRestPojo.java
......@@ -18,9 +18,9 @@
*/
package fi.codecrew.moya.rest.pojo.userinfo.v1;
import com.wordnik.swagger.annotations.Api;
import com.wordnik.swagger.annotations.ApiModel;
import com.wordnik.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import javax.xml.bind.annotation.XmlElement;
......@@ -60,9 +60,8 @@ public class EventUserRestPojo {
@XmlElement()
@ApiModelProperty("User entity ID")
public Integer getuserId()
{
return getUserId();
public Integer getUserId() {
return userId;
}
@XmlElement()
......@@ -89,9 +88,6 @@ public class EventUserRestPojo {
this.eventuserId = eventuserId;
}
public Integer getUserId() {
return userId;
}
public void setUserId(Integer userId) {
this.userId = userId;
......
code/moya-restpojo/src/main/java/fi/codecrew/moya/rest/pojo/userinfo/v1/PrintedCardRestPojo.java
......@@ -18,8 +18,9 @@
*/
package fi.codecrew.moya.rest.pojo.userinfo.v1;
import io.swagger.annotations.ApiModel;
import java.util.Date;
import com.wordnik.swagger.annotations.ApiModel;
import javax.xml.bind.annotation.XmlElement;
......
code/moya-restpojo/src/main/java/fi/codecrew/moya/rest/pojo/userinfo/v1/SimpleEventuserRoot.java
......@@ -18,9 +18,10 @@
*/
package fi.codecrew.moya.rest.pojo.userinfo.v1;
import io.swagger.annotations.ApiModel;
import java.util.ArrayList;
import java.util.List;
import com.wordnik.swagger.annotations.ApiModel;
import javax.xml.bind.annotation.XmlRootElement;
......
code/moya-restpojo/src/main/java/fi/codecrew/moya/rest/pojo/userinfo/v1/UserPermissionRestPojo.java
......@@ -18,9 +18,10 @@
*/
package fi.codecrew.moya.rest.pojo.userinfo.v1;
import io.swagger.annotations.ApiModel;
import javax.xml.bind.annotation.XmlElement;
import com.wordnik.swagger.annotations.ApiModel;
@ApiModel
public class UserPermissionRestPojo {
......
code/moya-restpojo/src/main/java/fi/codecrew/moya/rest/pojo/util/v1/ErrorRoot.java
package fi.codecrew.moya.rest.pojo.util.v1;
import com.wordnik.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModel;
import javax.xml.bind.annotation.XmlRootElement;
......
code/moya-terminal-web/pom.xml
......@@ -12,7 +12,7 @@
<configuration>
<warSourceDirectory>WebContent</warSourceDirectory>
<failOnMissingWebXml>false</failOnMissingWebXml>
<packagingIncludes>WEB-INF/lib/primefaces*,**/*.xml,**/*.xhtml,**/*.properties,**/*.class,**/*.png,**/*.css,**/*.js,resources/*</packagingIncludes>
<packagingExcludes>%regex[WEB-INF/lib/(?!rewrite-.*\.jar)(?!moya-restpojo.*\.jar)(?!primefaces.*\.jar)(?!all-themes.*\.jar).*]</packagingExcludes>
</configuration>
</plugin>
</plugins>
......
code/moya-web/pom.xml
......@@ -12,7 +12,7 @@
<configuration>
<warSourceDirectory>WebContent</warSourceDirectory>
<failOnMissingWebXml>false</failOnMissingWebXml>
<packagingIncludes>WEB-INF/lib/rewrite-*.jar,WEB-INF/lib/moya-restpojo*,WEB-INF/lib/primefaces*,WEB-INF/lib/all-themes-*.jar,**/*.xml,**/*.xhtml,**/*.properties,**/*.class,**/*.png,**/*.css,**/*.js,resources/*,swagger/**</packagingIncludes>
<packagingExcludes>%regex[WEB-INF/lib/(?!rewrite-.*\.jar)(?!moya-restpojo.*\.jar)(?!primefaces.*\.jar)(?!all-themes.*\.jar).*]</packagingExcludes>
</configuration>
</plugin>
</plugins>
......@@ -31,14 +31,9 @@
<version>${primefaces.version}</version>
</dependency>
<dependency>
<groupId>org.primefaces.extensions</groupId>
<artifactId>primefaces-extensions</artifactId>
<version>${primefaces.extensions}</version>
</dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>2.3</version>
<version>${jodatime.version}</version>
</dependency>
<dependency>
<groupId>org.primefaces.themes</groupId>
......@@ -66,12 +61,12 @@
<dependency>
<groupId>org.ocpsoft.rewrite</groupId>
<artifactId>rewrite-servlet</artifactId>
<version>3.4.1.Final</version>
<version>${rewriteservlet.version}</version>
</dependency>
<dependency>
<groupId>org.ocpsoft.rewrite</groupId>
<artifactId>rewrite-config-prettyfaces</artifactId>
<version>3.4.1.Final</version>
<version>${rewriteservlet.version}</version>
</dependency>
</dependencies>
......
code/moya-web/src/main/java/fi/codecrew/moya/management/ReplServlet.java deleted 100644 → 0
package fi.codecrew.moya.management;
import java.io.IOException;
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.UnavailableException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.matlux.NreplServer;
@WebServlet(loadOnStartup = 5, name = "repl-servlet")
public class ReplServlet extends HttpServlet {
/**
*
*/
private static final long serialVersionUID = -344649442062099092L;
private static final int NREPL_DEFAULT_PORT = 1112;
private NreplServer nreplServer;
private ServletConfig servletConfig;
private static final Logger logger = LoggerFactory.getLogger(ReplServlet.class);
@Override
public void init(ServletConfig config) throws ServletException {
logger.info("initializing Repl servlet for port {}", NREPL_DEFAULT_PORT);
servletConfig = config;
int port = NREPL_DEFAULT_PORT;
String portStr = config.getInitParameter("port");
if (portStr != null) {
port = Integer.parseInt(portStr);
}
nreplServer = new NreplServer(port);
}
@Override
public ServletConfig getServletConfig() {
return servletConfig;
}
@Override
public void service(ServletRequest req, ServletResponse res) throws ServletException, IOException {
throw new UnavailableException("This servlet doesn't really serve.");
}
@Override
public String getServletInfo() {
return "REPL Servlet for introspecting the JVM";
}
public NreplServer getNreplServer() {
return nreplServer;
}
@Override
public void destroy() {
if (nreplServer != null) {
nreplServer.stop();
nreplServer.unregisterMBean();
nreplServer.clear();
nreplServer = null;
}
}
}
code/moya-web/src/main/java/fi/codecrew/moya/rest/AccountEventRestView.java
......@@ -23,9 +23,6 @@ import java.util.Calendar;
import java.util.Map.Entry;
import java.util.SortedMap;
import java.util.TreeMap;
import com.wordnik.swagger.annotations.Api;
import com.wordnik.swagger.annotations.ApiOperation;
import com.wordnik.swagger.annotations.ApiResponse;
import javax.ejb.EJB;
import javax.enterprise.context.RequestScoped;
......@@ -41,6 +38,9 @@ import fi.codecrew.moya.model.AccountEvent;
import fi.codecrew.moya.model.Product;
import fi.codecrew.moya.rest.highcharts.HcSeries;
import fi.codecrew.moya.rest.highcharts.HcSeriesRoot;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
@RequestScoped
@Path("/acc")
......
code/moya-web/src/main/java/fi/codecrew/moya/rest/MapAdminView.java
......@@ -38,9 +38,9 @@ import javax.ws.rs.core.Response.Status;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.wordnik.swagger.annotations.Api;
import com.wordnik.swagger.annotations.ApiOperation;
import com.wordnik.swagger.annotations.ApiResponse;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
import fi.codecrew.moya.beans.EventBeanLocal;
import fi.codecrew.moya.beans.EventMapBeanLocal;
......
code/moya-web/src/main/java/fi/codecrew/moya/rest/RestApplicationEntrypoint.java
......@@ -20,14 +20,12 @@ package fi.codecrew.moya.rest;
import javax.ws.rs.ApplicationPath;
import io.swagger.jaxrs.listing.ApiListingResource;
import org.glassfish.jersey.filter.LoggingFilter;
import org.glassfish.jersey.media.multipart.MultiPartFeature;
import org.glassfish.jersey.server.ResourceConfig;
import com.wordnik.swagger.jaxrs.config.BeanConfig;
import com.wordnik.swagger.jersey.listing.ApiListingResourceJSON;
import com.wordnik.swagger.jersey.listing.JerseyApiDeclarationProvider;
import com.wordnik.swagger.jersey.listing.JerseyResourceListingProvider;
import io.swagger.jaxrs.config.BeanConfig;
@ApplicationPath(RestApplicationEntrypoint.REST_PATH)
public class RestApplicationEntrypoint extends ResourceConfig {
......@@ -52,15 +50,15 @@ public class RestApplicationEntrypoint extends ResourceConfig {
//ClassReaders.setReader(new JerseyApiReader());
//ClassReaders.setReader(new DefaultJaxrsApiReader());
register(ApiListingResourceJSON.class);
register(JerseyApiDeclarationProvider.class);
register(JerseyResourceListingProvider.class);
// register(ApiListingResource.class);
//register(JerseyApiDeclarationProvider.class);
//register(JerseyResourceListingProvider.class);
// mime multipart image uploads
register(MultiPartFeature.class);
// packages to scan
packages("com.wordnik.swagger.jaxrs.json", "fi.codecrew.moya.rest");
packages("io.swagger.jaxrs.json", "fi.codecrew.moya.rest");
registerInstances(new LoggingFilter());
}
......
code/moya-web/src/main/java/fi/codecrew/moya/rest/UserRestView.java
......@@ -46,9 +46,9 @@ import javax.ws.rs.core.Response.Status;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.wordnik.swagger.annotations.Api;
import com.wordnik.swagger.annotations.ApiOperation;
import com.wordnik.swagger.annotations.ApiParam;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import fi.codecrew.moya.beans.CardTemplateBeanLocal;
import fi.codecrew.moya.beans.PermissionBeanLocal;
......
code/moya-web/src/main/java/fi/codecrew/moya/rest/appconfig/v1/EventInfoV1.java
......@@ -9,9 +9,9 @@ import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import com.wordnik.swagger.annotations.Api;
import com.wordnik.swagger.annotations.ApiOperation;
import com.wordnik.swagger.annotations.ApiResponse;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
import fi.codecrew.moya.beans.EventBeanLocal;
import fi.codecrew.moya.beans.PermissionBeanLocal;
......
code/moya-web/src/main/java/fi/codecrew/moya/rest/meta/v1/EventUserRestViewV1.java
......@@ -32,10 +32,10 @@ import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.PathSegment;
import com.wordnik.swagger.annotations.Api;
import com.wordnik.swagger.annotations.ApiOperation;
import com.wordnik.swagger.annotations.ApiParam;
import com.wordnik.swagger.annotations.ApiResponse;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import io.swagger.annotations.ApiResponse;
import fi.codecrew.moya.beans.UserBeanLocal;
import fi.codecrew.moya.model.EventUser;
......
code/moya-web/src/main/java/fi/codecrew/moya/rest/meta/v1/PrintedCardRestViewV1.java
......@@ -32,10 +32,10 @@ import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.PathSegment;
import com.wordnik.swagger.annotations.Api;
import com.wordnik.swagger.annotations.ApiOperation;
import com.wordnik.swagger.annotations.ApiParam;
import com.wordnik.swagger.annotations.ApiResponse;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import io.swagger.annotations.ApiResponse;
import fi.codecrew.moya.beans.CardTemplateBeanLocal;
import fi.codecrew.moya.model.PrintedCard;
......
code/moya-web/src/main/java/fi/codecrew/moya/rest/meta/v1/UserRestViewV1.java
......@@ -30,12 +30,11 @@ import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.PathSegment;
import com.wordnik.swagger.annotations.Api;
import com.wordnik.swagger.annotations.ApiOperation;
import com.wordnik.swagger.annotations.ApiParam;
import fi.codecrew.moya.beans.UserBeanLocal;
import fi.codecrew.moya.model.User;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@RequestScoped
@Path("/meta/v1/user")
......
code/moya-web/src/main/java/fi/codecrew/moya/rest/placemap/v1/PlaceCodePojo.java
......@@ -2,9 +2,10 @@ package fi.codecrew.moya.rest.placemap.v1;
import javax.xml.bind.annotation.XmlRootElement;
import com.wordnik.swagger.annotations.ApiModel;
import fi.codecrew.moya.model.Place;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModel;
@XmlRootElement()
@ApiModel(description = "PlaceCode")
......
code/moya-web/src/main/java/fi/codecrew/moya/rest/v2/ProductRestView.java
......@@ -10,10 +10,10 @@ import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import com.wordnik.swagger.annotations.Api;
import fi.codecrew.moya.beans.ProductBeanLocal;
import fi.codecrew.moya.rest.v2.pojo.ProductPojo;
import io.swagger.annotations.Api;
@RequestScoped
@Path("/v2/product")
......
code/moya-web/src/main/java/fi/codecrew/moya/rest/v2/UserRestViewV2.java
package fi.codecrew.moya.rest.v2;
import com.wordnik.swagger.annotations.Api;
import com.wordnik.swagger.annotations.ApiOperation;
import com.wordnik.swagger.annotations.ApiParam;
import fi.codecrew.moya.beans.EventBeanLocal;
import fi.codecrew.moya.beans.PermissionBeanLocal;
import fi.codecrew.moya.beans.UserBeanLocal;
......@@ -14,6 +11,9 @@ import fi.codecrew.moya.model.UserImage;
import fi.codecrew.moya.rest.PojoUtils;
import fi.codecrew.moya.rest.pojo.userinfo.v1.EventUserRestPojo;
import fi.codecrew.moya.rest.v2.pojo.UserPojo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
import org.glassfish.jersey.media.multipart.FormDataParam;
......
code/moya-web/src/main/java/fi/codecrew/moya/rest/v2/VipRestView.java
......@@ -15,7 +15,7 @@ import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import com.wordnik.swagger.annotations.Api;
import io.swagger.annotations.Api;
import fi.codecrew.moya.beans.PermissionBeanLocal;
import fi.codecrew.moya.beans.ProductBeanLocal;
......
code/moya-web/src/main/java/fi/codecrew/moya/rest/v2/pojo/ProductPojo.java
......@@ -6,7 +6,7 @@ import java.util.List;
import javax.xml.bind.annotation.XmlRootElement;
import com.wordnik.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModel;
import fi.codecrew.moya.model.Product;
......
code/moya-web/src/main/java/fi/codecrew/moya/rest/v2/pojo/UserPojo.java
package fi.codecrew.moya.rest.v2.pojo;
import com.wordnik.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModel;
import javax.xml.bind.annotation.XmlRootElement;
import java.util.Date;
......
code/moya-web/src/main/java/fi/codecrew/moya/rest/v2/pojo/VipRestPojo.java
......@@ -6,7 +6,7 @@ import java.util.List;
import javax.xml.bind.annotation.XmlRootElement;
import com.wordnik.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModel;
import fi.codecrew.moya.model.Vip;
import fi.codecrew.moya.model.VipProduct;
......
code/pom.xml
......@@ -27,14 +27,22 @@
<javaee-api-version>7.0</javaee-api-version>
<!-- EJB spec version -->
<ejb-spec-version>3.2</ejb-spec-version>
<swagger.version>1.3.12</swagger.version>
<slf4j.version>1.7.12</slf4j.version>
<logback.version>1.1.3</logback.version>
<testng.version>6.8.21</testng.version>
<javamelody.version>1.58.0</javamelody.version>
<swagger.version>1.5.13</swagger.version>
<slf4j.version>1.7.25</slf4j.version>
<logback.version>1.2.3</logback.version>
<testng.version>6.11</testng.version>
<javamelody.version>1.65.0</javamelody.version>
<primefaces.version>6.0</primefaces.version>
<primefaces.themeversion>1.0.10</primefaces.themeversion>
<primefaces.extensions>6.0.0</primefaces.extensions>
<jodatime.version>2.9.9</jodatime.version>
<rewriteservlet.version>3.4.1.Final</rewriteservlet.version>
<iudex.standalone>1.0.23</iudex.standalone>
</properties>
<url>http://codecrew.fi</url>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!