Author: rmannibucau
Date: Thu Oct 27 21:34:29 2016
New Revision: 1766897
URL: http://svn.apache.org/viewvc?rev=1766897&view=rev
Log:
few more exclusions, adding an experimental parameter to wrap the classpath
classloader (and define another identity), dont log @Provider by default (too
verbose), better OWB logging of the scanning - we can switch it off if desired
later
Modified:
openwebbeans/microwave/trunk/microwave-arquillian/src/main/java/org/apache/microwave/arquillian/MicrowaveConfiguration.java
openwebbeans/microwave/trunk/microwave-core/src/main/java/org/apache/catalina/startup/MicrowaveContextConfig.java
openwebbeans/microwave/trunk/microwave-core/src/main/java/org/apache/microwave/Microwave.java
openwebbeans/microwave/trunk/microwave-core/src/main/java/org/apache/microwave/cxf/CxfCdiAutoSetup.java
openwebbeans/microwave/trunk/microwave-core/src/main/java/org/apache/microwave/openwebbeans/KnownJarsFilter.java
openwebbeans/microwave/trunk/microwave-core/src/main/java/org/apache/microwave/openwebbeans/OWBTomcatWebScannerService.java
openwebbeans/microwave/trunk/microwave-core/src/main/java/org/apache/microwave/tomcat/ProvidedLoader.java
openwebbeans/microwave/trunk/microwave-gradle-plugin/src/main/java/org/apache/microwave/gradle/MicrowaveExtension.java
openwebbeans/microwave/trunk/microwave-gradle-plugin/src/main/java/org/apache/microwave/gradle/MicrowaveTask.java
openwebbeans/microwave/trunk/microwave-maven-plugin/pom.xml
openwebbeans/microwave/trunk/microwave-maven-plugin/src/main/java/org/apache/microwave/maven/MicrowaveRunMojo.java
Modified:
openwebbeans/microwave/trunk/microwave-arquillian/src/main/java/org/apache/microwave/arquillian/MicrowaveConfiguration.java
URL:
http://svn.apache.org/viewvc/openwebbeans/microwave/trunk/microwave-arquillian/src/main/java/org/apache/microwave/arquillian/MicrowaveConfiguration.java?rev=1766897&r1=1766896&r2=1766897&view=diff
==============================================================================
---
openwebbeans/microwave/trunk/microwave-arquillian/src/main/java/org/apache/microwave/arquillian/MicrowaveConfiguration.java
(original)
+++
openwebbeans/microwave/trunk/microwave-arquillian/src/main/java/org/apache/microwave/arquillian/MicrowaveConfiguration.java
Thu Oct 27 21:34:29 2016
@@ -76,6 +76,8 @@ public class MicrowaveConfiguration impl
private boolean tomcatAutoSetup = true;
private boolean useShutdownHook = false /*arquillian*/;
private boolean useTomcatDefaults = true;
+ private boolean jaxrsLogProviders;
+ private boolean tomcatWrapLoader = true;
@Override
public void validate() throws ConfigurationException {
@@ -503,4 +505,20 @@ public class MicrowaveConfiguration impl
public void setUseTomcatDefaults(final boolean useTomcatDefaults) {
this.useTomcatDefaults = useTomcatDefaults;
}
+
+ public boolean isJaxrsLogProviders() {
+ return jaxrsLogProviders;
+ }
+
+ public void setJaxrsLogProviders(final boolean jaxrsLogProviders) {
+ this.jaxrsLogProviders = jaxrsLogProviders;
+ }
+
+ public boolean isTomcatWrapLoader() {
+ return tomcatWrapLoader;
+ }
+
+ public void setTomcatWrapLoader(final boolean tomcatWrapLoader) {
+ this.tomcatWrapLoader = tomcatWrapLoader;
+ }
}
Modified:
openwebbeans/microwave/trunk/microwave-core/src/main/java/org/apache/catalina/startup/MicrowaveContextConfig.java
URL:
http://svn.apache.org/viewvc/openwebbeans/microwave/trunk/microwave-core/src/main/java/org/apache/catalina/startup/MicrowaveContextConfig.java?rev=1766897&r1=1766896&r2=1766897&view=diff
==============================================================================
---
openwebbeans/microwave/trunk/microwave-core/src/main/java/org/apache/catalina/startup/MicrowaveContextConfig.java
(original)
+++
openwebbeans/microwave/trunk/microwave-core/src/main/java/org/apache/catalina/startup/MicrowaveContextConfig.java
Thu Oct 27 21:34:29 2016
@@ -26,17 +26,20 @@ import org.apache.tomcat.util.descriptor
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.corespi.scanner.xbean.CdiArchive;
import org.apache.webbeans.corespi.scanner.xbean.OwbAnnotationFinder;
+import org.xml.sax.InputSource;
import javax.servlet.ServletContainerInitializer;
import javax.servlet.annotation.HandlesTypes;
import javax.servlet.annotation.WebFilter;
import javax.servlet.annotation.WebListener;
import javax.servlet.annotation.WebServlet;
+import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.lang.annotation.Annotation;
import java.lang.reflect.Modifier;
import java.net.URL;
+import java.nio.charset.StandardCharsets;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
@@ -47,6 +50,8 @@ import java.util.stream.Stream;
import static java.util.Optional.ofNullable;
public class MicrowaveContextConfig extends ContextConfig {
+ private static final byte[] DEFAULT_WEB_XML = "<web-app version=\"3.1\"
/>".getBytes(StandardCharsets.UTF_8);
+
private final Microwave.Builder configuration;
private final Map<String, Collection<Class<?>>> webClasses = new
HashMap<>();
private OwbAnnotationFinder finder;
@@ -70,6 +75,7 @@ public class MicrowaveContextConfig exte
try {
final OWBTomcatWebScannerService scannerService =
OWBTomcatWebScannerService.class.cast(WebBeansContext.getInstance().getScannerService());
ofNullable(context.getJarScanner()).ifPresent(s ->
scannerService.setFilter(s.getJarScanFilter()));
+ scannerService.setDocBase(context.getDocBase());
scannerService.scan();
finder = scannerService.getFinder();
finder.link();
@@ -93,6 +99,11 @@ public class MicrowaveContextConfig exte
}
}
+ @Override // just to avoid an info log pretty useless for us
+ protected InputSource getGlobalWebXmlSource() {
+ return ofNullable(super.getGlobalWebXmlSource()).orElse(new
InputSource(new ByteArrayInputStream(DEFAULT_WEB_XML)));
+ }
+
@Override
protected void processAnnotationsWebResource(final WebResource
webResource, final WebXml fragment,
final boolean
handlesTypesOnly,
Modified:
openwebbeans/microwave/trunk/microwave-core/src/main/java/org/apache/microwave/Microwave.java
URL:
http://svn.apache.org/viewvc/openwebbeans/microwave/trunk/microwave-core/src/main/java/org/apache/microwave/Microwave.java?rev=1766897&r1=1766896&r2=1766897&view=diff
==============================================================================
---
openwebbeans/microwave/trunk/microwave-core/src/main/java/org/apache/microwave/Microwave.java
(original)
+++
openwebbeans/microwave/trunk/microwave-core/src/main/java/org/apache/microwave/Microwave.java
Thu Oct 27 21:34:29 2016
@@ -125,7 +125,8 @@ public class Microwave implements AutoCl
}
public Microwave deployClasspath(final DeploymentMeta meta) {
- final Consumer<Context> builtInCustomizer = c -> c.setLoader(new
ProvidedLoader(Thread.currentThread().getContextClassLoader()));
+ final ClassLoader classLoader =
Thread.currentThread().getContextClassLoader();
+ final Consumer<Context> builtInCustomizer = c -> c.setLoader(new
ProvidedLoader(classLoader, configuration.isTomcatWrapLoader()));
return deployWebapp(new DeploymentMeta(meta.context, meta.docBase,
ofNullable(meta.consumer).map(c -> (Consumer<Context>) ctx -> {
builtInCustomizer.accept(ctx);
c.accept(ctx);
@@ -733,6 +734,9 @@ public class Microwave implements AutoCl
@CliOption(name = "jaxrs-provider-setup", description = "Should
default JAX-RS provider be configured")
private boolean jaxrsProviderSetup = true;
+ @CliOption(name = "jaxrs-log-provider", description = "Should JAX-RS
providers be logged")
+ private boolean jaxrsLogProviders = false;
+
@CliOption(name = "logging-global-setup", description = "Should
logging be configured to use log4j2 (it is global)")
private boolean loggingGlobalSetup = true;
@@ -754,10 +758,22 @@ public class Microwave implements AutoCl
@CliOption(name = "tomcat-default", description = "Should Tomcat
default be set (session timeout, mime mapping etc...)")
private boolean useTomcatDefaults = true;
+ @CliOption(name = "tomcat-wrap-loader", description = "(Experimental)
When deploying a classpath (current classloader), " +
+ "should microwave wrap the loader to define another loader
identity but still use the same classes and resources.")
+ private boolean tomcatWrapLoader = false;
+
public Builder() { // load defaults
loadFrom("microwave.properties");
}
+ public boolean isJaxrsLogProviders() {
+ return jaxrsLogProviders;
+ }
+
+ public void setJaxrsLogProviders(final boolean jaxrsLogProviders) {
+ this.jaxrsLogProviders = jaxrsLogProviders;
+ }
+
public boolean isUseTomcatDefaults() {
return useTomcatDefaults;
}
@@ -1153,6 +1169,14 @@ public class Microwave implements AutoCl
return this;
}
+ public boolean isTomcatWrapLoader() {
+ return tomcatWrapLoader;
+ }
+
+ public void setTomcatWrapLoader(final boolean tomcatWrapLoader) {
+ this.tomcatWrapLoader = tomcatWrapLoader;
+ }
+
public void addCustomizer(final Consumer<Builder>
configurationCustomizer) {
configurationCustomizer.accept(this);
}
Modified:
openwebbeans/microwave/trunk/microwave-core/src/main/java/org/apache/microwave/cxf/CxfCdiAutoSetup.java
URL:
http://svn.apache.org/viewvc/openwebbeans/microwave/trunk/microwave-core/src/main/java/org/apache/microwave/cxf/CxfCdiAutoSetup.java?rev=1766897&r1=1766896&r2=1766897&view=diff
==============================================================================
---
openwebbeans/microwave/trunk/microwave-core/src/main/java/org/apache/microwave/cxf/CxfCdiAutoSetup.java
(original)
+++
openwebbeans/microwave/trunk/microwave-core/src/main/java/org/apache/microwave/cxf/CxfCdiAutoSetup.java
Thu Oct 27 21:34:29 2016
@@ -388,9 +388,11 @@ public class CxfCdiAutoSetup implements
resourcesToLog.clear();
// log @Providers
- final ServerProviderFactory spf =
ServerProviderFactory.class.cast(endpoint.get(ServerProviderFactory.class.getName()));
- dump(log, spf, "MessageBodyReaders", "messageReaders");
- dump(log, spf, "MessageBodyWriters", "messageWriters");
+ if
(Microwave.Builder.class.cast(sc.getServletContext().getAttribute("microwave.configuration")).isJaxrsLogProviders())
{
+ final ServerProviderFactory spf =
ServerProviderFactory.class.cast(endpoint.get(ServerProviderFactory.class.getName()));
+ dump(log, spf, "MessageBodyReaders",
"messageReaders");
+ dump(log, spf, "MessageBodyWriters",
"messageWriters");
+ }
return base;
}).toArray(String[]::new);
Modified:
openwebbeans/microwave/trunk/microwave-core/src/main/java/org/apache/microwave/openwebbeans/KnownJarsFilter.java
URL:
http://svn.apache.org/viewvc/openwebbeans/microwave/trunk/microwave-core/src/main/java/org/apache/microwave/openwebbeans/KnownJarsFilter.java?rev=1766897&r1=1766896&r2=1766897&view=diff
==============================================================================
---
openwebbeans/microwave/trunk/microwave-core/src/main/java/org/apache/microwave/openwebbeans/KnownJarsFilter.java
(original)
+++
openwebbeans/microwave/trunk/microwave-core/src/main/java/org/apache/microwave/openwebbeans/KnownJarsFilter.java
Thu Oct 27 21:34:29 2016
@@ -43,6 +43,7 @@ public class KnownJarsFilter implements
add("akka-remote-");
add("antlr-");
add("aopalliance-");
+ add("args4j-");
add("arquillian-core.jar");
add("arquillian-testng.jar");
add("arquillian-junit.jar");
@@ -58,6 +59,7 @@ public class KnownJarsFilter implements
add("arquillian-test-impl-base");
add("arquillian-test-spi");
add("arquillian-tomee-");
+ add("asciidoctorj-");
add("asm-");
add("avalon-framework-");
add("axis-");
@@ -77,6 +79,7 @@ public class KnownJarsFilter implements
add("commons-cli-");
add("commons-codec-");
add("commons-collections-");
+ add("commons-configuration-");
add("commons-dbcp");
add("commons-dbcp-all-1.3-");
add("commons-digester-");
@@ -107,8 +110,10 @@ public class KnownJarsFilter implements
add("jce.jar");
add("jfr.jar");
add("jfxrt.jar");
+ add("jna-");
add("jnr-");
add("johnzon-");
+ add("json-simple-");
add("fusemq-leveldb-");
add("geronimo-");
add("google-");
@@ -151,6 +156,7 @@ public class KnownJarsFilter implements
add("javax.");
add("jaxb-");
add("jaxp-");
+ add("jbake-");
add("jboss-");
add("jbossall-");
add("jbosscx-");
@@ -164,11 +170,13 @@ public class KnownJarsFilter implements
add("jmdns-");
add("joda-time-");
add("johnzon-");
+ add("jruby-");
add("jsoup-");
add("jsp-api");
add("jsr299-");
add("jsr311-");
add("jsse.jar");
+ add("jul-to-slf4j-");
add("juli-");
add("junit-");
add("kahadb-");
@@ -201,6 +209,9 @@ public class KnownJarsFilter implements
add("org.eclipse.");
add("org.junit.");
add("org.osgi.core-");
+ add("orient-commons-");
+ add("orientdb-core-");
+ add("orientdb-nativeos-");
add("oro-");
add("pax-url");
add("PDFBox");
@@ -226,7 +237,7 @@ public class KnownJarsFilter implements
add("slf4j-");
add("smack-");
add("smackx-");
- add("snappy-java-");
+ add("snappy-");
add("spring-");
add("sshd-");
add("stax-api-");
Modified:
openwebbeans/microwave/trunk/microwave-core/src/main/java/org/apache/microwave/openwebbeans/OWBTomcatWebScannerService.java
URL:
http://svn.apache.org/viewvc/openwebbeans/microwave/trunk/microwave-core/src/main/java/org/apache/microwave/openwebbeans/OWBTomcatWebScannerService.java?rev=1766897&r1=1766896&r2=1766897&view=diff
==============================================================================
---
openwebbeans/microwave/trunk/microwave-core/src/main/java/org/apache/microwave/openwebbeans/OWBTomcatWebScannerService.java
(original)
+++
openwebbeans/microwave/trunk/microwave-core/src/main/java/org/apache/microwave/openwebbeans/OWBTomcatWebScannerService.java
Thu Oct 27 21:34:29 2016
@@ -18,26 +18,66 @@
*/
package org.apache.microwave.openwebbeans;
+import org.apache.microwave.logging.tomcat.LogFacade;
import org.apache.tomcat.JarScanFilter;
import org.apache.webbeans.web.scanner.WebScannerService;
import java.io.File;
import java.net.MalformedURLException;
import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
import java.util.Set;
+import static java.util.Optional.ofNullable;
import static org.apache.tomcat.JarScanType.PLUGGABILITY;
public class OWBTomcatWebScannerService extends WebScannerService {
+ private final LogFacade logger = new
LogFacade(OWBTomcatWebScannerService.class.getName());
+
private JarScanFilter filter;
private String jreBase;
+ // just for logging (== temp)
+ private final List<String> urls = new ArrayList<>(8);
+ private String docBase;
+
@Override
public void scan() {
if (finder != null) {
return;
}
super.scan();
+ if (!urls.isEmpty()) {
+ Collections.sort(urls);
+ logger.info("OpenWebBeans scanning:");
+ final String m2 = new File(System.getProperty("user.home", "."),
".m2/repository").getAbsolutePath();
+ final String base = ofNullable(docBase).orElse("$$$");
+ urls.forEach(u -> {
+ String shownValue = u
+ // protocol
+ .replace("file://", "")
+ .replace("file:", "")
+ .replace("jar:", "")
+ // URL suffix
+ .replace("!/META-INF/beans.xml", "")
+ .replace("!/", "")
+ // beans.xml
+ .replace("META-INF/beans.xml", "");
+
+ // try to make it shorter
+ if (shownValue.startsWith(m2)) {
+ shownValue = "${maven}/" +
shownValue.substring(shownValue.replace(File.separatorChar,
'/').lastIndexOf('/') + 1);
+ } else if (shownValue.startsWith(base)) {
+ shownValue = "${app}" + shownValue.replace(base, "");
+ }
+
+ // finally log
+ logger.info(" " + shownValue);
+ });
+ urls.clear(); // no more needed
+ }
filter = null;
}
@@ -60,11 +100,11 @@ public class OWBTomcatWebScannerService
@Override
protected int isExcludedJar(final String path) {
- if (path.startsWith(jreBase)) {
+ if (path.startsWith(jreBase) || (path.startsWith("jar:") &&
path.indexOf(jreBase) == 4)) {
return jreBase.length();
}
- final int filenameIdx = path.replace(File.separatorChar,
'/').lastIndexOf('/') + 1;
+ final int filenameIdx = path.replace(File.separatorChar,
'/').replace("!/", "").lastIndexOf('/') + 1;
if (filenameIdx < 0 || filenameIdx >= path.length()) { // unlikely
return -1;
}
@@ -75,4 +115,15 @@ public class OWBTomcatWebScannerService
public void setFilter(final JarScanFilter filter) {
this.filter = filter;
}
+
+ @Override
+ protected void addWebBeansXmlLocation(final URL beanArchiveUrl) {
+ urls.add(beanArchiveUrl.toExternalForm());
+ // we just customize the logging
+ super.doAddWebBeansXmlLocation(beanArchiveUrl);
+ }
+
+ public void setDocBase(final String docBase) {
+ this.docBase = docBase;
+ }
}
Modified:
openwebbeans/microwave/trunk/microwave-core/src/main/java/org/apache/microwave/tomcat/ProvidedLoader.java
URL:
http://svn.apache.org/viewvc/openwebbeans/microwave/trunk/microwave-core/src/main/java/org/apache/microwave/tomcat/ProvidedLoader.java?rev=1766897&r1=1766896&r2=1766897&view=diff
==============================================================================
---
openwebbeans/microwave/trunk/microwave-core/src/main/java/org/apache/microwave/tomcat/ProvidedLoader.java
(original)
+++
openwebbeans/microwave/trunk/microwave-core/src/main/java/org/apache/microwave/tomcat/ProvidedLoader.java
Thu Oct 27 21:34:29 2016
@@ -19,16 +19,27 @@
package org.apache.microwave.tomcat;
import org.apache.catalina.Context;
+import org.apache.catalina.LifecycleException;
+import org.apache.catalina.LifecycleState;
import org.apache.catalina.Loader;
+import org.apache.catalina.util.LifecycleBase;
import java.beans.PropertyChangeListener;
-public class ProvidedLoader implements Loader {
+// used to not recreate another classloader,
+// it has a small workaround cause tomcat set properties (clear*) on the
classloader
+// and AppLoader doesnt support it leading to warnings we don't want
+public class ProvidedLoader extends LifecycleBase implements Loader {
+ private static final ClassLoader MOCK = new
TomcatSettersClassLoader(ProvidedLoader.class.getClassLoader());
+
private final ClassLoader delegate;
private Context context;
+ private int mockReturns = -1;
- public ProvidedLoader(final ClassLoader loader) {
- this.delegate = loader == null ? ClassLoader.getSystemClassLoader() :
loader;
+ public ProvidedLoader(final ClassLoader loader, final boolean wrap) {
+ // use another classloader cause tomcat set properties on the
classloader
+ final ClassLoader impl = loader == null ?
ClassLoader.getSystemClassLoader() : loader;
+ this.delegate = wrap ? new TomcatSettersClassLoader(impl) : impl;
}
@Override
@@ -38,6 +49,10 @@ public class ProvidedLoader implements L
@Override
public ClassLoader getClassLoader() {
+ if (mockReturns > 0) {
+ mockReturns--;
+ return MOCK;
+ }
return delegate;
}
@@ -85,5 +100,50 @@ public class ProvidedLoader implements L
public void removePropertyChangeListener(final PropertyChangeListener
listener) {
// no-op
}
+
+ @Override
+ protected void startInternal() throws LifecycleException {
+ mockReturns = 4; // check StandardContext.startInternal, while there
is no warnings in the log and tests pass we are good
+ setState(LifecycleState.STARTING);
+ }
+
+ @Override
+ protected void initInternal() throws LifecycleException {
+ // no-op
+ }
+
+ @Override
+ protected void stopInternal() throws LifecycleException {
+ setState(LifecycleState.STOPPING);
+ }
+
+ @Override
+ protected void destroyInternal() throws LifecycleException {
+ // no-op
+ }
+
+ // avoid warnings cause AppLoader doesn't support these setters but tomcat
expects it
+ public static class TomcatSettersClassLoader extends ClassLoader {
+ private TomcatSettersClassLoader(final ClassLoader classLoader) {
+ super(classLoader);
+ }
+
+
+ public void setClearReferencesHttpClientKeepAliveThread(final boolean
ignored) {
+ // no-op
+ }
+
+ public void setClearReferencesRmiTargets(final boolean ignored) {
+ // no-op
+ }
+
+ public void setClearReferencesStopThreads(final boolean ignored) {
+ // no-op
+ }
+
+ public void setClearReferencesStopTimerThreads(final boolean ignored) {
+ // no-op
+ }
+ }
}
Modified:
openwebbeans/microwave/trunk/microwave-gradle-plugin/src/main/java/org/apache/microwave/gradle/MicrowaveExtension.java
URL:
http://svn.apache.org/viewvc/openwebbeans/microwave/trunk/microwave-gradle-plugin/src/main/java/org/apache/microwave/gradle/MicrowaveExtension.java?rev=1766897&r1=1766896&r2=1766897&view=diff
==============================================================================
---
openwebbeans/microwave/trunk/microwave-gradle-plugin/src/main/java/org/apache/microwave/gradle/MicrowaveExtension.java
(original)
+++
openwebbeans/microwave/trunk/microwave-gradle-plugin/src/main/java/org/apache/microwave/gradle/MicrowaveExtension.java
Thu Oct 27 21:34:29 2016
@@ -66,6 +66,24 @@ public class MicrowaveExtension {
private boolean useShutdownHook = true;
private String tomcatFilter;
private boolean useTomcatDefaults = true;
+ private boolean jaxrsLogProviders = false;
+ private boolean tomcatWrapLoader = false;
+
+ public boolean isTomcatWrapLoader() {
+ return tomcatWrapLoader;
+ }
+
+ public void setTomcatWrapLoader(final boolean tomcatWrapLoader) {
+ this.tomcatWrapLoader = tomcatWrapLoader;
+ }
+
+ public boolean isJaxrsLogProviders() {
+ return jaxrsLogProviders;
+ }
+
+ public void setJaxrsLogProviders(final boolean jaxrsLogProviders) {
+ this.jaxrsLogProviders = jaxrsLogProviders;
+ }
public boolean isUseTomcatDefaults() {
return useTomcatDefaults;
Modified:
openwebbeans/microwave/trunk/microwave-gradle-plugin/src/main/java/org/apache/microwave/gradle/MicrowaveTask.java
URL:
http://svn.apache.org/viewvc/openwebbeans/microwave/trunk/microwave-gradle-plugin/src/main/java/org/apache/microwave/gradle/MicrowaveTask.java?rev=1766897&r1=1766896&r2=1766897&view=diff
==============================================================================
---
openwebbeans/microwave/trunk/microwave-gradle-plugin/src/main/java/org/apache/microwave/gradle/MicrowaveTask.java
(original)
+++
openwebbeans/microwave/trunk/microwave-gradle-plugin/src/main/java/org/apache/microwave/gradle/MicrowaveTask.java
Thu Oct 27 21:34:29 2016
@@ -81,6 +81,10 @@ public class MicrowaveTask extends Defau
@Input
@Optional
+ private boolean tomcatWrapLoader = false;
+
+ @Input
+ @Optional
private Map<String, String> properties;
@Input
@@ -89,6 +93,10 @@ public class MicrowaveTask extends Defau
@Input
@Optional
+ private boolean jaxrsLogProviders = false;
+
+ @Input
+ @Optional
private boolean useTomcatDefaults = true;
@Input
@Optional
@@ -822,4 +830,20 @@ public class MicrowaveTask extends Defau
public void setUseTomcatDefaults(final boolean useTomcatDefaults) {
this.useTomcatDefaults = useTomcatDefaults;
}
+
+ public boolean isJaxrsLogProviders() {
+ return jaxrsLogProviders;
+ }
+
+ public void setJaxrsLogProviders(final boolean jaxrsLogProviders) {
+ this.jaxrsLogProviders = jaxrsLogProviders;
+ }
+
+ public boolean isTomcatWrapLoader() {
+ return tomcatWrapLoader;
+ }
+
+ public void setTomcatWrapLoader(final boolean tomcatWrapLoader) {
+ this.tomcatWrapLoader = tomcatWrapLoader;
+ }
}
Modified: openwebbeans/microwave/trunk/microwave-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/openwebbeans/microwave/trunk/microwave-maven-plugin/pom.xml?rev=1766897&r1=1766896&r2=1766897&view=diff
==============================================================================
--- openwebbeans/microwave/trunk/microwave-maven-plugin/pom.xml (original)
+++ openwebbeans/microwave/trunk/microwave-maven-plugin/pom.xml Thu Oct 27
21:34:29 2016
@@ -95,6 +95,20 @@
<artifactId>ziplock</artifactId>
<version>7.0.1</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.tomee</groupId>
+ <artifactId>javaee-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.tomee</groupId>
+ <artifactId>openejb-jee</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.shrinkwrap</groupId>
+ <artifactId>shrinkwrap-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
Modified:
openwebbeans/microwave/trunk/microwave-maven-plugin/src/main/java/org/apache/microwave/maven/MicrowaveRunMojo.java
URL:
http://svn.apache.org/viewvc/openwebbeans/microwave/trunk/microwave-maven-plugin/src/main/java/org/apache/microwave/maven/MicrowaveRunMojo.java?rev=1766897&r1=1766896&r2=1766897&view=diff
==============================================================================
---
openwebbeans/microwave/trunk/microwave-maven-plugin/src/main/java/org/apache/microwave/maven/MicrowaveRunMojo.java
(original)
+++
openwebbeans/microwave/trunk/microwave-maven-plugin/src/main/java/org/apache/microwave/maven/MicrowaveRunMojo.java
Thu Oct 27 21:34:29 2016
@@ -73,6 +73,12 @@ public class MicrowaveRunMojo extends Ab
@Parameter(property = "microwave.keepServerXmlAsThis")
private boolean keepServerXmlAsThis;
+ @Parameter(property = "microwave.jaxrsLogProviders", defaultValue =
"false")
+ private boolean jaxrsLogProviders;
+
+ @Parameter(property = "microwave.jaxrsLogProviders", defaultValue = "true")
+ private boolean tomcatWrapLoader;
+
@Parameter(property = "microwave.useTomcatDefaults", defaultValue = "true")
private boolean useTomcatDefaults;
