diff --git a/bean-validation/runtime/src/main/java/org/wildfly/swarm/bean/validation/runtime/BeanValidationConfiguration.java b/bean-validation/runtime/src/main/java/org/wildfly/swarm/bean/validation/runtime/BeanValidationConfiguration.java index be3fe378e2..6544e9cada 100644 --- a/bean-validation/runtime/src/main/java/org/wildfly/swarm/bean/validation/runtime/BeanValidationConfiguration.java +++ b/bean-validation/runtime/src/main/java/org/wildfly/swarm/bean/validation/runtime/BeanValidationConfiguration.java @@ -1,14 +1,17 @@ package org.wildfly.swarm.bean.validation.runtime; +import java.util.ArrayList; +import java.util.List; + import org.jboss.dmr.ModelNode; import org.wildfly.swarm.bean.validation.BeanValidationFraction; import org.wildfly.swarm.config.runtime.invocation.Marshaller; import org.wildfly.swarm.container.runtime.AbstractServerConfiguration; -import java.util.ArrayList; -import java.util.List; - -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.*; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.ADD; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.EXTENSION; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP_ADDR; /** * @author Bob McWhirter @@ -25,7 +28,7 @@ public BeanValidationFraction defaultFraction() { } @Override - public List getList(BeanValidationFraction fraction) { + public List getList(BeanValidationFraction fraction) throws Exception { List list = new ArrayList<>(); @@ -34,13 +37,8 @@ public List getList(BeanValidationFraction fraction) { node.get(OP).set(ADD); list.add(node); - try { - list.addAll(Marshaller.marshal(fraction)); - } catch (Exception e) { - System.err.println("Unable to configure bean-validation " + e); - } + list.addAll(Marshaller.marshal(fraction)); return list; - } } diff --git a/container/runtime/src/main/java/org/wildfly/swarm/container/runtime/RuntimeServer.java b/container/runtime/src/main/java/org/wildfly/swarm/container/runtime/RuntimeServer.java index 11a36a54be..4a176a5e96 100644 --- a/container/runtime/src/main/java/org/wildfly/swarm/container/runtime/RuntimeServer.java +++ b/container/runtime/src/main/java/org/wildfly/swarm/container/runtime/RuntimeServer.java @@ -297,7 +297,7 @@ private void loadFractionConfigurations() throws Exception { } } - private List getList(Container config) throws ModuleLoadException { + private List getList(Container config) throws Exception { List list = new ArrayList<>(); configureInterfaces(config, list); @@ -373,7 +373,7 @@ private void configureSocketBinding(PathAddress address, SocketBinding binding, list.add(node); } - private void configureFractions(Container config, List list) throws ModuleLoadException { + private void configureFractions(Container config, List list) throws Exception { OUTER: for (ServerConfiguration eachConfig : this.configList) { diff --git a/container/runtime/src/main/java/org/wildfly/swarm/container/runtime/ServerConfiguration.java b/container/runtime/src/main/java/org/wildfly/swarm/container/runtime/ServerConfiguration.java index 04eb6922a0..dedac4258a 100644 --- a/container/runtime/src/main/java/org/wildfly/swarm/container/runtime/ServerConfiguration.java +++ b/container/runtime/src/main/java/org/wildfly/swarm/container/runtime/ServerConfiguration.java @@ -25,11 +25,11 @@ default void prepareArchive(Archive a) { } - default List getImplicitDeployments(T fraction) { + default List getImplicitDeployments(T fraction) throws Exception { return Collections.emptyList(); } - default List getList(T fraction) { + default List getList(T fraction) throws Exception { return Collections.emptyList(); } diff --git a/datasources/runtime/src/main/java/org/wildfly/swarm/datasources/runtime/DatasourcesConfiguration.java b/datasources/runtime/src/main/java/org/wildfly/swarm/datasources/runtime/DatasourcesConfiguration.java index 0283688172..b084fa9bed 100644 --- a/datasources/runtime/src/main/java/org/wildfly/swarm/datasources/runtime/DatasourcesConfiguration.java +++ b/datasources/runtime/src/main/java/org/wildfly/swarm/datasources/runtime/DatasourcesConfiguration.java @@ -24,15 +24,12 @@ public DatasourcesFraction defaultFraction() { } @Override - public List getList(DatasourcesFraction fraction) { + public List getList(DatasourcesFraction fraction) throws Exception { List list = new ArrayList<>(); - try { - list.addAll(Marshaller.marshal(fraction)); - } catch (Exception e) { - System.err.println("Cannot configure datasources subsystem"); - } + list.addAll(Marshaller.marshal(fraction)); + return list; } diff --git a/ee/runtime/src/main/java/org/wildfly/swarm/ee/runtime/EEConfiguration.java b/ee/runtime/src/main/java/org/wildfly/swarm/ee/runtime/EEConfiguration.java index 0164ff524c..0cc6413751 100644 --- a/ee/runtime/src/main/java/org/wildfly/swarm/ee/runtime/EEConfiguration.java +++ b/ee/runtime/src/main/java/org/wildfly/swarm/ee/runtime/EEConfiguration.java @@ -1,14 +1,17 @@ package org.wildfly.swarm.ee.runtime; +import java.util.ArrayList; +import java.util.List; + import org.jboss.dmr.ModelNode; import org.wildfly.swarm.config.runtime.invocation.Marshaller; import org.wildfly.swarm.container.runtime.AbstractServerConfiguration; import org.wildfly.swarm.ee.EEFraction; -import java.util.ArrayList; -import java.util.List; - -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.*; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.ADD; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.EXTENSION; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP_ADDR; /** * @author Bob McWhirter @@ -26,7 +29,7 @@ public EEFraction defaultFraction() { } @Override - public List getList(EEFraction fraction) { + public List getList(EEFraction fraction) throws Exception { List list = new ArrayList<>(); @@ -35,11 +38,8 @@ public List getList(EEFraction fraction) { node.get(OP).set(ADD); list.add(node); - try { - list.addAll(Marshaller.marshal(fraction)); - } catch (Exception e) { - System.err.println("Cannot configure EE subsystem " + e); - } + list.addAll(Marshaller.marshal(fraction)); + return list; } diff --git a/ejb/runtime/src/main/java/org/wildfly/swarm/ejb/runtime/EJBConfiguration.java b/ejb/runtime/src/main/java/org/wildfly/swarm/ejb/runtime/EJBConfiguration.java index 9792ce35af..68dfecabbb 100644 --- a/ejb/runtime/src/main/java/org/wildfly/swarm/ejb/runtime/EJBConfiguration.java +++ b/ejb/runtime/src/main/java/org/wildfly/swarm/ejb/runtime/EJBConfiguration.java @@ -1,14 +1,17 @@ package org.wildfly.swarm.ejb.runtime; +import java.util.ArrayList; +import java.util.List; + import org.jboss.dmr.ModelNode; import org.wildfly.swarm.config.runtime.invocation.Marshaller; import org.wildfly.swarm.container.runtime.AbstractServerConfiguration; import org.wildfly.swarm.ejb.EJBFraction; -import java.util.ArrayList; -import java.util.List; - -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.*; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.ADD; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.EXTENSION; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP_ADDR; /** * @author Ken Finnigan @@ -25,7 +28,7 @@ public EJBFraction defaultFraction() { } @Override - public List getList(EJBFraction fraction) { + public List getList(EJBFraction fraction) throws Exception { List list = new ArrayList<>(); ModelNode node = new ModelNode(); @@ -33,11 +36,8 @@ public List getList(EJBFraction fraction) { node.get(OP).set(ADD); list.add(node); - try { - list.addAll(Marshaller.marshal(fraction)); - } catch (Exception e) { - System.err.println("Cannot configure EJB subsystem. " + e); - } + list.addAll(Marshaller.marshal(fraction)); + return list; } } diff --git a/infinispan/runtime/src/main/java/org/wildfly/swarm/infinispan/runtime/InfinispanConfiguration.java b/infinispan/runtime/src/main/java/org/wildfly/swarm/infinispan/runtime/InfinispanConfiguration.java index f74d208884..2fceab646a 100644 --- a/infinispan/runtime/src/main/java/org/wildfly/swarm/infinispan/runtime/InfinispanConfiguration.java +++ b/infinispan/runtime/src/main/java/org/wildfly/swarm/infinispan/runtime/InfinispanConfiguration.java @@ -12,7 +12,6 @@ import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.EXTENSION; import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP; import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP_ADDR; -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.SUBSYSTEM; /** * @author Lance Ball @@ -29,18 +28,15 @@ public InfinispanFraction defaultFraction() { } @Override - public List getList(InfinispanFraction fraction) { + public List getList(InfinispanFraction fraction) throws Exception { List list = new ArrayList<>(); ModelNode node = new ModelNode(); node.get(OP_ADDR).set(EXTENSION, "org.jboss.as.clustering.infinispan"); node.get(OP).set(ADD); list.add(node); - try { - list.addAll(Marshaller.marshal(fraction)); - } catch (Exception e) { - System.err.println("Cannot configure Infinispan subsystem. " + e); - } + + list.addAll(Marshaller.marshal(fraction)); return list; diff --git a/io/runtime/src/main/java/org/wildfly/swarm/io/runtime/IOConfiguration.java b/io/runtime/src/main/java/org/wildfly/swarm/io/runtime/IOConfiguration.java index 4a919b87fa..793038f53f 100644 --- a/io/runtime/src/main/java/org/wildfly/swarm/io/runtime/IOConfiguration.java +++ b/io/runtime/src/main/java/org/wildfly/swarm/io/runtime/IOConfiguration.java @@ -28,7 +28,7 @@ public IOFraction defaultFraction() { } @Override - public List getList(IOFraction fraction) { + public List getList(IOFraction fraction) throws Exception { List list = new ArrayList<>(); ModelNode node = new ModelNode(); @@ -36,11 +36,7 @@ public List getList(IOFraction fraction) { node.get(OP).set(ADD); list.add(node); - try { - list.addAll(Marshaller.marshal(fraction)); - } catch (Exception e) { - System.err.println("Cannot configure IO subsystem " + e); - } + list.addAll(Marshaller.marshal(fraction)); return list; diff --git a/jaxrs/runtime/src/main/java/org/wildfly/swarm/jaxrs/runtime/JAXRSConfiguration.java b/jaxrs/runtime/src/main/java/org/wildfly/swarm/jaxrs/runtime/JAXRSConfiguration.java index da047dc40c..8e4f2b787d 100644 --- a/jaxrs/runtime/src/main/java/org/wildfly/swarm/jaxrs/runtime/JAXRSConfiguration.java +++ b/jaxrs/runtime/src/main/java/org/wildfly/swarm/jaxrs/runtime/JAXRSConfiguration.java @@ -1,14 +1,17 @@ package org.wildfly.swarm.jaxrs.runtime; +import java.util.ArrayList; +import java.util.List; + import org.jboss.dmr.ModelNode; import org.wildfly.swarm.config.runtime.invocation.Marshaller; import org.wildfly.swarm.container.runtime.AbstractServerConfiguration; import org.wildfly.swarm.jaxrs.JAXRSFraction; -import java.util.ArrayList; -import java.util.List; - -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.*; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.ADD; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.EXTENSION; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP_ADDR; /** * @author Bob McWhirter @@ -25,18 +28,15 @@ public JAXRSFraction defaultFraction() { } @Override - public List getList(JAXRSFraction fraction) { + public List getList(JAXRSFraction fraction) throws Exception { List list = new ArrayList<>(); ModelNode node = new ModelNode(); node.get(OP_ADDR).set(EXTENSION, "org.jboss.as.jaxrs"); node.get(OP).set(ADD); list.add(node); - try { - list.addAll(Marshaller.marshal(fraction)); - } catch (Exception e) { - System.err.println("Cannot configure JAXRS. " + e); - } + + list.addAll(Marshaller.marshal(fraction)); return list; diff --git a/jca/runtime/src/main/java/org/wildfly/swarm/jca/runtime/JCAConfiguration.java b/jca/runtime/src/main/java/org/wildfly/swarm/jca/runtime/JCAConfiguration.java index b6fd5bc624..2fe702686a 100644 --- a/jca/runtime/src/main/java/org/wildfly/swarm/jca/runtime/JCAConfiguration.java +++ b/jca/runtime/src/main/java/org/wildfly/swarm/jca/runtime/JCAConfiguration.java @@ -1,13 +1,12 @@ package org.wildfly.swarm.jca.runtime; +import java.util.List; + import org.jboss.dmr.ModelNode; import org.wildfly.swarm.config.runtime.invocation.Marshaller; import org.wildfly.swarm.container.runtime.AbstractServerConfiguration; import org.wildfly.swarm.jca.JCAFraction; -import java.util.ArrayList; -import java.util.List; - /** * @author Bob McWhirter * @author Lance Ball @@ -24,12 +23,7 @@ public JCAFraction defaultFraction() { } @Override - public List getList(JCAFraction fraction) { - try { - return Marshaller.marshal(fraction); - } catch (Exception e) { - System.err.println("Cannot configure JCA subsystem. " + e); - } - return new ArrayList<>(); + public List getList(JCAFraction fraction) throws Exception { + return Marshaller.marshal(fraction); } } diff --git a/jolokia/runtime/src/main/java/org/wildfly/swarm/jolokia/runtime/JolokiaConfiguration.java b/jolokia/runtime/src/main/java/org/wildfly/swarm/jolokia/runtime/JolokiaConfiguration.java index 612bc271ed..da29b892ad 100644 --- a/jolokia/runtime/src/main/java/org/wildfly/swarm/jolokia/runtime/JolokiaConfiguration.java +++ b/jolokia/runtime/src/main/java/org/wildfly/swarm/jolokia/runtime/JolokiaConfiguration.java @@ -21,22 +21,19 @@ public JolokiaConfiguration() { @Override public JolokiaFraction defaultFraction() { - System.err.println( "create default fraction for Jolokia" ); + System.err.println("create default fraction for Jolokia"); return new JolokiaFraction(); } @Override - public List getImplicitDeployments(JolokiaFraction fraction) { - List list =new ArrayList<>(); + public List getImplicitDeployments(JolokiaFraction fraction) throws Exception { + List list = new ArrayList<>(); JavaArchive war = null; - try { - war = Swarm.artifact("org.jolokia:jolokia-war:war:*"); - war.as(WARArchive.class).setContextRoot( fraction.context() ); - list.add(war); - } catch (Exception e) { - e.printStackTrace(); - - } + + war = Swarm.artifact("org.jolokia:jolokia-war:war:*"); + war.as(WARArchive.class).setContextRoot(fraction.context()); + list.add(war); + return list; } } diff --git a/jpa/runtime/src/main/java/org/wildfly/swarm/jpa/jpa/JPAConfiguration.java b/jpa/runtime/src/main/java/org/wildfly/swarm/jpa/jpa/JPAConfiguration.java index f64c7dfa04..45485428a5 100644 --- a/jpa/runtime/src/main/java/org/wildfly/swarm/jpa/jpa/JPAConfiguration.java +++ b/jpa/runtime/src/main/java/org/wildfly/swarm/jpa/jpa/JPAConfiguration.java @@ -1,14 +1,17 @@ package org.wildfly.swarm.jpa.jpa; +import java.util.ArrayList; +import java.util.List; + import org.jboss.dmr.ModelNode; import org.wildfly.swarm.config.runtime.invocation.Marshaller; import org.wildfly.swarm.container.runtime.AbstractServerConfiguration; import org.wildfly.swarm.jpa.JPAFraction; -import java.util.ArrayList; -import java.util.List; - -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.*; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.ADD; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.EXTENSION; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP_ADDR; /** * @author Ken Finnigan @@ -26,17 +29,15 @@ public JPAFraction defaultFraction() { } @Override - public List getList(JPAFraction fraction) { + public List getList(JPAFraction fraction) throws Exception { List list = new ArrayList<>(); ModelNode node = new ModelNode(); node.get(OP_ADDR).set(EXTENSION, "org.jboss.as.jpa"); node.get(OP).set(ADD); list.add(node); - try { - list.addAll(Marshaller.marshal(fraction)); - } catch (Exception e) { - System.err.println("Cannot configure JPA subsystem. " + e); - } + + list.addAll(Marshaller.marshal(fraction)); + return list; } } diff --git a/jsf/runtime/src/main/java/org/wildfly/swarm/jsf/runtime/JSFConfiguration.java b/jsf/runtime/src/main/java/org/wildfly/swarm/jsf/runtime/JSFConfiguration.java index 91cde5a163..ac53e3a6a6 100644 --- a/jsf/runtime/src/main/java/org/wildfly/swarm/jsf/runtime/JSFConfiguration.java +++ b/jsf/runtime/src/main/java/org/wildfly/swarm/jsf/runtime/JSFConfiguration.java @@ -1,14 +1,17 @@ package org.wildfly.swarm.jsf.runtime; +import java.util.ArrayList; +import java.util.List; + import org.jboss.dmr.ModelNode; import org.wildfly.swarm.config.runtime.invocation.Marshaller; import org.wildfly.swarm.container.runtime.AbstractServerConfiguration; import org.wildfly.swarm.jsf.JSFFraction; -import java.util.ArrayList; -import java.util.List; - -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.*; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.ADD; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.EXTENSION; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP_ADDR; /** * @author Ken Finnigan @@ -26,7 +29,7 @@ public JSFFraction defaultFraction() { } @Override - public List getList(JSFFraction fraction) { + public List getList(JSFFraction fraction) throws Exception { List list = new ArrayList<>(); ModelNode node = new ModelNode(); @@ -34,11 +37,7 @@ public List getList(JSFFraction fraction) { node.get(OP).set(ADD); list.add(node); - try { - list.addAll(Marshaller.marshal(fraction)); - } catch (Exception e) { - System.err.println("Cannot configure JSF subsystem. " + e); - } + list.addAll(Marshaller.marshal(fraction)); return list; } diff --git a/logging/runtime/src/main/java/org/wildfly/swarm/logging/runtime/LoggingConfiguration.java b/logging/runtime/src/main/java/org/wildfly/swarm/logging/runtime/LoggingConfiguration.java index db1b01f30f..966c1818c6 100644 --- a/logging/runtime/src/main/java/org/wildfly/swarm/logging/runtime/LoggingConfiguration.java +++ b/logging/runtime/src/main/java/org/wildfly/swarm/logging/runtime/LoggingConfiguration.java @@ -1,14 +1,17 @@ package org.wildfly.swarm.logging.runtime; +import java.util.ArrayList; +import java.util.List; + import org.jboss.dmr.ModelNode; import org.wildfly.swarm.config.runtime.invocation.Marshaller; import org.wildfly.swarm.container.runtime.AbstractServerConfiguration; import org.wildfly.swarm.logging.LoggingFraction; -import java.util.ArrayList; -import java.util.List; - -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.*; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.ADD; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.EXTENSION; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP_ADDR; /** * @author Bob McWhirter @@ -23,12 +26,12 @@ public LoggingConfiguration() { @Override public LoggingFraction defaultFraction() { String prop = System.getProperty("swarm.logging"); - if ( prop != null ) { + if (prop != null) { prop = prop.trim().toLowerCase(); - if ( prop.equals("debug" ) ) { + if (prop.equals("debug")) { return LoggingFraction.createDebugLoggingFraction(); - } else if (prop.equals("trace" ) ) { + } else if (prop.equals("trace")) { return LoggingFraction.createTraceLoggingFraction(); } } @@ -37,7 +40,7 @@ public LoggingFraction defaultFraction() { } @Override - public List getList(LoggingFraction fraction) { + public List getList(LoggingFraction fraction) throws Exception { if (fraction == null) { fraction = defaultFraction(); } @@ -52,11 +55,8 @@ public List getList(LoggingFraction fraction) { add.get(OP_ADDR).set(address).add(EXTENSION, "org.jboss.as.logging"); add.get(OP).set(ADD); list.add(add); - try { - list.addAll(Marshaller.marshal(fraction)); - } catch (Exception e) { - System.err.println("Cannot configure Logging subsystem. " + e); - } + + list.addAll(Marshaller.marshal(fraction)); return list; } diff --git a/mail/runtime/src/main/java/org/wildfly/swarm/mail/runtime/MailConfiguration.java b/mail/runtime/src/main/java/org/wildfly/swarm/mail/runtime/MailConfiguration.java index 795516ef87..bfe0bfcc04 100644 --- a/mail/runtime/src/main/java/org/wildfly/swarm/mail/runtime/MailConfiguration.java +++ b/mail/runtime/src/main/java/org/wildfly/swarm/mail/runtime/MailConfiguration.java @@ -36,7 +36,7 @@ public MailFraction defaultFraction() { } @Override - public List getList(MailFraction fraction) { + public List getList(MailFraction fraction) throws Exception { List list = new ArrayList<>(); @@ -48,12 +48,8 @@ public List getList(MailFraction fraction) { Mail mail = new Mail(); List socketBindings = addSmtpServers(fraction, mail); - try { - list.addAll(Marshaller.marshal(mail)); - list.addAll(socketBindings); - } catch (Exception e) { - e.printStackTrace(); - } + list.addAll(Marshaller.marshal(mail)); + list.addAll(socketBindings); return list; } diff --git a/messaging/runtime/src/main/java/org/wildfly/swarm/messaging/runtime/MessagingConfiguration.java b/messaging/runtime/src/main/java/org/wildfly/swarm/messaging/runtime/MessagingConfiguration.java index 535e2e7cbf..520c002242 100644 --- a/messaging/runtime/src/main/java/org/wildfly/swarm/messaging/runtime/MessagingConfiguration.java +++ b/messaging/runtime/src/main/java/org/wildfly/swarm/messaging/runtime/MessagingConfiguration.java @@ -1,5 +1,8 @@ package org.wildfly.swarm.messaging.runtime; +import java.util.ArrayList; +import java.util.List; + import org.jboss.as.controller.PathAddress; import org.jboss.as.controller.PathElement; import org.jboss.dmr.ModelNode; @@ -9,10 +12,11 @@ import org.wildfly.swarm.container.runtime.AbstractServerConfiguration; import org.wildfly.swarm.messaging.MessagingFraction; -import java.util.ArrayList; -import java.util.List; - -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.*; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.ADD; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.EXTENSION; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP_ADDR; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.SUBSYSTEM; /** * @author Bob McWhirter @@ -37,7 +41,7 @@ public void prepareArchive(Archive a) { } @Override - public List getList(MessagingFraction fraction) { + public List getList(MessagingFraction fraction) throws Exception { List list = new ArrayList<>(); ModelNode node = new ModelNode(); @@ -45,11 +49,7 @@ public List getList(MessagingFraction fraction) { node.get(OP).set(ADD); list.add(node); - try { - list.addAll(Marshaller.marshal(fraction)); - } catch (Exception e) { - System.err.println("Cannot configure Logging subsystem. " + e); - } + list.addAll(Marshaller.marshal(fraction)); return list; } diff --git a/naming/runtime/src/main/java/org/wildfly/swarm/naming/runtime/NamingConfiguration.java b/naming/runtime/src/main/java/org/wildfly/swarm/naming/runtime/NamingConfiguration.java index 8aafb3e120..d1f4a40214 100644 --- a/naming/runtime/src/main/java/org/wildfly/swarm/naming/runtime/NamingConfiguration.java +++ b/naming/runtime/src/main/java/org/wildfly/swarm/naming/runtime/NamingConfiguration.java @@ -12,7 +12,6 @@ import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.EXTENSION; import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP; import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP_ADDR; -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.SUBSYSTEM; /** * @author Bob McWhirter @@ -30,18 +29,15 @@ public NamingFraction defaultFraction() { } @Override - public List getList(NamingFraction fraction) { + public List getList(NamingFraction fraction) throws Exception { List list = new ArrayList<>(); ModelNode node = new ModelNode(); node.get(OP_ADDR).set(EXTENSION, "org.jboss.as.naming"); node.get(OP).set(ADD); list.add(node); - try { - list.addAll(Marshaller.marshal(fraction)); - } catch (Exception e) { - System.err.println("Cannot configure Naming subsystem. " + e); - } + + list.addAll(Marshaller.marshal(fraction)); return list; diff --git a/remoting/runtime/src/main/java/org/wildfly/swarm/remoting/runtime/RemotingConfiguration.java b/remoting/runtime/src/main/java/org/wildfly/swarm/remoting/runtime/RemotingConfiguration.java index 1c5bd2f3ef..1c1ed55f08 100644 --- a/remoting/runtime/src/main/java/org/wildfly/swarm/remoting/runtime/RemotingConfiguration.java +++ b/remoting/runtime/src/main/java/org/wildfly/swarm/remoting/runtime/RemotingConfiguration.java @@ -1,5 +1,8 @@ package org.wildfly.swarm.remoting.runtime; +import java.util.ArrayList; +import java.util.List; + import org.jboss.dmr.ModelNode; import org.wildfly.swarm.config.remoting.EndpointConfiguration; import org.wildfly.swarm.config.remoting.HttpConnector; @@ -7,10 +10,10 @@ import org.wildfly.swarm.container.runtime.AbstractServerConfiguration; import org.wildfly.swarm.remoting.RemotingFraction; -import java.util.ArrayList; -import java.util.List; - -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.*; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.ADD; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.EXTENSION; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP_ADDR; /** * @author Ken Finnigan @@ -33,7 +36,7 @@ public RemotingFraction defaultFraction() { } @Override - public List getList(RemotingFraction fraction) { + public List getList(RemotingFraction fraction) throws Exception { List list = new ArrayList<>(); ModelNode node = new ModelNode(); @@ -41,11 +44,7 @@ public List getList(RemotingFraction fraction) { node.get(OP).set(ADD); list.add(node); - try { - list.addAll(Marshaller.marshal(fraction)); - } catch (Exception e) { - System.err.println("Cannot configure Remoting subsystem. " + e); - } + list.addAll(Marshaller.marshal(fraction)); return list; } diff --git a/security/runtime/src/main/java/org/wildfly/swarm/security/runtime/SecurityConfiguration.java b/security/runtime/src/main/java/org/wildfly/swarm/security/runtime/SecurityConfiguration.java index 2b940c57aa..444d2ae82b 100644 --- a/security/runtime/src/main/java/org/wildfly/swarm/security/runtime/SecurityConfiguration.java +++ b/security/runtime/src/main/java/org/wildfly/swarm/security/runtime/SecurityConfiguration.java @@ -42,7 +42,7 @@ public SecurityFraction defaultFraction() { } @Override - public List getList(SecurityFraction fraction) { + public List getList(SecurityFraction fraction) throws Exception { if (fraction == null) { fraction = defaultFraction(); } @@ -57,11 +57,8 @@ public List getList(SecurityFraction fraction) { add.get(OP_ADDR).set(address).add(EXTENSION, "org.jboss.as.security"); add.get(OP).set(ADD); list.add(add); - try { - list.addAll(Marshaller.marshal(fraction)); - } catch (Exception e) { - System.err.println("Cannot configure Security subsystem. " + e); - } + + list.addAll(Marshaller.marshal(fraction)); return list; } diff --git a/transactions/runtime/src/main/java/org/wildfly/swarm/transactions/runtime/TransactionsConfiguration.java b/transactions/runtime/src/main/java/org/wildfly/swarm/transactions/runtime/TransactionsConfiguration.java index a1d2b30bf7..fadc91490d 100644 --- a/transactions/runtime/src/main/java/org/wildfly/swarm/transactions/runtime/TransactionsConfiguration.java +++ b/transactions/runtime/src/main/java/org/wildfly/swarm/transactions/runtime/TransactionsConfiguration.java @@ -1,5 +1,8 @@ package org.wildfly.swarm.transactions.runtime; +import java.util.ArrayList; +import java.util.List; + import org.jboss.as.controller.PathAddress; import org.jboss.as.controller.PathElement; import org.jboss.dmr.ModelNode; @@ -7,10 +10,11 @@ import org.wildfly.swarm.container.runtime.AbstractServerConfiguration; import org.wildfly.swarm.transactions.TransactionsFraction; -import java.util.ArrayList; -import java.util.List; - -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.*; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.ADD; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.EXTENSION; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP_ADDR; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.PORT; /** * @author Bob McWhirter @@ -28,7 +32,7 @@ public TransactionsFraction defaultFraction() { } @Override - public List getList(TransactionsFraction fraction) { + public List getList(TransactionsFraction fraction) throws Exception { List list = new ArrayList<>(); ModelNode node = new ModelNode(); @@ -36,12 +40,7 @@ public List getList(TransactionsFraction fraction) { node.get(OP).set(ADD); list.add(node); - try { - list.addAll(Marshaller.marshal(fraction)); - } catch (Exception e) { - System.err.println("Unable to configure Transactions subsystem. " + e); - e.printStackTrace(); - } + list.addAll(Marshaller.marshal(fraction)); node = new ModelNode(); node.get(OP_ADDR).set(PathAddress.pathAddress(PathElement.pathElement("socket-binding-group", "default-sockets")).append("socket-binding", "txn-recovery-environment").toModelNode()); diff --git a/undertow/runtime/src/main/java/org/wildfly/swarm/undertow/runtime/UndertowConfiguration.java b/undertow/runtime/src/main/java/org/wildfly/swarm/undertow/runtime/UndertowConfiguration.java index d1f756362a..752a445ac6 100644 --- a/undertow/runtime/src/main/java/org/wildfly/swarm/undertow/runtime/UndertowConfiguration.java +++ b/undertow/runtime/src/main/java/org/wildfly/swarm/undertow/runtime/UndertowConfiguration.java @@ -3,7 +3,6 @@ import java.util.ArrayList; import java.util.List; -import io.undertow.Undertow; import org.jboss.dmr.ModelNode; import org.wildfly.swarm.config.runtime.invocation.Marshaller; import org.wildfly.swarm.container.runtime.AbstractServerConfiguration; @@ -30,7 +29,7 @@ public UndertowFraction defaultFraction() { } @Override - public List getList(UndertowFraction fraction) { + public List getList(UndertowFraction fraction) throws Exception { List list = new ArrayList<>(); ModelNode node = new ModelNode(); @@ -38,11 +37,7 @@ public List getList(UndertowFraction fraction) { node.get(OP).set(ADD); list.add(node); - try { - list.addAll(Marshaller.marshal(fraction)); - } catch (Exception e) { - System.err.println("Unable to configure Undertow subsystem. " + e); - } + list.addAll(Marshaller.marshal(fraction)); return list; diff --git a/weld/runtime/src/main/java/org/wildfly/swarm/weld/runtime/WeldConfiguration.java b/weld/runtime/src/main/java/org/wildfly/swarm/weld/runtime/WeldConfiguration.java index 155ef7cfbb..e817e3ec83 100644 --- a/weld/runtime/src/main/java/org/wildfly/swarm/weld/runtime/WeldConfiguration.java +++ b/weld/runtime/src/main/java/org/wildfly/swarm/weld/runtime/WeldConfiguration.java @@ -1,14 +1,17 @@ package org.wildfly.swarm.weld.runtime; +import java.util.ArrayList; +import java.util.List; + import org.jboss.dmr.ModelNode; import org.wildfly.swarm.config.runtime.invocation.Marshaller; import org.wildfly.swarm.container.runtime.AbstractServerConfiguration; import org.wildfly.swarm.weld.WeldFraction; -import java.util.ArrayList; -import java.util.List; - -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.*; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.ADD; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.EXTENSION; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP_ADDR; /** * @author Bob McWhirter @@ -26,18 +29,15 @@ public WeldFraction defaultFraction() { } @Override - public List getList(WeldFraction fraction) { + public List getList(WeldFraction fraction) throws Exception { List list = new ArrayList<>(); ModelNode node = new ModelNode(); node.get(OP_ADDR).set(EXTENSION, "org.jboss.as.weld"); node.get(OP).set(ADD); list.add(node); - try { - list.addAll(Marshaller.marshal(fraction)); - } catch (Exception e) { - System.err.println("Cannot configure Weld subysystem. "+ e); - } + + list.addAll(Marshaller.marshal(fraction)); return list;