Author: mstruk Date: 2011-06-30 07:05:46 -0400 (Thu, 30 Jun 2011) New Revision: 6779 Modified: sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/Attribute.java sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/Constants.java sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/Element.java sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInExtension.java sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemAdd.java sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemDescribe.java sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemDescriptionProviders.java sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemDescriptions.java sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemParser.java sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/Namespace.java sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/SharedPortletTldsMetaDataBuilder.java sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/PortletWarClassloadingDependencyProcessor.java sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/PortletWarDeploymentInitializingProcessor.java sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/PortletWarKey.java Log: Code formatting Modified: sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/Attribute.java =================================================================== --- sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/Attribute.java 2011-06-30 10:52:00 UTC (rev 6778) +++ sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/Attribute.java 2011-06-30 11:05:46 UTC (rev 6779) @@ -27,43 +27,52 @@ /** * @author <a href="mailto:mstrukel@redhat.com">Marko Strukelj</a> */ -public enum Attribute { - UNKNOWN(null); +public enum Attribute +{ + UNKNOWN(null); - private final String name; + private final String name; - Attribute(final String name) { - this.name = name; - } + Attribute(final String name) + { + this.name = name; + } - /** - * Get the local name of this attribute. - * - * @return the local name - */ - public String getLocalName() { - return name; - } + /** + * Get the local name of this attribute. + * + * @return the local name + */ + public String getLocalName() + { + return name; + } - private static final Map<String, Attribute> MAP; + private static final Map<String, Attribute> MAP; - static { - final Map<String, Attribute> map = new HashMap<String, Attribute>(); - for (Attribute element : values()) { - final String name = element.getLocalName(); - if (name != null) - map.put(name, element); - } - MAP = map; - } + static + { + final Map<String, Attribute> map = new HashMap<String, Attribute>(); + for (Attribute element : values()) + { + final String name = element.getLocalName(); + if (name != null) + { + map.put(name, element); + } + } + MAP = map; + } - public static Attribute forName(String localName) { - final Attribute element = MAP.get(localName); - return element == null ? UNKNOWN : element; - } + public static Attribute forName(String localName) + { + final Attribute element = MAP.get(localName); + return element == null ? UNKNOWN : element; + } - @Override - public String toString() { - return getLocalName(); - } + @Override + public String toString() + { + return getLocalName(); + } } Modified: sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/Constants.java =================================================================== --- sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/Constants.java 2011-06-30 10:52:00 UTC (rev 6778) +++ sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/Constants.java 2011-06-30 11:05:46 UTC (rev 6779) @@ -26,7 +26,8 @@ /** * @author <a href="mailto:mstrukel@redhat.com">Marko Strukelj</a> */ -interface Constants { +interface Constants +{ String CONTAINER_CONFIG = "configuration"; String WCI_SERVLET_CLASS = "wci-servlet-class"; Modified: sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/Element.java =================================================================== --- sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/Element.java 2011-06-30 10:52:00 UTC (rev 6778) +++ sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/Element.java 2011-06-30 11:05:46 UTC (rev 6779) @@ -27,41 +27,49 @@ /** * @author <a href="mailto:mstrukel@redhat.com">Marko Strukelj</a> */ -public enum Element { - // must be first - UNKNOWN(null), - CONTAINER_CONFIG(Constants.CONTAINER_CONFIG), - WCI_SERVLET_CLASS(Constants.WCI_SERVLET_CLASS); +public enum Element +{ + // must be first + UNKNOWN(null), + CONTAINER_CONFIG(Constants.CONTAINER_CONFIG), + WCI_SERVLET_CLASS(Constants.WCI_SERVLET_CLASS); - private final String name; + private final String name; - Element(final String name) { - this.name = name; - } + Element(final String name) + { + this.name = name; + } - /** - * Get the local name of this element. - * - * @return the local name - */ - public String getLocalName() { - return name; - } + /** + * Get the local name of this element. + * + * @return the local name + */ + public String getLocalName() + { + return name; + } - private static final Map<String, Element> MAP; + private static final Map<String, Element> MAP; - static { - final Map<String, Element> map = new HashMap<String, Element>(); - for (Element element : values()) { - final String name = element.getLocalName(); - if (name != null) - map.put(name, element); - } - MAP = map; - } + static + { + final Map<String, Element> map = new HashMap<String, Element>(); + for (Element element : values()) + { + final String name = element.getLocalName(); + if (name != null) + { + map.put(name, element); + } + } + MAP = map; + } - public static Element forName(String localName) { - final Element element = MAP.get(localName); - return element == null ? UNKNOWN : element; - } + public static Element forName(String localName) + { + final Element element = MAP.get(localName); + return element == null ? UNKNOWN : element; + } } Modified: sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInExtension.java =================================================================== --- sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInExtension.java 2011-06-30 10:52:00 UTC (rev 6778) +++ sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInExtension.java 2011-06-30 11:05:46 UTC (rev 6779) @@ -35,15 +35,19 @@ /** * @author <a href="mailto:mstrukel@redhat.com">Marko Strukelj</a> */ -public class GateInExtension implements Extension { +public class GateInExtension implements Extension +{ private static final Logger log = Logger.getLogger("org.gatein"); public static final String SUBSYSTEM_NAME = "gatein"; - /** {@inheritDoc} */ + /** + * {@inheritDoc} + */ @Override - public void initialize(ExtensionContext context) { + public void initialize(ExtensionContext context) + { log.debugf("Activating GateIn Extension"); final SubsystemRegistration subsystem = context.registerSubsystem(SUBSYSTEM_NAME); final ManagementResourceRegistration registration = subsystem.registerSubsystemModel(GateInSubsystemDescriptionProviders.SUBSYSTEM); @@ -52,9 +56,12 @@ subsystem.registerXMLElementWriter(GateInSubsystemParser.getInstance()); } - /** {@inheritDoc} */ + /** + * {@inheritDoc} + */ @Override - public void initializeParsers(ExtensionParsingContext context) { - context.setSubsystemXmlMapping(Namespace.CURRENT.getUriString(), GateInSubsystemParser.getInstance()); + public void initializeParsers(ExtensionParsingContext context) + { + context.setSubsystemXmlMapping(Namespace.CURRENT.getUriString(), GateInSubsystemParser.getInstance()); } } Modified: sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemAdd.java =================================================================== --- sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemAdd.java 2011-06-30 10:52:00 UTC (rev 6778) +++ sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemAdd.java 2011-06-30 11:05:46 UTC (rev 6779) @@ -40,49 +40,49 @@ /** * @author <a href="mailto:mstrukel@redhat.com">Marko Strukelj</a> */ -public class GateInSubsystemAdd extends AbstractBoottimeAddStepHandler implements DescriptionProvider { +public class GateInSubsystemAdd extends AbstractBoottimeAddStepHandler implements DescriptionProvider +{ static final GateInSubsystemAdd INSTANCE = new GateInSubsystemAdd(); static final int STRUCTURE_PORTLET_WAR_DEPLOYMENT_INIT = 0x0B80; static final int DEPENDENCIES_PORTLET_MODULE = 0x1100; - private GateInSubsystemAdd() { + private GateInSubsystemAdd() + { } - protected void populateModel(ModelNode operation, ModelNode model) { + protected void populateModel(ModelNode operation, ModelNode model) + { ModelNode ourContainerConfig = new ModelNode(); model.get(Constants.CONTAINER_CONFIG).set(ourContainerConfig); } protected void performBoottime(OperationContext context, ModelNode operation, ModelNode model, ServiceVerificationHandler verificationHandler, - List<ServiceController<?>> newControllers) throws OperationFailedException { - final ModelNode config = operation.get(Constants.CONTAINER_CONFIG); - context.addStep(new AbstractDeploymentChainStep() { - protected void execute(DeploymentProcessorTarget processorTarget) { - final SharedPortletTldsMetaDataBuilder tldsBuilder = new SharedPortletTldsMetaDataBuilder(); + List<ServiceController<?>> newControllers) throws OperationFailedException + { + final ModelNode config = operation.get(Constants.CONTAINER_CONFIG); + context.addStep(new AbstractDeploymentChainStep() + { + protected void execute(DeploymentProcessorTarget processorTarget) + { + final SharedPortletTldsMetaDataBuilder tldsBuilder = new SharedPortletTldsMetaDataBuilder(); - processorTarget.addDeploymentProcessor(Phase.PARSE, STRUCTURE_PORTLET_WAR_DEPLOYMENT_INIT, new PortletWarDeploymentInitializingProcessor()); - processorTarget.addDeploymentProcessor(Phase.DEPENDENCIES, DEPENDENCIES_PORTLET_MODULE, - new PortletWarClassloadingDependencyProcessor(tldsBuilder.create())); - } - }, OperationContext.Stage.RUNTIME); -/* - final WebServerService service = new WebServerService(defaultVirtualServer, useNative); - newControllers.add(context.getServiceTarget().addService(WebSubsystemServices.JBOSS_WEB, service) - .addDependency(AbstractPathService.pathNameOf(TEMP_DIR), String.class, service.getPathInjector()) - .addDependency(DependencyType.OPTIONAL, ServiceName.JBOSS.append("mbean", "server"), MBeanServer.class, service.getMbeanServer()) - .setInitialMode(Mode.ON_DEMAND) - .install()); -*/ + processorTarget.addDeploymentProcessor(Phase.PARSE, STRUCTURE_PORTLET_WAR_DEPLOYMENT_INIT, new PortletWarDeploymentInitializingProcessor()); + processorTarget.addDeploymentProcessor(Phase.DEPENDENCIES, DEPENDENCIES_PORTLET_MODULE, + new PortletWarClassloadingDependencyProcessor(tldsBuilder.create())); + } + }, OperationContext.Stage.RUNTIME); } - protected boolean requiresRuntimeVerification() { - return false; + protected boolean requiresRuntimeVerification() + { + return false; } - public ModelNode getModelDescription(Locale locale) { + public ModelNode getModelDescription(Locale locale) + { return GateInSubsystemDescriptions.getSubsystemDescription(locale); } } Modified: sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemDescribe.java =================================================================== --- sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemDescribe.java 2011-06-30 10:52:00 UTC (rev 6778) +++ sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemDescribe.java 2011-06-30 11:05:46 UTC (rev 6779) @@ -38,30 +38,35 @@ /** * @author <a href="mailto:mstrukel@redhat.com">Marko Strukelj</a> */ -public class GateInSubsystemDescribe implements OperationStepHandler, DescriptionProvider { +public class GateInSubsystemDescribe implements OperationStepHandler, DescriptionProvider +{ - static final GateInSubsystemDescribe INSTANCE = new GateInSubsystemDescribe(); + static final GateInSubsystemDescribe INSTANCE = new GateInSubsystemDescribe(); - /** {@inheritDoc} */ - @Override - public void execute(OperationContext context, ModelNode operation) throws OperationFailedException - { - final ModelNode result = new ModelNode(); - final PathAddress rootAddress = PathAddress.pathAddress(PathAddress.pathAddress(operation.require(OP_ADDR)).getLastElement()); - final ModelNode subModel = context.readModel(PathAddress.EMPTY_ADDRESS); + /** + * {@inheritDoc} + */ + @Override + public void execute(OperationContext context, ModelNode operation) throws OperationFailedException + { + final ModelNode result = new ModelNode(); + final PathAddress rootAddress = PathAddress.pathAddress(PathAddress.pathAddress(operation.require(OP_ADDR)).getLastElement()); + final ModelNode subModel = context.readModel(PathAddress.EMPTY_ADDRESS); - final ModelNode subsystemAdd = new ModelNode(); - subsystemAdd.get(OP).set(ADD); - subsystemAdd.get(OP_ADDR).set(rootAddress.toModelNode()); - if(subModel.hasDefined(Constants.CONTAINER_CONFIG)) { - subsystemAdd.get(Constants.CONTAINER_CONFIG).set(subModel.get(Constants.CONTAINER_CONFIG)); - } - result.add(subsystemAdd); - context.completeStep(); - } + final ModelNode subsystemAdd = new ModelNode(); + subsystemAdd.get(OP).set(ADD); + subsystemAdd.get(OP_ADDR).set(rootAddress.toModelNode()); + if (subModel.hasDefined(Constants.CONTAINER_CONFIG)) + { + subsystemAdd.get(Constants.CONTAINER_CONFIG).set(subModel.get(Constants.CONTAINER_CONFIG)); + } + result.add(subsystemAdd); + context.completeStep(); + } - @Override - public ModelNode getModelDescription(Locale locale) { - return new ModelNode(); - } + @Override + public ModelNode getModelDescription(Locale locale) + { + return new ModelNode(); + } } Modified: sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemDescriptionProviders.java =================================================================== --- sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemDescriptionProviders.java 2011-06-30 10:52:00 UTC (rev 6778) +++ sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemDescriptionProviders.java 2011-06-30 11:05:46 UTC (rev 6779) @@ -10,11 +10,14 @@ * * @author <a href="mailto:mstrukel@redhat.com">Marko Strukelj</a> */ -public class GateInSubsystemDescriptionProviders { - public static final DescriptionProvider SUBSYSTEM = new DescriptionProvider() { - @Override - public ModelNode getModelDescription(Locale locale) { - return GateInSubsystemDescriptions.getSubsystemDescription(locale); - } - }; +public class GateInSubsystemDescriptionProviders +{ + public static final DescriptionProvider SUBSYSTEM = new DescriptionProvider() + { + @Override + public ModelNode getModelDescription(Locale locale) + { + return GateInSubsystemDescriptions.getSubsystemDescription(locale); + } + }; } Modified: sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemDescriptions.java =================================================================== --- sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemDescriptions.java 2011-06-30 10:52:00 UTC (rev 6778) +++ sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemDescriptions.java 2011-06-30 11:05:46 UTC (rev 6779) @@ -32,10 +32,12 @@ /** * @author <a href="mailto:mstrukel@redhat.com">Marko Strukelj</a> */ -public class GateInSubsystemDescriptions { +public class GateInSubsystemDescriptions +{ static final String RESOURCE_NAME = GateInSubsystemDescriptions.class.getPackage().getName() + ".LocalDescriptions"; - public static ModelNode getSubsystemDescription(final Locale locale) { + public static ModelNode getSubsystemDescription(final Locale locale) + { final ResourceBundle bundle = getResourceBundle(locale); final ModelNode node = new ModelNode(); @@ -53,19 +55,22 @@ return node; } - static ModelNode getConfigurationCommonDescription(final ModelNode node, final ResourceBundle bundle) { + static ModelNode getConfigurationCommonDescription(final ModelNode node, final ResourceBundle bundle) + { - node.get(TYPE).set(ModelType.OBJECT); - node.get(DESCRIPTION).set(bundle.getString("gatein.configuration")); - node.get(REQUIRED).set(false); + node.get(TYPE).set(ModelType.OBJECT); + node.get(DESCRIPTION).set(bundle.getString("gatein.configuration")); + node.get(REQUIRED).set(false); - return node; + return node; } - private static ResourceBundle getResourceBundle(Locale locale) { - if (locale == null) { - locale = Locale.getDefault(); - } - return ResourceBundle.getBundle(RESOURCE_NAME, locale); + private static ResourceBundle getResourceBundle(Locale locale) + { + if (locale == null) + { + locale = Locale.getDefault(); + } + return ResourceBundle.getBundle(RESOURCE_NAME, locale); } } Modified: sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemParser.java =================================================================== --- sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemParser.java 2011-06-30 10:52:00 UTC (rev 6778) +++ sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemParser.java 2011-06-30 11:05:46 UTC (rev 6779) @@ -43,11 +43,13 @@ * * @author <a href="mailto:mstrukel@redhat.com">Marko Strukelj</a> */ -public class GateInSubsystemParser implements XMLStreamConstants, XMLElementReader<List<ModelNode>>, XMLElementWriter<SubsystemMarshallingContext> { +public class GateInSubsystemParser implements XMLStreamConstants, XMLElementReader<List<ModelNode>>, XMLElementWriter<SubsystemMarshallingContext> +{ private static final GateInSubsystemParser INSTANCE = new GateInSubsystemParser(); - static GateInSubsystemParser getInstance() { + static GateInSubsystemParser getInstance() + { return INSTANCE; } @@ -55,19 +57,23 @@ * {@inheritDoc} */ @Override - public void writeContent(XMLExtendedStreamWriter writer, SubsystemMarshallingContext context) throws XMLStreamException { + public void writeContent(XMLExtendedStreamWriter writer, SubsystemMarshallingContext context) throws XMLStreamException + { context.startSubsystemElement(Namespace.CURRENT.getUriString(), false); ModelNode node = context.getModelNode(); - if (node.hasDefined(CONTAINER_CONFIG)) { + if (node.hasDefined(CONTAINER_CONFIG)) + { writeContainerConfig(writer, node.get(CONTAINER_CONFIG)); } writer.writeEndElement(); } - private void writeContainerConfig(XMLExtendedStreamWriter writer, ModelNode config) throws XMLStreamException { + private void writeContainerConfig(XMLExtendedStreamWriter writer, ModelNode config) throws XMLStreamException + { writer.writeStartElement(Element.CONTAINER_CONFIG.getLocalName()); - if (config.hasDefined(WCI_SERVLET_CLASS)) { + if (config.hasDefined(WCI_SERVLET_CLASS)) + { writer.writeStartElement(Element.WCI_SERVLET_CLASS.getLocalName()); writer.writeCharacters(config.get(WCI_SERVLET_CLASS).asString()); writer.writeEndElement(); @@ -79,9 +85,11 @@ * {@inheritDoc} */ @Override - public void readElement(XMLExtendedStreamReader reader, List<ModelNode> list) throws XMLStreamException { + public void readElement(XMLExtendedStreamReader reader, List<ModelNode> list) throws XMLStreamException + { // no attributes - if (reader.getAttributeCount() > 0) { + if (reader.getAttributeCount() > 0) + { throw unexpectedAttribute(reader, 0); } @@ -93,11 +101,13 @@ subsystem.get(OP).set(ADD); subsystem.get(OP_ADDR).set(address); final int count = reader.getAttributeCount(); - for (int i = 0; i < count; i++) { + for (int i = 0; i < count; i++) + { requireNoNamespaceAttribute(reader, i); final String value = reader.getAttributeValue(i); final Attribute attribute = Attribute.forName(reader.getAttributeLocalName(i)); - switch (attribute) { + switch (attribute) + { default: unexpectedAttribute(reader, i); } @@ -105,40 +115,52 @@ list.add(subsystem); // elements - while (reader.hasNext() && reader.nextTag() != END_ELEMENT) { - switch (Namespace.forUri(reader.getNamespaceURI())) { - case GATEIN_1_0: { + while (reader.hasNext() && reader.nextTag() != END_ELEMENT) + { + switch (Namespace.forUri(reader.getNamespaceURI())) + { + case GATEIN_1_0: + { final Element element = Element.forName(reader.getLocalName()); - switch (element) { - case CONTAINER_CONFIG: { + switch (element) + { + case CONTAINER_CONFIG: + { final ModelNode config = parseContainerConfig(reader); subsystem.get(CONTAINER_CONFIG).set(config); break; } - default: { + default: + { throw unexpectedElement(reader); } } break; } - default: { + default: + { throw unexpectedElement(reader); } } } } - static ModelNode parseContainerConfig(XMLExtendedStreamReader reader) throws XMLStreamException { + static ModelNode parseContainerConfig(XMLExtendedStreamReader reader) throws XMLStreamException + { final ModelNode config = new ModelNode(); // no attributes - if (reader.getAttributeCount() > 0) { + if (reader.getAttributeCount() > 0) + { throw unexpectedAttribute(reader, 0); } // elements - while (reader.hasNext() && reader.nextTag() != END_ELEMENT) { + while (reader.hasNext() && reader.nextTag() != END_ELEMENT) + { final Element element = Element.forName(reader.getLocalName()); - switch (element) { - case WCI_SERVLET_CLASS: { + switch (element) + { + case WCI_SERVLET_CLASS: + { final String wciServletClass = reader.getElementText().trim(); config.get(WCI_SERVLET_CLASS).set(wciServletClass); break; @@ -150,8 +172,10 @@ return config; } - static void writeAttribute(final XMLExtendedStreamWriter writer, final String name, ModelNode node) throws XMLStreamException { - if (node.hasDefined(name)) { + static void writeAttribute(final XMLExtendedStreamWriter writer, final String name, ModelNode node) throws XMLStreamException + { + if (node.hasDefined(name)) + { writer.writeAttribute(name, node.get(name).asString()); } } Modified: sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/Namespace.java =================================================================== --- sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/Namespace.java 2011-06-30 10:52:00 UTC (rev 6778) +++ sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/Namespace.java 2011-06-30 11:05:46 UTC (rev 6779) @@ -27,7 +27,8 @@ /** * @author <a href="mailto:mstrukel@redhat.com">Marko Strukelj</a> */ -public enum Namespace { +public enum Namespace +{ // must be first UNKNOWN(null), @@ -40,8 +41,9 @@ private final String name; - Namespace(final String name) { - this.name = name; + Namespace(final String name) + { + this.name = name; } /** @@ -49,24 +51,30 @@ * * @return the URI */ - public String getUriString() { - return name; + public String getUriString() + { + return name; } private static final Map<String, Namespace> MAP; - static { - final Map<String, Namespace> map = new HashMap<String, Namespace>(); - for (Namespace namespace : values()) { - final String name = namespace.getUriString(); - if (name != null) - map.put(name, namespace); - } - MAP = map; + static + { + final Map<String, Namespace> map = new HashMap<String, Namespace>(); + for (Namespace namespace : values()) + { + final String name = namespace.getUriString(); + if (name != null) + { + map.put(name, namespace); + } + } + MAP = map; } - public static Namespace forUri(String uri) { - final Namespace element = MAP.get(uri); - return element == null ? UNKNOWN : element; + public static Namespace forUri(String uri) + { + final Namespace element = MAP.get(uri); + return element == null ? UNKNOWN : element; } } Modified: sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/SharedPortletTldsMetaDataBuilder.java =================================================================== --- sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/SharedPortletTldsMetaDataBuilder.java 2011-06-30 10:52:00 UTC (rev 6778) +++ sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/SharedPortletTldsMetaDataBuilder.java 2011-06-30 11:05:46 UTC (rev 6779) @@ -41,7 +41,7 @@ */ class SharedPortletTldsMetaDataBuilder { - private static final String [] PORTLET_TLDS = {"portlet.tld", "portlet_2_0.tld"}; + private static final String[] PORTLET_TLDS = {"portlet.tld", "portlet_2_0.tld"}; private final List<TldMetaData> tlds = new ArrayList<TldMetaData>(); @@ -50,44 +50,61 @@ init(); } - private void init() { - try { - ModuleClassLoader jstl = Module.getModuleFromCallerModuleLoader(ModuleIdentifier.create("org.gatein.pc")).getClassLoader(); - for (String tld: PORTLET_TLDS) { - InputStream is = jstl.getResourceAsStream("META-INF/" + tld); - if (is != null) { - TldMetaData tldMetaData = parseTLD(tld, is); - tlds.add(tldMetaData); - } - } - } catch (ModuleLoadException e) { - // Ignore - } catch (Exception e) { - // Ignore - } + private void init() + { + try + { + ModuleClassLoader jstl = Module.getModuleFromCallerModuleLoader(ModuleIdentifier.create("org.gatein.pc")).getClassLoader(); + for (String tld : PORTLET_TLDS) + { + InputStream is = jstl.getResourceAsStream("META-INF/" + tld); + if (is != null) + { + TldMetaData tldMetaData = parseTLD(tld, is); + tlds.add(tldMetaData); + } + } + } + catch (ModuleLoadException e) + { + // Ignore + } + catch (Exception e) + { + // Ignore + } } - List<TldMetaData> create() { - final List<TldMetaData> metadata = new ArrayList<TldMetaData>(); - metadata.addAll(tlds); - return metadata; + List<TldMetaData> create() + { + final List<TldMetaData> metadata = new ArrayList<TldMetaData>(); + metadata.addAll(tlds); + return metadata; } - private TldMetaData parseTLD(String tld, InputStream is) throws Exception { - try { - final XMLInputFactory inputFactory = XMLInputFactory.newInstance(); - inputFactory.setXMLResolver(NoopXmlResolver.create()); - XMLStreamReader xmlReader = inputFactory.createXMLStreamReader(is); - return TldMetaDataParser.parse(xmlReader); - } finally { - try { - if (is != null) { - is.close(); - } - } catch (IOException e) { - // Ignore - } - } + private TldMetaData parseTLD(String tld, InputStream is) throws Exception + { + try + { + final XMLInputFactory inputFactory = XMLInputFactory.newInstance(); + inputFactory.setXMLResolver(NoopXmlResolver.create()); + XMLStreamReader xmlReader = inputFactory.createXMLStreamReader(is); + return TldMetaDataParser.parse(xmlReader); + } + finally + { + try + { + if (is != null) + { + is.close(); + } + } + catch (IOException e) + { + // Ignore + } + } } } Modified: sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/PortletWarClassloadingDependencyProcessor.java =================================================================== --- sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/PortletWarClassloadingDependencyProcessor.java 2011-06-30 10:52:00 UTC (rev 6778) +++ sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/PortletWarClassloadingDependencyProcessor.java 2011-06-30 11:05:46 UTC (rev 6779) @@ -40,7 +40,8 @@ /** * @author <a href="mailto:mstrukel@redhat.com">Marko Strukelj</a> */ -public class PortletWarClassloadingDependencyProcessor implements DeploymentUnitProcessor { +public class PortletWarClassloadingDependencyProcessor implements DeploymentUnitProcessor +{ private static final ModuleIdentifier GATEIN_WCI = ModuleIdentifier.create("org.gatein.wci"); private static final ModuleIdentifier GATEIN_PC = ModuleIdentifier.create("org.gatein.pc"); @@ -54,10 +55,12 @@ } @Override - public void deploy(DeploymentPhaseContext phaseContext) throws DeploymentUnitProcessingException { + public void deploy(DeploymentPhaseContext phaseContext) throws DeploymentUnitProcessingException + { final DeploymentUnit deploymentUnit = phaseContext.getDeploymentUnit(); - if (deploymentUnit.getAttachment(PortletWarKey.INSTANCE) == null) { - return; // Skip non portlet deployments + if (deploymentUnit.getAttachment(PortletWarKey.INSTANCE) == null) + { + return; // Skip non portlet deployments } final ModuleLoader moduleLoader = Module.getBootModuleLoader(); @@ -76,19 +79,24 @@ { TldsMetaData tsmd = deploymentUnit.getAttachment(TldsMetaData.ATTACHMENT_KEY); if (tsmd == null) + { throw new IllegalStateException("Attachment not present: TldsMetaData"); + } - Map<String,TldMetaData> tlds = tsmd.getTlds(); + Map<String, TldMetaData> tlds = tsmd.getTlds(); if (tlds == null) + { throw new IllegalStateException("TldsMetaData.tlds == null"); + } - for (TldMetaData tld: tldMetas) + for (TldMetaData tld : tldMetas) { tlds.put(tld.getUri(), tld); } } @Override - public void undeploy(DeploymentUnit context) { + public void undeploy(DeploymentUnit context) + { } } Modified: sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/PortletWarDeploymentInitializingProcessor.java =================================================================== --- sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/PortletWarDeploymentInitializingProcessor.java 2011-06-30 10:52:00 UTC (rev 6778) +++ sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/PortletWarDeploymentInitializingProcessor.java 2011-06-30 11:05:46 UTC (rev 6779) @@ -38,25 +38,30 @@ /** * @author <a href="mailto:mstrukel@redhat.com">Marko Strukelj</a> */ -public class PortletWarDeploymentInitializingProcessor implements DeploymentUnitProcessor { +public class PortletWarDeploymentInitializingProcessor implements DeploymentUnitProcessor +{ private static final String PORTLET_XML = "WEB-INF/portlet.xml"; @Override - public void deploy(DeploymentPhaseContext phaseContext) throws DeploymentUnitProcessingException { - final DeploymentUnit deploymentUnit = phaseContext.getDeploymentUnit(); - if (!DeploymentTypeMarker.isType(DeploymentType.WAR, deploymentUnit)) { - return; // Skip non web deployments - } - final ResourceRoot deploymentRoot = deploymentUnit.getAttachment(Attachments.DEPLOYMENT_ROOT); - final VirtualFile portletXml = deploymentRoot.getRoot().getChild(PORTLET_XML); - if (portletXml.exists()) { - // we don't care about the contents, its existence is enough to mark it as a portlet app - deploymentUnit.putAttachment(PortletWarKey.INSTANCE, Boolean.TRUE); - } + public void deploy(DeploymentPhaseContext phaseContext) throws DeploymentUnitProcessingException + { + final DeploymentUnit deploymentUnit = phaseContext.getDeploymentUnit(); + if (!DeploymentTypeMarker.isType(DeploymentType.WAR, deploymentUnit)) + { + return; // Skip non web deployments + } + final ResourceRoot deploymentRoot = deploymentUnit.getAttachment(Attachments.DEPLOYMENT_ROOT); + final VirtualFile portletXml = deploymentRoot.getRoot().getChild(PORTLET_XML); + if (portletXml.exists()) + { + // we don't care about the contents, its existence is enough to mark it as a portlet app + deploymentUnit.putAttachment(PortletWarKey.INSTANCE, Boolean.TRUE); + } } @Override - public void undeploy(DeploymentUnit context) { + public void undeploy(DeploymentUnit context) + { } } Modified: sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/PortletWarKey.java =================================================================== --- sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/PortletWarKey.java 2011-06-30 10:52:00 UTC (rev 6778) +++ sandbox/as7_support/pc/jboss-as7-integration/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/PortletWarKey.java 2011-06-30 11:05:46 UTC (rev 6779) @@ -26,7 +26,8 @@ /** * @author <a href="mailto:mstrukel@redhat.com">Marko Strukelj</a> */ -public class PortletWarKey { +public class PortletWarKey +{ public static final AttachmentKey<Boolean> INSTANCE = AttachmentKey.create(Boolean.class);