# HG changeset patch # Parent 931556ce6d80c9f3ce782ac13d44d4d3d80c95bd # User Jesse Glick Removing functionality from hudson.maven for developing Hudson/Jenkins plugins. https://github.com/stapler/netbeans-stapler-plugin/commit/cd07a9701959206daf967dc0aa45ec459ea00340 diff --git a/hudson.maven/nbproject/project.xml b/hudson.maven/nbproject/project.xml --- a/hudson.maven/nbproject/project.xml +++ b/hudson.maven/nbproject/project.xml @@ -6,15 +6,6 @@ org.netbeans.modules.hudson.maven - org.netbeans.api.annotations.common - - - - 1 - 1.14 - - - org.netbeans.modules.hudson @@ -59,15 +50,6 @@ - org.netbeans.modules.xml.catalog - - - - 2 - 1.15 - - - org.netbeans.modules.xml.xam @@ -77,14 +59,6 @@ - org.openide.awt - - - - 7.4 - - - org.openide.filesystems diff --git a/hudson.maven/src/org/netbeans/modules/hudson/maven/Bundle.properties b/hudson.maven/src/org/netbeans/modules/hudson/maven/Bundle.properties --- a/hudson.maven/src/org/netbeans/modules/hudson/maven/Bundle.properties +++ b/hudson.maven/src/org/netbeans/modules/hudson/maven/Bundle.properties @@ -40,5 +40,3 @@ # Version 2 license, then the option applies only if the new code is # made subject to such option by the copyright holder. OpenIDE-Module-Name=Maven Hudson -JellyTagSchemaCatalog.displayName=Jelly Tags -JellyTagSchemaCatalog.shortDescription=Offers schemas for standard Jelly tags and those defined by Stapler. diff --git a/hudson.maven/src/org/netbeans/modules/hudson/maven/HpiActionGoalProvider.java b/hudson.maven/src/org/netbeans/modules/hudson/maven/HpiActionGoalProvider.java deleted file mode 100644 --- a/hudson.maven/src/org/netbeans/modules/hudson/maven/HpiActionGoalProvider.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2010 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2009 Sun Microsystems, Inc. - */ - -package org.netbeans.modules.hudson.maven; - -import java.io.InputStream; -import org.netbeans.api.annotations.common.StaticResource; -import org.netbeans.modules.maven.spi.actions.AbstractMavenActionsProvider; -import org.netbeans.modules.maven.spi.actions.MavenActionsProvider; -import org.netbeans.spi.project.ProjectServiceProvider; - -/** - * Enables developers to run and debug Hudson plugins. - */ -@ProjectServiceProvider(service=MavenActionsProvider.class, projectType="org-netbeans-modules-maven/hpi") -public class HpiActionGoalProvider extends AbstractMavenActionsProvider { - - @StaticResource private static final String MAPPINGS = "org/netbeans/modules/hudson/maven/action-mappings.xml"; - - @Override protected InputStream getActionDefinitionStream() { - return HpiActionGoalProvider.class.getClassLoader().getResourceAsStream(MAPPINGS); - } - -} diff --git a/hudson.maven/src/org/netbeans/modules/hudson/maven/HudsonIcon.java b/hudson.maven/src/org/netbeans/modules/hudson/maven/HudsonIcon.java deleted file mode 100644 --- a/hudson.maven/src/org/netbeans/modules/hudson/maven/HudsonIcon.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2011 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common Development and - * Distribution License("CDDL") (collectively, the "License"). You may not use - * this file except in compliance with the License. You can obtain a copy of - * the License at http://www.netbeans.org/cddl-gplv2.html or - * nbbuild/licenses/CDDL-GPL-2-CP. See the License for the specific language - * governing permissions and limitations under the License. When distributing - * the software, include this License Header Notice in each file and include - * the License file at nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided by - * Oracle in the GPL Version 2 section of the License file that accompanied - * this code. If applicable, add the following below the License Header, with - * the fields enclosed by brackets [] replaced by your own identifying - * information: "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL or - * only the GPL Version 2, indicate your decision by adding "[Contributor] - * elects to include this software in this distribution under the [CDDL or GPL - * Version 2] license." If you do not indicate a single choice of license, a - * recipient has the option to distribute your version of this file under - * either the CDDL, the GPL Version 2 or to extend the choice of license to its - * licensees as provided above. However, if you add GPL Version 2 code and - * therefore, elected the GPL Version 2 license, then the option applies only - * if the new code is made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2011 Sun Microsystems, Inc. - */ - -package org.netbeans.modules.hudson.maven; - -import javax.swing.Icon; -import org.netbeans.modules.maven.api.NbMavenProject; -import org.netbeans.modules.maven.spi.nodes.SpecialIcon; -import org.netbeans.spi.project.ProjectServiceProvider; -import org.openide.util.ImageUtilities; - -@ProjectServiceProvider(service=SpecialIcon.class, projectType="org-netbeans-modules-maven/hpi") -public class HudsonIcon implements SpecialIcon { - - @Override public Icon getIcon() { - return ImageUtilities.loadImageIcon("org/netbeans/modules/hudson/ui/resources/instance.png", true); - } - -} diff --git a/hudson.maven/src/org/netbeans/modules/hudson/maven/HudsonProviderImpl.java b/hudson.maven/src/org/netbeans/modules/hudson/maven/HudsonProviderImpl.java --- a/hudson.maven/src/org/netbeans/modules/hudson/maven/HudsonProviderImpl.java +++ b/hudson.maven/src/org/netbeans/modules/hudson/maven/HudsonProviderImpl.java @@ -53,17 +53,8 @@ import org.netbeans.modules.maven.model.pom.CiManagement; import org.netbeans.modules.maven.model.pom.POMModel; import org.openide.filesystems.FileObject; -import org.openide.filesystems.MIMEResolver; import org.openide.util.lookup.ServiceProvider; -@MIMEResolver.NamespaceRegistration( - displayName="", - position=454, - mimeType="text/x-jelly+xml", - acceptedExtension="jelly", - elementName="jelly", - elementNS="jelly:core" -) @ServiceProvider(service=ProjectHudsonProvider.class, position=100) public class HudsonProviderImpl extends ProjectHudsonProvider { diff --git a/hudson.maven/src/org/netbeans/modules/hudson/maven/JellyTagSchemaCatalog.java b/hudson.maven/src/org/netbeans/modules/hudson/maven/JellyTagSchemaCatalog.java deleted file mode 100644 --- a/hudson.maven/src/org/netbeans/modules/hudson/maven/JellyTagSchemaCatalog.java +++ /dev/null @@ -1,108 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2010 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2009 Sun Microsystems, Inc. - */ - -package org.netbeans.modules.hudson.maven; - -import java.awt.Image; -import java.beans.PropertyChangeListener; -import java.util.Collections; -import java.util.Iterator; -import org.netbeans.modules.xml.catalog.spi.CatalogDescriptor; -import org.netbeans.modules.xml.catalog.spi.CatalogListener; -import org.netbeans.modules.xml.catalog.spi.CatalogReader; -import org.openide.util.ImageUtilities; -import org.openide.util.NbBundle; -import org.openide.util.lookup.ServiceProvider; - -/** - * Makes it possible to get completion on Jelly tags. - * @see wiki - */ -@ServiceProvider(service=CatalogReader.class, path="Plugins/XML/UserCatalogs") -public class JellyTagSchemaCatalog implements CatalogReader, CatalogDescriptor { - - public String resolveURI(String name) { - name = name.replaceFirst("\\?.+", ""); // for some reason, get e.g. "jelly:define?fetch=false&&sync=true" here - if (name.equals("jelly:stapler")) { // NOI18N - return "https://stapler.dev.java.net/taglib.xsd"; // NOI18N - } else if (name.startsWith("jelly:")) { // NOI18N - return "jar:https://maven-jellydoc-plugin.dev.java.net/jelly-schemas.zip!/schemas/" + name.substring(6) + ".xsd"; // NOI18N - } else { - return null; - } - } - - public String getDisplayName() { - return NbBundle.getMessage(JellyTagSchemaCatalog.class, "JellyTagSchemaCatalog.displayName"); - } - - public String getShortDescription() { - return NbBundle.getMessage(JellyTagSchemaCatalog.class, "JellyTagSchemaCatalog.shortDescription"); - } - - public Image getIcon(int type) { - return ImageUtilities.loadImage("org/netbeans/modules/xml/catalog/resources/catalog-root.gif", true); - } - - public Iterator getPublicIDs() { - return Collections.EMPTY_SET.iterator(); - } - - public void refresh() {} - - public String getSystemID(String publicId) { - return null; - } - - public String resolvePublic(String publicId) { - return null; - } - - public void addCatalogListener(CatalogListener l) {} - - public void removeCatalogListener(CatalogListener l) {} - - public void addPropertyChangeListener(PropertyChangeListener l) {} - - public void removePropertyChangeListener(PropertyChangeListener l) {} - -} diff --git a/hudson.maven/src/org/netbeans/modules/hudson/maven/JellyTagSchemaCatalogBeanInfo.java b/hudson.maven/src/org/netbeans/modules/hudson/maven/JellyTagSchemaCatalogBeanInfo.java deleted file mode 100644 --- a/hudson.maven/src/org/netbeans/modules/hudson/maven/JellyTagSchemaCatalogBeanInfo.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2010 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2009 Sun Microsystems, Inc. - */ - -package org.netbeans.modules.hudson.maven; - -import java.beans.PropertyDescriptor; -import java.beans.SimpleBeanInfo; - -public class JellyTagSchemaCatalogBeanInfo extends SimpleBeanInfo { - - public @Override PropertyDescriptor[] getPropertyDescriptors() { - return new PropertyDescriptor[0]; - } - -} diff --git a/hudson.maven/src/org/netbeans/modules/hudson/maven/JettyOutputProcessorFactory.java b/hudson.maven/src/org/netbeans/modules/hudson/maven/JettyOutputProcessorFactory.java deleted file mode 100644 --- a/hudson.maven/src/org/netbeans/modules/hudson/maven/JettyOutputProcessorFactory.java +++ /dev/null @@ -1,96 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2010 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2009 Sun Microsystems, Inc. - */ - -package org.netbeans.modules.hudson.maven; - -import java.net.MalformedURLException; -import java.net.URL; -import java.util.Collections; -import java.util.Set; -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import org.netbeans.api.project.Project; -import org.netbeans.modules.maven.api.output.OutputProcessor; -import org.netbeans.modules.maven.api.output.OutputProcessorFactory; -import org.netbeans.modules.maven.api.output.OutputVisitor; -import org.openide.awt.HtmlBrowser.URLDisplayer; -import org.openide.util.Exceptions; -import org.openide.util.lookup.ServiceProvider; - -/** - * Browses a Jetty server that has been started. - */ -@ServiceProvider(service=OutputProcessorFactory.class) -public class JettyOutputProcessorFactory implements OutputProcessorFactory { - - public Set createProcessorsSet(Project project) { - return Collections.singleton(new JettyOutputProcessor()); - } - - private static final class JettyOutputProcessor implements OutputProcessor { - - public String[] getRegisteredOutputSequences() { - return new String[] {"mojo-execute#jetty:run", "mojo-execute#hpi:run"}; // NOI18N - } - - private static final Pattern LINE = Pattern.compile(".*Started SelectChannelConnector @ 0[.]0[.]0[.]0:(\\d+)"); // NOI18N - - public void processLine(String line, OutputVisitor visitor) { - Matcher m = LINE.matcher(line); - if (m.matches()) { - try { - URLDisplayer.getDefault().showURL(new URL("http://localhost:" + m.group(1) + "/")); - } catch (MalformedURLException ex) { - Exceptions.printStackTrace(ex); - } - } - } - - public void sequenceStart(String sequenceId, OutputVisitor visitor) {} - - public void sequenceEnd(String sequenceId, OutputVisitor visitor) {} - - public void sequenceFail(String sequenceId, OutputVisitor visitor) {} - - } - -} diff --git a/hudson.maven/src/org/netbeans/modules/hudson/maven/action-mappings.xml b/hudson.maven/src/org/netbeans/modules/hudson/maven/action-mappings.xml deleted file mode 100644 --- a/hudson.maven/src/org/netbeans/modules/hudson/maven/action-mappings.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - run - - hpi - - - hpi:run - - - - debug - - hpi - - - hpi:run - - - maven - - -