1.1 --- a/remoting/server/hudson/src/main/java/org/netbeans/modules/jackpot30/hudson/InstallIndexingTool.java Sun Jan 08 20:11:02 2017 +0100
1.2 +++ b/remoting/server/hudson/src/main/java/org/netbeans/modules/jackpot30/hudson/InstallIndexingTool.java Sun Jan 08 20:11:20 2017 +0100
1.3 @@ -49,7 +49,9 @@
1.4 import hudson.tools.InstallSourceProperty;
1.5 import hudson.tools.ToolInstallation;
1.6 import hudson.tools.ToolProperty;
1.7 +import java.io.ByteArrayInputStream;
1.8 import java.io.IOException;
1.9 +import java.io.InputStream;
1.10 import java.util.Arrays;
1.11 import org.kohsuke.stapler.DataBoundConstructor;
1.12
1.13 @@ -84,12 +86,21 @@
1.14
1.15 }
1.16
1.17 + private static final String INSTALLER_DESCRIPTION =
1.18 + "{\"list\": [{\"id\": \"main\", \"name\": \"main\", \"url\": \"http://deadlock.netbeans.org/hudson/job/jackpot30/lastSuccessfulBuild/artifact/remoting/build/indexing-backend.zip\"}]}";
1.19 +
1.20 //XXX:
1.21 @Initializer(after=InitMilestone.JOB_LOADED)
1.22 public static void prepareUpdates() throws IOException, InterruptedException {
1.23 FilePath update = new FilePath(new FilePath(Hudson.getInstance().getRootPath(), "updates"), "org.netbeans.modules.jackpot30.hudson.InstallIndexingTool");
1.24
1.25 - update.copyFrom(InstallIndexingTool.class.getResource("org.netbeans.modules.jackpot30.hudson.InstallIndexingTool"));
1.26 + InputStream in = new ByteArrayInputStream(INSTALLER_DESCRIPTION.getBytes());
1.27 +
1.28 + try {
1.29 + update.copyFrom(in);
1.30 + } finally {
1.31 + in.close();
1.32 + }
1.33
1.34 //preinstall main tool if it does not exist:
1.35 IndexingTool[] tools = Hudson.getInstance().getDescriptorByType(IndexingTool.DescriptorImpl.class).getInstallations();
2.1 --- a/remoting/server/hudson/src/main/resources/index.jelly Sun Jan 08 20:11:02 2017 +0100
2.2 +++ b/remoting/server/hudson/src/main/resources/index.jelly Sun Jan 08 20:11:20 2017 +0100
2.3 @@ -1,7 +1,45 @@
2.4 <!--
2.5 - This view is used to render the plugin list page.
2.6 +DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2.7
2.8 - Since we don't really have anything dynamic here, let's just use static HTML.
2.9 +Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved.
2.10 +
2.11 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2.12 +Other names may be trademarks of their respective owners.
2.13 +
2.14 +The contents of this file are subject to the terms of either the GNU
2.15 +General Public License Version 2 only ("GPL") or the Common
2.16 +Development and Distribution License("CDDL") (collectively, the
2.17 +"License"). You may not use this file except in compliance with the
2.18 +License. You can obtain a copy of the License at
2.19 +http://www.netbeans.org/cddl-gplv2.html
2.20 +or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
2.21 +specific language governing permissions and limitations under the
2.22 +License. When distributing the software, include this License Header
2.23 +Notice in each file and include the License file at
2.24 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2.25 +particular file as subject to the "Classpath" exception as provided
2.26 +by Oracle in the GPL Version 2 section of the License file that
2.27 +accompanied this code. If applicable, add the following below the
2.28 +License Header, with the fields enclosed by brackets [] replaced by
2.29 +your own identifying information:
2.30 +"Portions Copyrighted [year] [name of copyright owner]"
2.31 +
2.32 +Contributor(s):
2.33 +
2.34 +The Original Software is NetBeans. The Initial Developer of the Original
2.35 +Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun
2.36 +Microsystems, Inc. All Rights Reserved.
2.37 +
2.38 +If you wish your version of this file to be governed by only the CDDL
2.39 +or only the GPL Version 2, indicate your decision by adding
2.40 +"[Contributor] elects to include this software in this distribution
2.41 +under the [CDDL or GPL Version 2] license." If you do not indicate a
2.42 +single choice of license, a recipient has the option to distribute
2.43 +your version of this file under either the CDDL, the GPL Version 2 or
2.44 +to extend the choice of license to its licensees as provided above.
2.45 +However, if you add GPL Version 2 code and therefore, elected the GPL
2.46 +Version 2 license, then the option applies only if the new code is
2.47 +made subject to such option by the copyright holder.
2.48 -->
2.49 <div>
2.50 Jackpot 3.0 Hudson plugin.
3.1 --- a/remoting/server/hudson/src/main/resources/org/netbeans/modules/jackpot30/hudson/BuildWrapperImpl/config.jelly Sun Jan 08 20:11:02 2017 +0100
3.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
3.3 @@ -1,79 +0,0 @@
3.4 -<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
3.5 - <!--
3.6 - This jelly script is used for per-project configuration.
3.7 -
3.8 - See global.jelly for a general discussion about jelly script.
3.9 - -->
3.10 -
3.11 - <!--
3.12 - Creates a text field that shows the value of the "name" property.
3.13 - When submitted, it will be passed to the corresponding constructor parameter.
3.14 - -->
3.15 -
3.16 -<!-- <j:forEach var="category" items="${descriptor.getCategories()}" varStatus="loop">
3.17 - <f:block>
3.18 - <table>
3.19 - <f:optionalBlock title="${category}">
3.20 - <j:forEach var="hint" items="${descriptor.getHintsInCategory(category)}" varStatus="loop">
3.21 - <f:entry description="${descriptor.getHintDescription(hint)}">
3.22 - <f:checkbox name="${hint}" checked="${instance.isHintEnabled(hint)}"/>
3.23 - <label class="attach-previous">${descriptor.getHintDisplayName(hint)}</label>
3.24 - </f:entry>
3.25 - </j:forEach>
3.26 - </f:optionalBlock>
3.27 - </table>
3.28 - </f:block>
3.29 - </j:forEach>-->
3.30 -
3.31 - <f:block>
3.32 - <table>
3.33 - <f:optionalBlock name="classpathBasedHintsEnabled" title="Run hints found on classpath" checked="${instance != null ? instance.isClasspathBasedHintsEnabled() : true}">
3.34 - <f:entry>
3.35 - <f:checkbox field="classpathBasedHintFixesEnabled" checked="${instance != null ? instance.isClasspathBasedHintFixesEnabled() : false}"/>
3.36 - <label class="attach-previous">Apply the primary fix</label>
3.37 - </f:entry>
3.38 - </f:optionalBlock>
3.39 - </table>
3.40 - </f:block>
3.41 -
3.42 - <f:block>
3.43 - <table>
3.44 - <f:optionalBlock name="hardcodedHintsEnabled" title="Run NetBeans hints" checked="${instance != null ? instance.isHardcodedHintsEnabled() : true}">
3.45 - <j:forEach var="category" items="${descriptor.getCategories()}" varStatus="loop">
3.46 - <f:section title="${descriptor.getCategoryDisplayName(category)}">
3.47 - <j:forEach var="hint" items="${descriptor.getHintsInCategory(category)}" varStatus="loop">
3.48 - <f:entry>
3.49 - <table>
3.50 - <f:optionalBlock name="${hint}" title="${descriptor.getHintDisplayName(hint)}" tooltip="${descriptor.getHintDescription(hint)}" checked="${instance != null ? instance.isHintEnabled(hint) : descriptor.isHintEnabledByDefault(hint)}">
3.51 -<!-- <f:checkbox name="${hint}" checked="${instance != null ? instance.isHintEnabled(hint) : descriptor.isHintEnabledByDefault(hint)}"/>
3.52 - <label class="attach-previous" tooltip="${descriptor.getHintDescription(hint)}">${descriptor.getHintDisplayName(hint)}</label>-->
3.53 -<!-- <f:nested>-->
3.54 - <f:entry>
3.55 - <f:checkbox name="${hint}.apply" checked="${instance != null ? instance.isHintApplyEnabled(hint) : descriptor.isHintApplyEnabledByDefault(hint)}"/>
3.56 - <label class="attach-previous">Apply the primary fix.</label>
3.57 - </f:entry>
3.58 -<!-- </f:nested>-->
3.59 - </f:optionalBlock>
3.60 - </table>
3.61 - </f:entry>
3.62 - </j:forEach>
3.63 - </f:section>
3.64 - </j:forEach>
3.65 - </f:optionalBlock>
3.66 - </table>
3.67 - </f:block>
3.68 -
3.69 - <f:block>
3.70 - <table>
3.71 - <f:checkbox name="indexingEnabled" checked="${instance != null ? instance.isIndexingEnabled() : true}"/>
3.72 - <label class="attach-previous">Run Indexing</label>
3.73 - </table>
3.74 - </f:block>
3.75 -<!-- <j:forEach var="d" items="${descriptor.getHints()}" varStatus="loop">
3.76 - <f:entry description="${descriptor.getHintDescription(d)}">
3.77 - <f:checkbox name="${d}" checked="${instance.isHintEnabled(d)}"/>
3.78 - <label class="attach-previous">${descriptor.getHintDisplayName(d)}</label>
3.79 - </f:entry>
3.80 - </j:forEach>-->
3.81 -
3.82 -</j:jelly>
4.1 --- a/remoting/server/hudson/src/main/resources/org/netbeans/modules/jackpot30/hudson/BuildWrapperImpl/help-hardcodedHintsEnabled.html Sun Jan 08 20:11:02 2017 +0100
4.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
4.3 @@ -1,46 +0,0 @@
4.4 -<!--
4.5 -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
4.6 -
4.7 -Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved.
4.8 -
4.9 -Oracle and Java are registered trademarks of Oracle and/or its affiliates.
4.10 -Other names may be trademarks of their respective owners.
4.11 -
4.12 -The contents of this file are subject to the terms of either the GNU
4.13 -General Public License Version 2 only ("GPL") or the Common
4.14 -Development and Distribution License("CDDL") (collectively, the
4.15 -"License"). You may not use this file except in compliance with the
4.16 -License. You can obtain a copy of the License at
4.17 -http://www.netbeans.org/cddl-gplv2.html
4.18 -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
4.19 -specific language governing permissions and limitations under the
4.20 -License. When distributing the software, include this License Header
4.21 -Notice in each file and include the License file at
4.22 -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
4.23 -particular file as subject to the "Classpath" exception as provided
4.24 -by Oracle in the GPL Version 2 section of the License file that
4.25 -accompanied this code. If applicable, add the following below the
4.26 -License Header, with the fields enclosed by brackets [] replaced by
4.27 -your own identifying information:
4.28 -"Portions Copyrighted [year] [name of copyright owner]"
4.29 -
4.30 -Contributor(s):
4.31 -
4.32 -The Original Software is NetBeans. The Initial Developer of the Original
4.33 -Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun
4.34 -Microsystems, Inc. All Rights Reserved.
4.35 -
4.36 -If you wish your version of this file to be governed by only the CDDL
4.37 -or only the GPL Version 2, indicate your decision by adding
4.38 -"[Contributor] elects to include this software in this distribution
4.39 -under the [CDDL or GPL Version 2] license." If you do not indicate a
4.40 -single choice of license, a recipient has the option to distribute
4.41 -your version of this file under either the CDDL, the GPL Version 2 or
4.42 -to extend the choice of license to its licensees as provided above.
4.43 -However, if you add GPL Version 2 code and therefore, elected the GPL
4.44 -Version 2 license, then the option applies only if the new code is
4.45 -made subject to such option by the copyright holder.
4.46 --->
4.47 -<div>
4.48 - Whether the standard NetBeans hints should be run during the build.
4.49 -</div>
4.50 \ No newline at end of file
5.1 --- a/remoting/server/hudson/src/main/resources/org/netbeans/modules/jackpot30/hudson/IndexingBuilder/config.jelly Sun Jan 08 20:11:02 2017 +0100
5.2 +++ b/remoting/server/hudson/src/main/resources/org/netbeans/modules/jackpot30/hudson/IndexingBuilder/config.jelly Sun Jan 08 20:11:20 2017 +0100
5.3 @@ -1,3 +1,47 @@
5.4 +<!--
5.5 +DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
5.6 +
5.7 +Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved.
5.8 +
5.9 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
5.10 +Other names may be trademarks of their respective owners.
5.11 +
5.12 +The contents of this file are subject to the terms of either the GNU
5.13 +General Public License Version 2 only ("GPL") or the Common
5.14 +Development and Distribution License("CDDL") (collectively, the
5.15 +"License"). You may not use this file except in compliance with the
5.16 +License. You can obtain a copy of the License at
5.17 +http://www.netbeans.org/cddl-gplv2.html
5.18 +or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
5.19 +specific language governing permissions and limitations under the
5.20 +License. When distributing the software, include this License Header
5.21 +Notice in each file and include the License file at
5.22 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
5.23 +particular file as subject to the "Classpath" exception as provided
5.24 +by Oracle in the GPL Version 2 section of the License file that
5.25 +accompanied this code. If applicable, add the following below the
5.26 +License Header, with the fields enclosed by brackets [] replaced by
5.27 +your own identifying information:
5.28 +"Portions Copyrighted [year] [name of copyright owner]"
5.29 +
5.30 +Contributor(s):
5.31 +
5.32 +The Original Software is NetBeans. The Initial Developer of the Original
5.33 +Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun
5.34 +Microsystems, Inc. All Rights Reserved.
5.35 +
5.36 +If you wish your version of this file to be governed by only the CDDL
5.37 +or only the GPL Version 2, indicate your decision by adding
5.38 +"[Contributor] elects to include this software in this distribution
5.39 +under the [CDDL or GPL Version 2] license." If you do not indicate a
5.40 +single choice of license, a recipient has the option to distribute
5.41 +your version of this file under either the CDDL, the GPL Version 2 or
5.42 +to extend the choice of license to its licensees as provided above.
5.43 +However, if you add GPL Version 2 code and therefore, elected the GPL
5.44 +Version 2 license, then the option applies only if the new code is
5.45 +made subject to such option by the copyright holder.
5.46 +-->
5.47 +
5.48 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
5.49
5.50 <f:entry title="Project Name:" field="projectName">
6.1 --- a/remoting/server/hudson/src/main/resources/org/netbeans/modules/jackpot30/hudson/IndexingBuilder/global.jelly Sun Jan 08 20:11:02 2017 +0100
6.2 +++ b/remoting/server/hudson/src/main/resources/org/netbeans/modules/jackpot30/hudson/IndexingBuilder/global.jelly Sun Jan 08 20:11:20 2017 +0100
6.3 @@ -1,3 +1,47 @@
6.4 +<!--
6.5 +DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
6.6 +
6.7 +Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved.
6.8 +
6.9 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
6.10 +Other names may be trademarks of their respective owners.
6.11 +
6.12 +The contents of this file are subject to the terms of either the GNU
6.13 +General Public License Version 2 only ("GPL") or the Common
6.14 +Development and Distribution License("CDDL") (collectively, the
6.15 +"License"). You may not use this file except in compliance with the
6.16 +License. You can obtain a copy of the License at
6.17 +http://www.netbeans.org/cddl-gplv2.html
6.18 +or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
6.19 +specific language governing permissions and limitations under the
6.20 +License. When distributing the software, include this License Header
6.21 +Notice in each file and include the License file at
6.22 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
6.23 +particular file as subject to the "Classpath" exception as provided
6.24 +by Oracle in the GPL Version 2 section of the License file that
6.25 +accompanied this code. If applicable, add the following below the
6.26 +License Header, with the fields enclosed by brackets [] replaced by
6.27 +your own identifying information:
6.28 +"Portions Copyrighted [year] [name of copyright owner]"
6.29 +
6.30 +Contributor(s):
6.31 +
6.32 +The Original Software is NetBeans. The Initial Developer of the Original
6.33 +Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun
6.34 +Microsystems, Inc. All Rights Reserved.
6.35 +
6.36 +If you wish your version of this file to be governed by only the CDDL
6.37 +or only the GPL Version 2, indicate your decision by adding
6.38 +"[Contributor] elects to include this software in this distribution
6.39 +under the [CDDL or GPL Version 2] license." If you do not indicate a
6.40 +single choice of license, a recipient has the option to distribute
6.41 +your version of this file under either the CDDL, the GPL Version 2 or
6.42 +to extend the choice of license to its licensees as provided above.
6.43 +However, if you add GPL Version 2 code and therefore, elected the GPL
6.44 +Version 2 license, then the option applies only if the new code is
6.45 +made subject to such option by the copyright holder.
6.46 +-->
6.47 +
6.48 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
6.49
6.50 <f:section title="Indexers">
7.1 --- a/remoting/server/hudson/src/main/resources/org/netbeans/modules/jackpot30/hudson/JackpotIndexBuilder/config.jelly Sun Jan 08 20:11:02 2017 +0100
7.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
7.3 @@ -1,3 +0,0 @@
7.4 -<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
7.5 -
7.6 -</j:jelly>
8.1 --- a/remoting/server/hudson/src/main/resources/org/netbeans/modules/jackpot30/hudson/JackpotIndexBuilder/help.html Sun Jan 08 20:11:02 2017 +0100
8.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
8.3 @@ -1,46 +0,0 @@
8.4 -<!--
8.5 -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
8.6 -
8.7 -Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved.
8.8 -
8.9 -Oracle and Java are registered trademarks of Oracle and/or its affiliates.
8.10 -Other names may be trademarks of their respective owners.
8.11 -
8.12 -The contents of this file are subject to the terms of either the GNU
8.13 -General Public License Version 2 only ("GPL") or the Common
8.14 -Development and Distribution License("CDDL") (collectively, the
8.15 -"License"). You may not use this file except in compliance with the
8.16 -License. You can obtain a copy of the License at
8.17 -http://www.netbeans.org/cddl-gplv2.html
8.18 -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
8.19 -specific language governing permissions and limitations under the
8.20 -License. When distributing the software, include this License Header
8.21 -Notice in each file and include the License file at
8.22 -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
8.23 -particular file as subject to the "Classpath" exception as provided
8.24 -by Oracle in the GPL Version 2 section of the License file that
8.25 -accompanied this code. If applicable, add the following below the
8.26 -License Header, with the fields enclosed by brackets [] replaced by
8.27 -your own identifying information:
8.28 -"Portions Copyrighted [year] [name of copyright owner]"
8.29 -
8.30 -Contributor(s):
8.31 -
8.32 -The Original Software is NetBeans. The Initial Developer of the Original
8.33 -Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun
8.34 -Microsystems, Inc. All Rights Reserved.
8.35 -
8.36 -If you wish your version of this file to be governed by only the CDDL
8.37 -or only the GPL Version 2, indicate your decision by adding
8.38 -"[Contributor] elects to include this software in this distribution
8.39 -under the [CDDL or GPL Version 2] license." If you do not indicate a
8.40 -single choice of license, a recipient has the option to distribute
8.41 -your version of this file under either the CDDL, the GPL Version 2 or
8.42 -to extend the choice of license to its licensees as provided above.
8.43 -However, if you add GPL Version 2 code and therefore, elected the GPL
8.44 -Version 2 license, then the option applies only if the new code is
8.45 -made subject to such option by the copyright holder.
8.46 --->
8.47 -<div>
8.48 - Run Jackpot 3.0 indexer.
8.49 -</div>
8.50 \ No newline at end of file
9.1 --- a/remoting/server/hudson/src/main/resources/org/netbeans/modules/jackpot30/hudson/org.netbeans.modules.jackpot30.hudson.InstallIndexingTool Sun Jan 08 20:11:02 2017 +0100
9.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
9.3 @@ -1,1 +0,0 @@
9.4 -{"list": [{"id": "main", "name": "main", "url": "http://deadlock.netbeans.org/hudson/job/jackpot30/lastSuccessfulBuild/artifact/remoting/build/indexing-backend.zip"}]}
9.5 \ No newline at end of file