Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Small fixes while reviewing

  • Loading branch information...
commit c918960e50db50ce91a282fa649fde68a541bb5d 1 parent 302c181
@kabir kabir authored
View
8 build/src/main/resources/docs/schema/jboss-as-undertow_1_0.xsd
@@ -45,13 +45,13 @@
<xs:complexType name="serverType">
<xs:sequence>
<xs:element name="http-listener" type="http-listener-type" minOccurs="0" maxOccurs="1"/>
- <xs:element name="https-listener" type="http-listener-type" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="https-listener" type="https-listener-type" minOccurs="0" maxOccurs="1"/>
<xs:element name="ajp-listener" type="ajp-listener-type" minOccurs="0" maxOccurs="1"/>
<xs:element name="host" type="hostType" minOccurs="1" maxOccurs="unbounded"/>
</xs:sequence>
<xs:attribute name="name" use="required" type="xs:string"/>
- <xs:attribute name="default-host" use="optional" type="xs:string"/>
- <xs:attribute name="servlet-container" use="optional" type="xs:string"/>
+ <xs:attribute name="default-host" use="optional" type="xs:string" default="default-host"/>
+ <xs:attribute name="servlet-container" use="optional" type="xs:string" default="default"/>
</xs:complexType>
<xs:complexType name="http-listener-type">
<xs:attribute name="name" use="required" type="xs:string"/>
@@ -70,10 +70,10 @@
</xs:complexType>
<xs:complexType name="ajp-listener-type">
<xs:attribute name="name" use="required" type="xs:string"/>
+ <xs:attribute name="socket-binding" use="required" type="xs:string"/>
<xs:attribute name="worker" type="xs:string" default="default"/>
<xs:attribute name="buffer-pool" type="xs:string" default="default"/>
<xs:attribute name="enabled" type="xs:boolean" default="true"/>
- <xs:attribute name="socket-binding" use="required" type="xs:string"/>
</xs:complexType>
<xs:complexType name="servletContainerType">
<xs:sequence>
View
12 undertow/src/main/java/org/jboss/as/undertow/AbstractListenerAdd.java
@@ -46,12 +46,12 @@ protected void populateModel(ModelNode operation, ModelNode model) throws Operat
protected void performRuntime(OperationContext context, ModelNode operation, ModelNode model, ServiceVerificationHandler verificationHandler, List<ServiceController<?>> newControllers) throws OperationFailedException {
final PathAddress address = PathAddress.pathAddress(operation.get(OP_ADDR));
final PathAddress parent = address.subAddress(0, address.size() - 1);
- name = address.getLastElement().getValue();
- bindingRef = AbstractListenerResourceDefinition.SOCKET_BINDING.resolveModelAttribute(context, model).asString();
- workerName = AbstractListenerResourceDefinition.WORKER.resolveModelAttribute(context, model).asString();
- bufferPoolName = AbstractListenerResourceDefinition.BUFFER_POOL.resolveModelAttribute(context, model).asString();
- enabled = AbstractListenerResourceDefinition.ENABLED.resolveModelAttribute(context, model).asBoolean();
- serverName = parent.getLastElement().getValue();
+ String name = address.getLastElement().getValue();
+ String bindingRef = AbstractListenerResourceDefinition.SOCKET_BINDING.resolveModelAttribute(context, model).asString();
+ String workerName = AbstractListenerResourceDefinition.WORKER.resolveModelAttribute(context, model).asString();
+ String bufferPoolName = AbstractListenerResourceDefinition.BUFFER_POOL.resolveModelAttribute(context, model).asString();
+ boolean enabled = AbstractListenerResourceDefinition.ENABLED.resolveModelAttribute(context, model).asBoolean();
+ String serverName = parent.getLastElement().getValue();
if (enabled){
installService(context, model, verificationHandler, newControllers);
}
View
4 undertow/src/main/java/org/jboss/as/undertow/OptionAttributeDefinition.java
@@ -25,7 +25,7 @@
private OptionAttributeDefinition(String name, String xmlName, ModelNode defaultValue, ModelType type, boolean allowNull, boolean allowExpression,
MeasurementUnit measurementUnit, ParameterCorrector corrector, ParameterValidator validator, boolean validateNull,
String[] alternatives, String[] requires, AttributeMarshaller attributeMarshaller, boolean resourceOnly,
- DeprecationData deprecated, Option option, AttributeAccess.Flag... flags) {
+ DeprecationData deprecated, Option<?> option, AttributeAccess.Flag... flags) {
super(name, xmlName, defaultValue, type, allowNull, allowExpression, measurementUnit, corrector, validator, validateNull, alternatives, requires, attributeMarshaller, resourceOnly, deprecated, flags);
this.option = option;
}
@@ -54,7 +54,7 @@ private static ModelType getType(Option<?> option) {
try {
Field typeField = option.getClass().getDeclaredField("type");
typeField.setAccessible(true);
- Class type = (Class) typeField.get(option);
+ Class<?> type = (Class<?>) typeField.get(option);
if (type.isAssignableFrom(Integer.class)) {
View
1  undertow/src/main/java/org/jboss/as/undertow/ServerDefinition.java
@@ -5,6 +5,7 @@
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
+
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
View
3  undertow/src/main/java/org/jboss/as/undertow/UndertowLogger.java
@@ -58,6 +58,9 @@
UndertowLogger ROOT_LOGGER = Logger.getMessageLogger(UndertowLogger.class, UndertowLogger.class.getPackage().getName());
UndertowLogger WEB_SESSION_LOGGER = Logger.getMessageLogger(UndertowLogger.class, UndertowLogger.class.getPackage().getName() + ".sessions");
+ ////////////////////////////////////////////////////////////
+ //18200-18226 are copied across from the old web subsystem
+
@LogMessage(level = ERROR)
@Message(id = 18200, value = "Failed to start welcome context")
void stopWelcomeContextFailed(@Cause Throwable cause);
View
3  undertow/src/main/java/org/jboss/as/undertow/session/SessionReplicationContext.java
@@ -21,11 +21,12 @@
*/
package org.jboss.as.undertow.session;
+import io.undertow.server.HttpServerExchange;
+
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
-import io.undertow.server.HttpServerExchange;
import org.jboss.as.clustering.web.OutgoingDistributableSessionData;
public final class SessionReplicationContext {
Please sign in to comment.
Something went wrong with that request. Please try again.