diff --git a/feature-pack/feature-pack-build.xml b/feature-pack/feature-pack-build.xml index 5694d4b26793..c2ded121da88 100644 --- a/feature-pack/feature-pack-build.xml +++ b/feature-pack/feature-pack-build.xml @@ -147,7 +147,6 @@ - diff --git a/feature-pack/pom.xml b/feature-pack/pom.xml index e83034610ced..fb5edf24b65c 100644 --- a/feature-pack/pom.xml +++ b/feature-pack/pom.xml @@ -2764,22 +2764,6 @@ picketlink-wildfly8 - - org.wildfly - wildfly-wise - - - * - * - - - - - - org.jboss.wise - wise-gwt-gui - war - diff --git a/feature-pack/src/main/resources/configuration/standalone/subsystems-full.xml b/feature-pack/src/main/resources/configuration/standalone/subsystems-full.xml index 200817853571..6bd5e3bcdf43 100644 --- a/feature-pack/src/main/resources/configuration/standalone/subsystems-full.xml +++ b/feature-pack/src/main/resources/configuration/standalone/subsystems-full.xml @@ -33,6 +33,5 @@ undertow.xml webservices.xml weld.xml - wise.xml diff --git a/feature-pack/src/main/resources/configuration/standalone/subsystems.xml b/feature-pack/src/main/resources/configuration/standalone/subsystems.xml index da6d3fc59e34..112b49923cca 100644 --- a/feature-pack/src/main/resources/configuration/standalone/subsystems.xml +++ b/feature-pack/src/main/resources/configuration/standalone/subsystems.xml @@ -30,6 +30,5 @@ undertow.xml webservices.xml weld.xml - wise.xml diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/extension/wise/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/extension/wise/main/module.xml deleted file mode 100644 index 5153a824a458..000000000000 --- a/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/extension/wise/main/module.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/pom.xml b/pom.xml index 143f89ffb684..ee074dfe6111 100644 --- a/pom.xml +++ b/pom.xml @@ -260,8 +260,6 @@ target/model-test-classpath-cache 0.8.13 - 1.0.0.Final - @@ -309,7 +307,6 @@ servlet-feature-pack webservices weld - wise xts rts testsuite/shared @@ -6088,17 +6085,6 @@ - - org.wildfly - wildfly-wise - ${project.version} - - - org.jboss.wise - wise-gwt-gui - ${version.wise-gwt-gui} - war - diff --git a/security/subsystem/src/main/resources/subsystem-templates/security.xml b/security/subsystem/src/main/resources/subsystem-templates/security.xml index 4ff0c25eea7c..9f66e5e826d9 100644 --- a/security/subsystem/src/main/resources/subsystem-templates/security.xml +++ b/security/subsystem/src/main/resources/subsystem-templates/security.xml @@ -31,13 +31,6 @@ - - - - - - - diff --git a/servlet-feature-pack/pom.xml b/servlet-feature-pack/pom.xml index 5ecc9f6c66f4..69eaaf5d3919 100644 --- a/servlet-feature-pack/pom.xml +++ b/servlet-feature-pack/pom.xml @@ -376,6 +376,7 @@ xalan xalan + @@ -427,7 +428,6 @@ - diff --git a/wise/README.md b/wise/README.md deleted file mode 100644 index b4cbd8484b62..000000000000 --- a/wise/README.md +++ /dev/null @@ -1,2 +0,0 @@ -# wise-service -Wise as a wfly subsystem diff --git a/wise/pom.xml b/wise/pom.xml deleted file mode 100644 index c52ab97b3c1b..000000000000 --- a/wise/pom.xml +++ /dev/null @@ -1,83 +0,0 @@ - - - - - 4.0.0 - - - org.wildfly - wildfly-parent - 11.0.0.Alpha1-SNAPSHOT - - - wildfly-wise - jar - WildFly: Wise Integration - - - - org.jboss - jboss-dmr - - - - org.wildfly.core - wildfly-controller - - - - org.jboss.logging - jboss-logging-processor - - provided - true - - - - org.jboss.logging - jboss-logging-annotations - - provided - true - - - - junit - junit - test - - - - org.wildfly.core - wildfly-subsystem-test - pom - test - - - - diff --git a/wise/src/main/java/org/wildfly/extension/wise/WiseExtension.java b/wise/src/main/java/org/wildfly/extension/wise/WiseExtension.java deleted file mode 100644 index dae1688df22b..000000000000 --- a/wise/src/main/java/org/wildfly/extension/wise/WiseExtension.java +++ /dev/null @@ -1,143 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2016, Red Hat, Inc., and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.wildfly.extension.wise; - -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.ADD; -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; -import static org.jboss.as.controller.parsing.ParseUtils.requireNoAttributes; -import static org.jboss.as.controller.parsing.ParseUtils.requireNoContent; - -import java.util.List; - -import javax.xml.stream.XMLStreamConstants; -import javax.xml.stream.XMLStreamException; - -import org.jboss.as.controller.Extension; -import org.jboss.as.controller.ExtensionContext; -import org.jboss.as.controller.ModelVersion; -import org.jboss.as.controller.PathElement; -import org.jboss.as.controller.ResourceDefinition; -import org.jboss.as.controller.SimpleResourceDefinition; -import org.jboss.as.controller.SubsystemRegistration; -import org.jboss.as.controller.descriptions.ModelDescriptionConstants; -import org.jboss.as.controller.descriptions.StandardResourceDescriptionResolver; -import org.jboss.as.controller.operations.common.GenericSubsystemDescribeHandler; -import org.jboss.as.controller.parsing.ExtensionParsingContext; -import org.jboss.as.controller.persistence.SubsystemMarshallingContext; -import org.jboss.as.controller.registry.ManagementResourceRegistration; -import org.jboss.dmr.ModelNode; -import org.jboss.staxmapper.XMLElementReader; -import org.jboss.staxmapper.XMLElementWriter; -import org.jboss.staxmapper.XMLExtendedStreamReader; -import org.jboss.staxmapper.XMLExtendedStreamWriter; -import static org.wildfly.extension.wise.WiseLogger.ROOT_LOGGER; - -/** - * Extension for subsystem that deploys wise.war. - * - * @author rsearls - */ -public class WiseExtension implements Extension { - - public static final String SUBSYSTEM_NAME = "wise"; - public static final String NAMESPACE = "urn:jboss:domain:wise:1.0"; - - private static final WiseSubsystemParser parser = new WiseSubsystemParser(); - private static final PathElement PATH_SUBSYSTEM = PathElement.pathElement(SUBSYSTEM, - SUBSYSTEM_NAME); - - - private static final String RESOURCE_NAME = WiseExtension.class.getPackage().getName() - + ".LocalDescriptions"; - - private static final ModelVersion VERSION = ModelVersion.create(1,0,0); - - static StandardResourceDescriptionResolver getResourceDescriptionResolver( - final String... keyPrefix) { - StringBuilder prefix = new StringBuilder(SUBSYSTEM_NAME); - for (String kp : keyPrefix) { - prefix.append('.').append(kp); - } - return new StandardResourceDescriptionResolver(prefix.toString(), RESOURCE_NAME, - WiseExtension.class.getClassLoader(), true, false); - } - - private static final ResourceDefinition WISE_SUBSYSTEM_RESOURCE = new - SimpleResourceDefinition( - PATH_SUBSYSTEM, - getResourceDescriptionResolver(), - WiseSubsystemAdd.INSTANCE, - WiseSubsystemRemove.INSTANCE); - - /** {@inheritDoc} */ - @Override - public void initialize(final ExtensionContext context) { - ROOT_LOGGER.debugf("Activating Wise Extension"); - final SubsystemRegistration subsystem = context.registerSubsystem( - SUBSYSTEM_NAME, VERSION); - final ManagementResourceRegistration registration = subsystem.registerSubsystemModel( - WISE_SUBSYSTEM_RESOURCE); - registration.registerOperationHandler(GenericSubsystemDescribeHandler.DEFINITION, - GenericSubsystemDescribeHandler.INSTANCE, false); - subsystem.registerXMLElementWriter(parser); - } - - /** {@inheritDoc} */ - @Override - public void initializeParsers(final ExtensionParsingContext context) { - context.setSubsystemXmlMapping(SUBSYSTEM_NAME, WiseExtension.NAMESPACE, parser); - } - - private static ModelNode createAddSubSystemOperation() { - final ModelNode subsystem = new ModelNode(); - subsystem.get(OP).set(ADD); - subsystem.get(OP_ADDR).add(ModelDescriptionConstants.SUBSYSTEM, SUBSYSTEM_NAME); - return subsystem; - } - - static class WiseSubsystemParser implements XMLStreamConstants, XMLElementReader>, - XMLElementWriter { - - /** {@inheritDoc} */ - @Override - public void readElement(final XMLExtendedStreamReader reader, final List list) - throws XMLStreamException { - // Require no attributes or content - requireNoAttributes(reader); - requireNoContent(reader); - list.add(createAddSubSystemOperation()); - } - - /** {@inheritDoc} */ - @Override - public void writeContent(final XMLExtendedStreamWriter streamWriter, final - SubsystemMarshallingContext context) throws XMLStreamException { - //TODO seems to be a problem with empty elements cleaning up the queue in FormattingXMLStreamWriter.runAttrQueue - //context.startSubsystemElement(NewWeldExtension, true); - context.startSubsystemElement(WiseExtension.NAMESPACE, false); - streamWriter.writeEndElement(); - } - - } -} \ No newline at end of file diff --git a/wise/src/main/java/org/wildfly/extension/wise/WiseLogger.java b/wise/src/main/java/org/wildfly/extension/wise/WiseLogger.java deleted file mode 100644 index fc256ee7d9dc..000000000000 --- a/wise/src/main/java/org/wildfly/extension/wise/WiseLogger.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2016, Red Hat, Inc., and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.wildfly.extension.wise; - -import org.jboss.logging.BasicLogger; -import org.jboss.logging.Logger; -import org.jboss.logging.annotations.MessageLogger; - -/** - * - */ -@MessageLogger(projectCode = "WFLYWSW", length = 4) -public interface WiseLogger extends BasicLogger { - - /** - * A logger with a category of the package name. - */ - WiseLogger ROOT_LOGGER = Logger.getMessageLogger(WiseLogger.class, "org.wildfly.extension.wise"); - -} \ No newline at end of file diff --git a/wise/src/main/java/org/wildfly/extension/wise/WiseSubsystemAdd.java b/wise/src/main/java/org/wildfly/extension/wise/WiseSubsystemAdd.java deleted file mode 100644 index 074056f12465..000000000000 --- a/wise/src/main/java/org/wildfly/extension/wise/WiseSubsystemAdd.java +++ /dev/null @@ -1,90 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2016, Red Hat, Inc., and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.wildfly.extension.wise; - -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.ADD; -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.CONTENT; -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.DEPLOYMENT; -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.ENABLED; -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.PERSISTENT; -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.URL; - -import java.net.URL; - -import org.jboss.as.controller.AbstractAddStepHandler; -import org.jboss.as.controller.OperationContext; -import org.jboss.as.controller.OperationFailedException; -import org.jboss.as.controller.OperationStepHandler; -import org.jboss.as.controller.PathAddress; -import org.jboss.as.controller.PathElement; -import org.jboss.as.controller.operations.common.Util; -import org.jboss.as.controller.registry.ImmutableManagementResourceRegistration; -import org.jboss.as.controller.registry.Resource; -import org.jboss.dmr.ModelNode; -import org.jboss.modules.Module; - -/** - * The "wise" subsystem add update handler. - * - * User: rsearls - */ -class WiseSubsystemAdd extends AbstractAddStepHandler { - - static final WiseSubsystemAdd INSTANCE = new WiseSubsystemAdd(); - - @Override - protected void populateModel(OperationContext context, ModelNode operation, - Resource resource) throws OperationFailedException { - - resource.getModel().setEmptyObject(); - - // Add a step to install the wise.war deployment - if (requiresRuntime(context)) { // only add the step if we are going to actually deploy the war - - PathAddress deploymentAddress = PathAddress.pathAddress(PathElement.pathElement( - DEPLOYMENT, "wise.war")); - ModelNode op = Util.createOperation(ADD, deploymentAddress); - op.get(ENABLED).set(true); - op.get(PERSISTENT).set(false); // prevents writing this deployment out to standalone.xml - - Module module = Module.forClass(getClass()); - URL url = module.getExportedResource("wise.war"); - String urlString = url.toExternalForm(); - - ModelNode contentItem = new ModelNode(); - contentItem.get(URL).set(urlString); - - op.get(CONTENT).add(contentItem); - - ImmutableManagementResourceRegistration rootResourceRegistration = - context.getRootResourceRegistration(); - OperationStepHandler handler = rootResourceRegistration.getOperationHandler( - deploymentAddress, ADD); - - context.addStep(op, handler, OperationContext.Stage.MODEL); - } - } - - protected boolean requiresRuntimeVerification() { - return false; - } -} \ No newline at end of file diff --git a/wise/src/main/java/org/wildfly/extension/wise/WiseSubsystemRemove.java b/wise/src/main/java/org/wildfly/extension/wise/WiseSubsystemRemove.java deleted file mode 100644 index 21335fee82b2..000000000000 --- a/wise/src/main/java/org/wildfly/extension/wise/WiseSubsystemRemove.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2016, Red Hat, Inc., and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.wildfly.extension.wise; - -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.DEPLOYMENT; -import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.REMOVE; - -import org.jboss.as.controller.AbstractRemoveStepHandler; -import org.jboss.as.controller.OperationContext; -import org.jboss.as.controller.OperationFailedException; -import org.jboss.as.controller.OperationStepHandler; -import org.jboss.as.controller.PathAddress; -import org.jboss.as.controller.PathElement; -import org.jboss.as.controller.operations.common.Util; -import org.jboss.as.controller.registry.ImmutableManagementResourceRegistration; -import org.jboss.dmr.ModelNode; - -/** - * The "wise" subsystem remove update handler. - * - * User: rsearls - */ -public class WiseSubsystemRemove extends AbstractRemoveStepHandler { - - static final WiseSubsystemRemove INSTANCE = new WiseSubsystemRemove(); - - private WiseSubsystemRemove() { - } - - @Override - protected void performRemove(OperationContext context, ModelNode operation, - ModelNode model) throws OperationFailedException { - - // Add a step to remove the wise.war deployment - if (requiresRuntime(context)) { // only add the step if we are going to actually undeploy the war - - PathAddress deploymentAddress = PathAddress.pathAddress(PathElement.pathElement(DEPLOYMENT, "wise.war")); - ModelNode op = Util.createOperation(REMOVE, deploymentAddress); - - ImmutableManagementResourceRegistration rootResourceRegistration = context.getRootResourceRegistration(); - OperationStepHandler handler = rootResourceRegistration.getOperationHandler(deploymentAddress, REMOVE); - - context.addStep(op, handler, OperationContext.Stage.MODEL); - } - - super.performRemove(context, operation, model); - - } -} \ No newline at end of file diff --git a/wise/src/main/resources/META-INF/services/org.jboss.as.controller.Extension b/wise/src/main/resources/META-INF/services/org.jboss.as.controller.Extension deleted file mode 100644 index e7d8d2482360..000000000000 --- a/wise/src/main/resources/META-INF/services/org.jboss.as.controller.Extension +++ /dev/null @@ -1,23 +0,0 @@ -# -# JBoss, Home of Professional Open Source. -# Copyright 2016, Red Hat, Inc., and individual contributors -# as indicated by the @author tags. See the copyright.txt file in the -# distribution for a full listing of individual contributors. -# -# This is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation; either version 2.1 of -# the License, or (at your option) any later version. -# -# This software is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this software; if not, write to the Free -# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -# 02110-1301 USA, or see the FSF site: http://www.fsf.org. -# - -org.wildfly.extension.wise.WiseExtension diff --git a/wise/src/main/resources/org/wildfly/extension/wise/LocalDescriptions.properties b/wise/src/main/resources/org/wildfly/extension/wise/LocalDescriptions.properties deleted file mode 100644 index 0a56098a62e4..000000000000 --- a/wise/src/main/resources/org/wildfly/extension/wise/LocalDescriptions.properties +++ /dev/null @@ -1,3 +0,0 @@ -wise=WISE Subsystem. -wise.add=Adds the WISE subsystem. -wise.remove=Removes the WISE subsystem. diff --git a/wise/src/main/resources/schema/wildfly-wise_1_0.xsd b/wise/src/main/resources/schema/wildfly-wise_1_0.xsd deleted file mode 100644 index d71ca3a7227c..000000000000 --- a/wise/src/main/resources/schema/wildfly-wise_1_0.xsd +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - diff --git a/wise/src/main/resources/subsystem-templates/wise.xml b/wise/src/main/resources/subsystem-templates/wise.xml deleted file mode 100644 index aa26d01001ed..000000000000 --- a/wise/src/main/resources/subsystem-templates/wise.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - org.wildfly.extension.wise - - \ No newline at end of file diff --git a/wise/src/test/java/org/wildfly/extension/wise/WiseSubsystemTestCase.java b/wise/src/test/java/org/wildfly/extension/wise/WiseSubsystemTestCase.java deleted file mode 100644 index 09818cefbeed..000000000000 --- a/wise/src/test/java/org/wildfly/extension/wise/WiseSubsystemTestCase.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2016, Red Hat, Inc., and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.wildfly.extension.wise; - -import java.io.IOException; -import org.jboss.as.subsystem.test.AbstractSubsystemBaseTest; - -/** - * @author rsearls - */ -public class WiseSubsystemTestCase extends AbstractSubsystemBaseTest { - - public WiseSubsystemTestCase() { - super(WiseExtension.SUBSYSTEM_NAME, new WiseExtension()); - } - - @Override - protected String getSubsystemXml() throws IOException { - return ""; - } - - @Override - protected String getSubsystemXsdPath() throws Exception { - return "schema/wildfly-wise_1_0.xsd"; - } - - @Override - protected String[] getSubsystemTemplatePaths() throws IOException { - return new String[]{ - "/subsystem-templates/wise.xml" - }; - } -} -