From f794c5efa5fb5cbb04e73d91e5a31af503f01459 Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Fri, 29 Jun 2018 16:39:46 -0500 Subject: [PATCH 1/8] Improve Server Response for invalid Credentials and Users --- auth/pom.xml | 10 +++++----- .../edu/tamu/weaver/auth/AuthConstants.java | 4 +++- .../handler/AuthRestExceptionHandler.java | 18 +++++++++++++++++- .../CredentialsNotFoundException.java | 11 +++++++++++ .../auth/exception/UserNotFoundException.java | 11 +++++++++++ .../WeaverCredentialsArgumentResolver.java | 9 ++++++--- .../resolver/WeaverUserArgumentResolver.java | 7 +++++-- cli/pom.xml | 2 +- core/pom.xml | 2 +- data/pom.xml | 4 ++-- email/pom.xml | 2 +- pom.xml | 2 +- reporting/pom.xml | 6 +++--- token-provider/pom.xml | 6 +++--- token/pom.xml | 2 +- user/pom.xml | 6 +++--- validation/pom.xml | 4 ++-- wro/pom.xml | 4 ++-- 18 files changed, 78 insertions(+), 32 deletions(-) create mode 100644 auth/src/main/java/edu/tamu/weaver/auth/exception/CredentialsNotFoundException.java create mode 100644 auth/src/main/java/edu/tamu/weaver/auth/exception/UserNotFoundException.java diff --git a/auth/pom.xml b/auth/pom.xml index 30444ea6..f649b6d9 100644 --- a/auth/pom.xml +++ b/auth/pom.xml @@ -12,7 +12,7 @@ edu.tamu.weaver webservice-parent - 2.0.0-RC4-SNAPSHOT + 2.x-resolver-exceptions-SNAPSHOT @@ -20,25 +20,25 @@ edu.tamu.weaver core - 2.0.0-RC4-SNAPSHOT + 2.x-resolver-exceptions-SNAPSHOT edu.tamu.weaver user - 2.0.0-RC4-SNAPSHOT + 2.x-resolver-exceptions-SNAPSHOT edu.tamu.weaver token - 2.0.0-RC4-SNAPSHOT + 2.x-resolver-exceptions-SNAPSHOT edu.tamu.weaver email - 2.0.0-RC4-SNAPSHOT + 2.x-resolver-exceptions-SNAPSHOT diff --git a/auth/src/main/java/edu/tamu/weaver/auth/AuthConstants.java b/auth/src/main/java/edu/tamu/weaver/auth/AuthConstants.java index ecc4982e..ebe006f0 100644 --- a/auth/src/main/java/edu/tamu/weaver/auth/AuthConstants.java +++ b/auth/src/main/java/edu/tamu/weaver/auth/AuthConstants.java @@ -29,9 +29,11 @@ public class AuthConstants { public final static byte[] ERROR_RESPONSE; public final static byte[] UNAUTHORIZED_RESPONSE; - + public final static ApiResponse UNAUTHORIZED_API_RESPONSE = new ApiResponse(UNAUTHORIZED); + public final static ApiResponse SERVER_ERROR_API_RESPONSE = new ApiResponse(ERROR); + static { ObjectMapper objectMapper = new ObjectMapper(); byte[] expiredResponse = new byte[0]; diff --git a/auth/src/main/java/edu/tamu/weaver/auth/controller/handler/AuthRestExceptionHandler.java b/auth/src/main/java/edu/tamu/weaver/auth/controller/handler/AuthRestExceptionHandler.java index 0f30a2fe..3d33a8ca 100644 --- a/auth/src/main/java/edu/tamu/weaver/auth/controller/handler/AuthRestExceptionHandler.java +++ b/auth/src/main/java/edu/tamu/weaver/auth/controller/handler/AuthRestExceptionHandler.java @@ -10,7 +10,10 @@ import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.RestController; +import edu.tamu.weaver.auth.exception.CredentialsNotFoundException; +import edu.tamu.weaver.auth.exception.UserNotFoundException; import edu.tamu.weaver.response.ApiResponse; +import edu.tamu.weaver.response.ApiStatus; @RestController @ControllerAdvice @@ -19,8 +22,21 @@ public class AuthRestExceptionHandler { @ExceptionHandler(AccessDeniedException.class) @ResponseStatus(value = HttpStatus.UNAUTHORIZED) @ResponseBody - public ApiResponse handleAccessDeniedExceptionRest(AccessDeniedException exception) { + public ApiResponse handleAccessDeniedException(AccessDeniedException exception) { return UNAUTHORIZED_API_RESPONSE; } + @ExceptionHandler(CredentialsNotFoundException.class) + @ResponseStatus(value = HttpStatus.INTERNAL_SERVER_ERROR) + @ResponseBody + public ApiResponse handleCredentialsNotFoundException(CredentialsNotFoundException exception) { + return new ApiResponse(ApiStatus.ERROR, exception.getMessage()); + } + + @ExceptionHandler(UserNotFoundException.class) + @ResponseStatus(value = HttpStatus.INTERNAL_SERVER_ERROR) + @ResponseBody + public ApiResponse handleUserNotFoundException(UserNotFoundException exception) { + return new ApiResponse(ApiStatus.ERROR, exception.getMessage()); + } } \ No newline at end of file diff --git a/auth/src/main/java/edu/tamu/weaver/auth/exception/CredentialsNotFoundException.java b/auth/src/main/java/edu/tamu/weaver/auth/exception/CredentialsNotFoundException.java new file mode 100644 index 00000000..ba8a12fa --- /dev/null +++ b/auth/src/main/java/edu/tamu/weaver/auth/exception/CredentialsNotFoundException.java @@ -0,0 +1,11 @@ +package edu.tamu.weaver.auth.exception; + +public class CredentialsNotFoundException extends RuntimeException { + + private static final long serialVersionUID = -4128620872122571673L; + + public CredentialsNotFoundException(String message) { + super(message); + } + +} diff --git a/auth/src/main/java/edu/tamu/weaver/auth/exception/UserNotFoundException.java b/auth/src/main/java/edu/tamu/weaver/auth/exception/UserNotFoundException.java new file mode 100644 index 00000000..500d5a6f --- /dev/null +++ b/auth/src/main/java/edu/tamu/weaver/auth/exception/UserNotFoundException.java @@ -0,0 +1,11 @@ +package edu.tamu.weaver.auth.exception; + +public class UserNotFoundException extends RuntimeException { + + private static final long serialVersionUID = -7779314921709249299L; + + public UserNotFoundException(String message) { + super(message); + } + +} diff --git a/auth/src/main/java/edu/tamu/weaver/auth/resolver/WeaverCredentialsArgumentResolver.java b/auth/src/main/java/edu/tamu/weaver/auth/resolver/WeaverCredentialsArgumentResolver.java index b1d1bfdb..a8d4d8bb 100644 --- a/auth/src/main/java/edu/tamu/weaver/auth/resolver/WeaverCredentialsArgumentResolver.java +++ b/auth/src/main/java/edu/tamu/weaver/auth/resolver/WeaverCredentialsArgumentResolver.java @@ -9,24 +9,27 @@ import org.springframework.web.method.support.ModelAndViewContainer; import edu.tamu.weaver.auth.annotation.WeaverCredentials; +import edu.tamu.weaver.auth.exception.CredentialsNotFoundException; import edu.tamu.weaver.auth.model.Credentials; import edu.tamu.weaver.utility.AnnotationUtility; public final class WeaverCredentialsArgumentResolver implements HandlerMethodArgumentResolver { + @Override public boolean supportsParameter(MethodParameter parameter) { return AnnotationUtility.findMethodAnnotation(WeaverCredentials.class, parameter) != null; } + @Override public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer, NativeWebRequest webRequest, WebDataBinderFactory binderFactory) throws Exception { Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); if (authentication == null) { - return null; + throw new CredentialsNotFoundException("Authentication Object Not Found"); } if (!(authentication.getCredentials() instanceof Credentials)) { - return null; + throw new CredentialsNotFoundException("Authentication Object Missing Credentials"); } - return (Credentials) authentication.getCredentials(); + return authentication.getCredentials(); } } \ No newline at end of file diff --git a/auth/src/main/java/edu/tamu/weaver/auth/resolver/WeaverUserArgumentResolver.java b/auth/src/main/java/edu/tamu/weaver/auth/resolver/WeaverUserArgumentResolver.java index d51d34d7..f469ca50 100644 --- a/auth/src/main/java/edu/tamu/weaver/auth/resolver/WeaverUserArgumentResolver.java +++ b/auth/src/main/java/edu/tamu/weaver/auth/resolver/WeaverUserArgumentResolver.java @@ -11,6 +11,7 @@ import org.springframework.web.method.support.ModelAndViewContainer; import edu.tamu.weaver.auth.annotation.WeaverUser; +import edu.tamu.weaver.auth.exception.UserNotFoundException; import edu.tamu.weaver.auth.model.repo.AbstractWeaverUserRepo; import edu.tamu.weaver.user.model.AbstractWeaverUser; import edu.tamu.weaver.utility.AnnotationUtility; @@ -23,18 +24,20 @@ public WeaverUserArgumentResolver(R userRepo) { this.userRepo = userRepo; } + @Override public boolean supportsParameter(MethodParameter parameter) { return AnnotationUtility.findMethodAnnotation(WeaverUser.class, parameter) != null; } + @Override public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer, NativeWebRequest webRequest, WebDataBinderFactory binderFactory) throws Exception { Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); if (authentication == null) { - return null; + throw new UserNotFoundException("Authentication Object Not Found"); } Optional user = userRepo.findByUsername(authentication.getName()); if (!user.isPresent()) { - return null; + throw new UserNotFoundException("No User With Username " + authentication.getName()); } return user.get(); } diff --git a/cli/pom.xml b/cli/pom.xml index da04c44f..214ba036 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -12,7 +12,7 @@ edu.tamu.weaver webservice-parent - 2.0.0-RC4-SNAPSHOT + 2.x-resolver-exceptions-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 183855db..2ad78ce6 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -12,7 +12,7 @@ edu.tamu.weaver webservice-parent - 2.0.0-RC4-SNAPSHOT + 2.x-resolver-exceptions-SNAPSHOT diff --git a/data/pom.xml b/data/pom.xml index 27f02f07..e4f22161 100644 --- a/data/pom.xml +++ b/data/pom.xml @@ -12,7 +12,7 @@ edu.tamu.weaver webservice-parent - 2.0.0-RC4-SNAPSHOT + 2.x-resolver-exceptions-SNAPSHOT @@ -20,7 +20,7 @@ edu.tamu.weaver core - 2.0.0-RC4-SNAPSHOT + 2.x-resolver-exceptions-SNAPSHOT diff --git a/email/pom.xml b/email/pom.xml index 72d14afb..1a5c519a 100644 --- a/email/pom.xml +++ b/email/pom.xml @@ -12,7 +12,7 @@ edu.tamu.weaver webservice-parent - 2.0.0-RC4-SNAPSHOT + 2.x-resolver-exceptions-SNAPSHOT diff --git a/pom.xml b/pom.xml index a86a7773..fd5266b8 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ webservice-parent - 2.0.0-RC4-SNAPSHOT + 2.x-resolver-exceptions-SNAPSHOT Weaver Webservice Parent diff --git a/reporting/pom.xml b/reporting/pom.xml index 6cb392ef..c9995dcf 100644 --- a/reporting/pom.xml +++ b/reporting/pom.xml @@ -12,7 +12,7 @@ edu.tamu.weaver webservice-parent - 2.0.0-RC4-SNAPSHOT + 2.x-resolver-exceptions-SNAPSHOT @@ -20,13 +20,13 @@ edu.tamu.weaver core - 2.0.0-RC4-SNAPSHOT + 2.x-resolver-exceptions-SNAPSHOT edu.tamu.weaver email - 2.0.0-RC4-SNAPSHOT + 2.x-resolver-exceptions-SNAPSHOT diff --git a/token-provider/pom.xml b/token-provider/pom.xml index e03b3e9d..5b1f229a 100644 --- a/token-provider/pom.xml +++ b/token-provider/pom.xml @@ -12,7 +12,7 @@ edu.tamu.weaver webservice-parent - 2.0.0-RC4-SNAPSHOT + 2.x-resolver-exceptions-SNAPSHOT @@ -25,13 +25,13 @@ edu.tamu.weaver token - 2.0.0-RC4-SNAPSHOT + 2.x-resolver-exceptions-SNAPSHOT edu.tamu.weaver core - 2.0.0-RC4-SNAPSHOT + 2.x-resolver-exceptions-SNAPSHOT diff --git a/token/pom.xml b/token/pom.xml index b5055bc6..920679cb 100644 --- a/token/pom.xml +++ b/token/pom.xml @@ -12,7 +12,7 @@ edu.tamu.weaver webservice-parent - 2.0.0-RC4-SNAPSHOT + 2.x-resolver-exceptions-SNAPSHOT diff --git a/user/pom.xml b/user/pom.xml index f6776473..9212f51e 100644 --- a/user/pom.xml +++ b/user/pom.xml @@ -12,7 +12,7 @@ edu.tamu.weaver webservice-parent - 2.0.0-RC4-SNAPSHOT + 2.x-resolver-exceptions-SNAPSHOT @@ -21,13 +21,13 @@ edu.tamu.weaver data - 2.0.0-RC4-SNAPSHOT + 2.x-resolver-exceptions-SNAPSHOT edu.tamu.weaver validation - 2.0.0-RC4-SNAPSHOT + 2.x-resolver-exceptions-SNAPSHOT diff --git a/validation/pom.xml b/validation/pom.xml index c9951b66..ac46c2e0 100644 --- a/validation/pom.xml +++ b/validation/pom.xml @@ -12,7 +12,7 @@ edu.tamu.weaver webservice-parent - 2.0.0-RC4-SNAPSHOT + 2.x-resolver-exceptions-SNAPSHOT @@ -21,7 +21,7 @@ edu.tamu.weaver data - 2.0.0-RC4-SNAPSHOT + 2.x-resolver-exceptions-SNAPSHOT diff --git a/wro/pom.xml b/wro/pom.xml index e16837d1..9550bd07 100644 --- a/wro/pom.xml +++ b/wro/pom.xml @@ -12,7 +12,7 @@ edu.tamu.weaver webservice-parent - 2.0.0-RC4-SNAPSHOT + 2.x-resolver-exceptions-SNAPSHOT @@ -21,7 +21,7 @@ edu.tamu.weaver data - 2.0.0-RC4-SNAPSHOT + 2.x-resolver-exceptions-SNAPSHOT From 4e8b35b1346bfc2e743863bf0285e12a48608797 Mon Sep 17 00:00:00 2001 From: William Welling Date: Mon, 2 Jul 2018 10:43:47 -0500 Subject: [PATCH 2/8] update snapshot to 2.0.0 release candidate 5 --- auth/pom.xml | 10 +++++----- cli/pom.xml | 2 +- core/pom.xml | 2 +- data/pom.xml | 4 ++-- email/pom.xml | 2 +- pom.xml | 2 +- reporting/pom.xml | 6 +++--- token-provider/pom.xml | 6 +++--- token/pom.xml | 2 +- user/pom.xml | 6 +++--- validation/pom.xml | 4 ++-- wro/pom.xml | 4 ++-- 12 files changed, 25 insertions(+), 25 deletions(-) diff --git a/auth/pom.xml b/auth/pom.xml index f649b6d9..5e7a119b 100644 --- a/auth/pom.xml +++ b/auth/pom.xml @@ -12,7 +12,7 @@ edu.tamu.weaver webservice-parent - 2.x-resolver-exceptions-SNAPSHOT + 2.0.0-RC5-SNAPSHOT @@ -20,25 +20,25 @@ edu.tamu.weaver core - 2.x-resolver-exceptions-SNAPSHOT + 2.0.0-RC5-SNAPSHOT edu.tamu.weaver user - 2.x-resolver-exceptions-SNAPSHOT + 2.0.0-RC5-SNAPSHOT edu.tamu.weaver token - 2.x-resolver-exceptions-SNAPSHOT + 2.0.0-RC5-SNAPSHOT edu.tamu.weaver email - 2.x-resolver-exceptions-SNAPSHOT + 2.0.0-RC5-SNAPSHOT diff --git a/cli/pom.xml b/cli/pom.xml index 214ba036..6e996fbc 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -12,7 +12,7 @@ edu.tamu.weaver webservice-parent - 2.x-resolver-exceptions-SNAPSHOT + 2.0.0-RC5-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 2ad78ce6..85e89bf9 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -12,7 +12,7 @@ edu.tamu.weaver webservice-parent - 2.x-resolver-exceptions-SNAPSHOT + 2.0.0-RC5-SNAPSHOT diff --git a/data/pom.xml b/data/pom.xml index e4f22161..3bbf66c1 100644 --- a/data/pom.xml +++ b/data/pom.xml @@ -12,7 +12,7 @@ edu.tamu.weaver webservice-parent - 2.x-resolver-exceptions-SNAPSHOT + 2.0.0-RC5-SNAPSHOT @@ -20,7 +20,7 @@ edu.tamu.weaver core - 2.x-resolver-exceptions-SNAPSHOT + 2.0.0-RC5-SNAPSHOT diff --git a/email/pom.xml b/email/pom.xml index 1a5c519a..2f2b6951 100644 --- a/email/pom.xml +++ b/email/pom.xml @@ -12,7 +12,7 @@ edu.tamu.weaver webservice-parent - 2.x-resolver-exceptions-SNAPSHOT + 2.0.0-RC5-SNAPSHOT diff --git a/pom.xml b/pom.xml index fd5266b8..d4f99b09 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ webservice-parent - 2.x-resolver-exceptions-SNAPSHOT + 2.0.0-RC5-SNAPSHOT Weaver Webservice Parent diff --git a/reporting/pom.xml b/reporting/pom.xml index c9995dcf..de203bda 100644 --- a/reporting/pom.xml +++ b/reporting/pom.xml @@ -12,7 +12,7 @@ edu.tamu.weaver webservice-parent - 2.x-resolver-exceptions-SNAPSHOT + 2.0.0-RC5-SNAPSHOT @@ -20,13 +20,13 @@ edu.tamu.weaver core - 2.x-resolver-exceptions-SNAPSHOT + 2.0.0-RC5-SNAPSHOT edu.tamu.weaver email - 2.x-resolver-exceptions-SNAPSHOT + 2.0.0-RC5-SNAPSHOT diff --git a/token-provider/pom.xml b/token-provider/pom.xml index 5b1f229a..39d9c618 100644 --- a/token-provider/pom.xml +++ b/token-provider/pom.xml @@ -12,7 +12,7 @@ edu.tamu.weaver webservice-parent - 2.x-resolver-exceptions-SNAPSHOT + 2.0.0-RC5-SNAPSHOT @@ -25,13 +25,13 @@ edu.tamu.weaver token - 2.x-resolver-exceptions-SNAPSHOT + 2.0.0-RC5-SNAPSHOT edu.tamu.weaver core - 2.x-resolver-exceptions-SNAPSHOT + 2.0.0-RC5-SNAPSHOT diff --git a/token/pom.xml b/token/pom.xml index 920679cb..c8f4305e 100644 --- a/token/pom.xml +++ b/token/pom.xml @@ -12,7 +12,7 @@ edu.tamu.weaver webservice-parent - 2.x-resolver-exceptions-SNAPSHOT + 2.0.0-RC5-SNAPSHOT diff --git a/user/pom.xml b/user/pom.xml index 9212f51e..a61f26ea 100644 --- a/user/pom.xml +++ b/user/pom.xml @@ -12,7 +12,7 @@ edu.tamu.weaver webservice-parent - 2.x-resolver-exceptions-SNAPSHOT + 2.0.0-RC5-SNAPSHOT @@ -21,13 +21,13 @@ edu.tamu.weaver data - 2.x-resolver-exceptions-SNAPSHOT + 2.0.0-RC5-SNAPSHOT edu.tamu.weaver validation - 2.x-resolver-exceptions-SNAPSHOT + 2.0.0-RC5-SNAPSHOT diff --git a/validation/pom.xml b/validation/pom.xml index ac46c2e0..c1e6da03 100644 --- a/validation/pom.xml +++ b/validation/pom.xml @@ -12,7 +12,7 @@ edu.tamu.weaver webservice-parent - 2.x-resolver-exceptions-SNAPSHOT + 2.0.0-RC5-SNAPSHOT @@ -21,7 +21,7 @@ edu.tamu.weaver data - 2.x-resolver-exceptions-SNAPSHOT + 2.0.0-RC5-SNAPSHOT diff --git a/wro/pom.xml b/wro/pom.xml index 9550bd07..a4a281c4 100644 --- a/wro/pom.xml +++ b/wro/pom.xml @@ -12,7 +12,7 @@ edu.tamu.weaver webservice-parent - 2.x-resolver-exceptions-SNAPSHOT + 2.0.0-RC5-SNAPSHOT @@ -21,7 +21,7 @@ edu.tamu.weaver data - 2.x-resolver-exceptions-SNAPSHOT + 2.0.0-RC5-SNAPSHOT From 46086c2dcc584c70caa8da8a1845e40458f0b115 Mon Sep 17 00:00:00 2001 From: William Welling Date: Sun, 2 Sep 2018 09:46:58 -0500 Subject: [PATCH 3/8] jar compatible sass class path resource resolving --- .../resource/locator/SassClassPathUriLocator.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/wro/src/main/java/edu/tamu/weaver/wro/resource/locator/SassClassPathUriLocator.java b/wro/src/main/java/edu/tamu/weaver/wro/resource/locator/SassClassPathUriLocator.java index e343a0e9..13fe9ab3 100644 --- a/wro/src/main/java/edu/tamu/weaver/wro/resource/locator/SassClassPathUriLocator.java +++ b/wro/src/main/java/edu/tamu/weaver/wro/resource/locator/SassClassPathUriLocator.java @@ -2,11 +2,13 @@ import java.io.File; import java.io.FileInputStream; +import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.util.Optional; import org.apache.commons.io.FilenameUtils; +import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.Validate; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -32,7 +34,7 @@ public class SassClassPathUriLocator implements UriLocator { */ public static final String ALIAS = "sassClassPathUri"; - private ResourcePatternResolver resourcePatternResolver; + private ResourcePatternResolver resourcePatternResolver; public SassClassPathUriLocator(ResourcePatternResolver resourcePatternResolver) { this.resourcePatternResolver = resourcePatternResolver; @@ -89,7 +91,14 @@ private Optional getScssFile(String url) throws IOException { } if (resource.exists() && resource.isReadable()) { - file = Optional.of(resource.getFile()); + if (resource.getURI().getScheme().equals("jar")) { + File tempFile = File.createTempFile("wro", ".tmp"); + tempFile.deleteOnExit(); + IOUtils.copy(resource.getInputStream(), new FileOutputStream(tempFile)); + file = Optional.of(tempFile); + } else { + file = Optional.of(resource.getFile()); + } } return file; From 8342a46f772b408595b51bdb5b406035e0c63e0c Mon Sep 17 00:00:00 2001 From: William Welling Date: Sun, 2 Sep 2018 09:47:47 -0500 Subject: [PATCH 4/8] dependency management to resolve warning and webjar resolve within jar deployment --- wro/pom.xml | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/wro/pom.xml b/wro/pom.xml index a4a281c4..3135c2cb 100644 --- a/wro/pom.xml +++ b/wro/pom.xml @@ -1,4 +1,5 @@ - 4.0.0 @@ -34,6 +35,22 @@ ro.isdc.wro4j wro4j-extensions 1.8.0 + + + org.codehaus.gmaven.runtime + gmaven-runtime-1.7 + + + org.webjars + webjars-locator-core + + + + + + org.webjars + webjars-locator-core + 0.35 From 9628e361ce852a37f6221696683f64c52d085b9a Mon Sep 17 00:00:00 2001 From: William Welling Date: Sun, 2 Sep 2018 09:47:59 -0500 Subject: [PATCH 5/8] removed empty module --- cli/pom.xml | 22 ---------------------- pom.xml | 1 - 2 files changed, 23 deletions(-) delete mode 100644 cli/pom.xml diff --git a/cli/pom.xml b/cli/pom.xml deleted file mode 100644 index 6e996fbc..00000000 --- a/cli/pom.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - 4.0.0 - - cli - - Weaver Command Line Interface - - Command Line Interface for Weaver - - - edu.tamu.weaver - webservice-parent - 2.0.0-RC5-SNAPSHOT - - - - - - - diff --git a/pom.xml b/pom.xml index d4f99b09..659d5798 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,6 @@ email reporting - cli wro From c06e8ba6620c87ad1a0cc64ce92390b15503610e Mon Sep 17 00:00:00 2001 From: William Welling Date: Sun, 2 Sep 2018 10:31:12 -0500 Subject: [PATCH 6/8] swallow exception, warn application must create theme manager bean --- .../edu/tamu/weaver/wro/config/WeaverWroConfiguration.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wro/src/main/java/edu/tamu/weaver/wro/config/WeaverWroConfiguration.java b/wro/src/main/java/edu/tamu/weaver/wro/config/WeaverWroConfiguration.java index 645ca55c..afeb6fda 100644 --- a/wro/src/main/java/edu/tamu/weaver/wro/config/WeaverWroConfiguration.java +++ b/wro/src/main/java/edu/tamu/weaver/wro/config/WeaverWroConfiguration.java @@ -71,9 +71,9 @@ public ThemeManager setThemeManagerServiceBean() { e.printStackTrace(); logger.error("Could not create ThemeManagerService Bean with class: "+themeManagerServiceClassName, e); } - } catch (ClassNotFoundException e1) { - logger.error("Could not find ThemeManagerService implementation class: "+themeManagerServiceClassName, e1); - } + } catch (ClassNotFoundException e) { + logger.warn("Could not find ThemeManagerService implementation class: "+themeManagerServiceClassName + "! Applicaiton must create theme manager bean!"); + } return null; } From 9c643b5e0ebf8edced59527d0bc1294fa68f3439 Mon Sep 17 00:00:00 2001 From: William Welling Date: Sun, 2 Sep 2018 10:31:50 -0500 Subject: [PATCH 7/8] minor formatting --- .../java/edu/tamu/weaver/wro/config/WeaverWroConfiguration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wro/src/main/java/edu/tamu/weaver/wro/config/WeaverWroConfiguration.java b/wro/src/main/java/edu/tamu/weaver/wro/config/WeaverWroConfiguration.java index afeb6fda..173a60bb 100644 --- a/wro/src/main/java/edu/tamu/weaver/wro/config/WeaverWroConfiguration.java +++ b/wro/src/main/java/edu/tamu/weaver/wro/config/WeaverWroConfiguration.java @@ -72,7 +72,7 @@ public ThemeManager setThemeManagerServiceBean() { logger.error("Could not create ThemeManagerService Bean with class: "+themeManagerServiceClassName, e); } } catch (ClassNotFoundException e) { - logger.warn("Could not find ThemeManagerService implementation class: "+themeManagerServiceClassName + "! Applicaiton must create theme manager bean!"); + logger.warn("Could not find ThemeManagerService implementation class: " + themeManagerServiceClassName + "! Applicaiton must create theme manager bean!"); } return null; } From fb3dccc82aa9e3d911f7631b4da1a113325a60b3 Mon Sep 17 00:00:00 2001 From: William Welling Date: Tue, 4 Sep 2018 09:12:37 -0500 Subject: [PATCH 8/8] fixed typo --- .../java/edu/tamu/weaver/wro/config/WeaverWroConfiguration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wro/src/main/java/edu/tamu/weaver/wro/config/WeaverWroConfiguration.java b/wro/src/main/java/edu/tamu/weaver/wro/config/WeaverWroConfiguration.java index 173a60bb..bd6b3556 100644 --- a/wro/src/main/java/edu/tamu/weaver/wro/config/WeaverWroConfiguration.java +++ b/wro/src/main/java/edu/tamu/weaver/wro/config/WeaverWroConfiguration.java @@ -72,7 +72,7 @@ public ThemeManager setThemeManagerServiceBean() { logger.error("Could not create ThemeManagerService Bean with class: "+themeManagerServiceClassName, e); } } catch (ClassNotFoundException e) { - logger.warn("Could not find ThemeManagerService implementation class: " + themeManagerServiceClassName + "! Applicaiton must create theme manager bean!"); + logger.warn("Could not find ThemeManagerService implementation class: " + themeManagerServiceClassName + "! Application must create theme manager bean!"); } return null; }