Skip to content

Commit 83a305f

Browse files
author
Nicholas Mathison
committed
Folder restructure and build.xml changes
- Standard Folder structure - Build.xml updated to match - Removed AmazonEC2Helper - Removed groovy-plugin-utils as it was not being used
1 parent f1ee45b commit 83a305f

16 files changed

Lines changed: 460 additions & 333 deletions

File tree

‎README.md‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,28 +8,31 @@ This plugin is protected under the [Eclipse Public 1.0 License](http://www.eclip
88
### Compatibility
99
The IBM UrbanCode Deploy automation plug-in installs and configures the latest version of Node.js.
1010
This plug-in requires version 6.1.1 or later of IBM UrbanCode Deploy.
11-
11+
1212
### Installation
1313
The packaged zip is located in the releases folder. No special steps are required for installation.
14-
See Installing plug-ins in UrbanCode Deploy. Download this zip file if you wish to skip the
15-
manual build step. Otherwise, download the entire Node.js-UCD and
14+
See Installing plug-ins in UrbanCode Deploy. Download this zip file if you wish to skip the
15+
manual build step. Otherwise, download the entire Node.js-UCD and
1616
run the "ant" command in the top level folder. This should compile the code and create
1717
a new distributable zip within the releases folder. Use this command if you wish to make
1818
your own changes to the plugin.
1919

2020
### History
21+
Version 4
22+
Adding Configure npm step.
23+
Added version option to Install Module step.
2124
Version 3
2225
Community GitHub Release
23-
26+
2427
### How to build the plugin from eclipse client:
2528

2629
1. Expand the Groovy project that you checked-out from example template.
2730
2. Open build.xml file and execute it as an Ant Build operation (Run As -> Ant Build)
28-
3. The built plugin is located at releases/Node.js-UCD-vdev.zip
31+
3. The built plugin is located at releases/Node.js-UCD-vdev.zip
2932

3033
### How to build the plugin from command line:
3134

3235
1. Navigate to the base folder of the project through command line.
3336
2. Make sure that there is build.xml file there, and then execute 'ant' command.
34-
3. The built plugin is located at releases/Node.js-UCD-vdev.zip
37+
3. The built plugin is located at releases/Node.js-UCD-vdev.zip
3538
Note: Edit the Build.xml to change the version 'dev' to a release number.

‎build.xml‎

Lines changed: 241 additions & 104 deletions
Large diffs are not rendered by default.

‎ivy.xml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<ivy-module version="2.0">
2+
<!--
3+
© Copyright IBM Corporation 2014, 2016.
4+
This is licensed under the following license.
5+
The Eclipse Public 1.0 License (http://www.eclipse.org/legal/epl-v10.html)
6+
U.S. Government Users Restricted Rights: Use, duplication or disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
7+
-->
8+
<info organisation="com.ibm.urbancode" module="dependencies"/>
9+
<configurations>
10+
<conf name="default" description="Jars used during runtime"/>
11+
<conf name="build" description="Jars used during build"/>
12+
<conf name="test" description="Jars used during testing"/>
13+
</configurations>
14+
<dependencies>
15+
<!-- Runtime Dependencies -->
16+
17+
<!-- Test Dependencies -->
18+
<!-- http://search.maven.org/#artifactdetails%7Cjunit%7Cjunit%7C4.11%7Cjar -->
19+
<dependency org="junit" name="junit" rev="4.11" transitive="false" conf="test->default"/>
20+
<!-- http://search.maven.org/#artifactdetails%7Corg.hamcrest%7Chamcrest-core%7C1.3%7Cjar -->
21+
<dependency org="org.hamcrest" name="hamcrest-core" rev="1.3" transitive="false" conf="test->default"/>
22+
<!-- https://mvnrepository.com/artifact/org.codehaus.groovy/groovy-all -->
23+
<dependency org="org.codehaus.groovy" name="groovy-all" rev="1.8.8" transitive="false" conf="build->default"/>
24+
</dependencies>
25+
</ivy-module>

‎plugin/info.xml‎

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<!--
3-
4-
/**
5-
* © Copyright IBM Corporation 2014.
6-
* This is licensed under the following license.
7-
* The Eclipse Public 1.0 License (http://www.eclipse.org/legal/epl-v10.html)
8-
* U.S. Government Users Restricted Rights: Use, duplication or disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
9-
*/
10-
3+
© Copyright IBM Corporation 2014, 2016.
4+
This is licensed under the following license.
5+
The Eclipse Public 1.0 License (http://www.eclipse.org/legal/epl-v10.html)
6+
U.S. Government Users Restricted Rights: Use, duplication or disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
117
-->
8+
129
<pluginInfo>
1310
<!--
1411
@@ -116,7 +113,7 @@
116113
</meta-html>
117114

118115
<!-- Do not change the release-version, the build process injects it. -->
119-
<release-version>4</release-version>
116+
<release-version>4.0</release-version>
120117

121118

122119
<release-notes>
@@ -144,14 +141,14 @@
144141
you should just append to the existing 'LATEST' tag.
145142
-->
146143

147-
<release-note plugin-version="2">
148-
Initial release of the Nodejs plugin which provides steps for installing Nodejs (and npm) and install Node Modules.
149-
</release-note>
150-
<release-note plugin-version="3">
151-
Initial GitHub Release
152-
</release-note>
153-
<release-note plugin-version="4">
154-
Adding node configuration task, added version option to node module installation.
155-
</release-note>
156-
</release-notes>
144+
<release-note plugin-version="2">
145+
Initial release of the Nodejs plugin which provides steps for installing Nodejs (and npm) and install Node Modules.
146+
</release-note>
147+
<release-note plugin-version="3">
148+
Initial GitHub Release
149+
</release-note>
150+
<release-note plugin-version="4">
151+
Adding node configuration task, added version option to node module installation.
152+
</release-note>
153+
</release-notes>
157154
</pluginInfo>

‎plugin/plugin.xml‎

Lines changed: 31 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
4-
/**
5-
* © Copyright IBM Corporation 2014.
6-
* This is licensed under the following license.
7-
* The Eclipse Public 1.0 License (http://www.eclipse.org/legal/epl-v10.html)
8-
* U.S. Government Users Restricted Rights: Use, duplication or disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
9-
*/
10-
3+
© Copyright IBM Corporation 2014, 2016.
4+
This is licensed under the following license.
5+
The Eclipse Public 1.0 License (http://www.eclipse.org/legal/epl-v10.html)
6+
U.S. Government Users Restricted Rights: Use, duplication or disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
117
-->
128
<plugin xmlns='http://www.urbancode.com/PluginXMLSchema_v1' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
139
<header>
@@ -20,16 +16,17 @@
2016
<properties>
2117
</properties>
2218
<post-processing><![CDATA[
23-
if (properties.get("exitCode") != 0) {
24-
properties.put(new java.lang.String("Status"), new java.lang.String("Failure"));
25-
}
26-
else {
27-
properties.put("Status", "Success");
28-
}
29-
]]></post-processing>
19+
if (properties.get("exitCode") != 0) {
20+
properties.put(new java.lang.String("Status"), new java.lang.String("Failure"));
21+
}
22+
else {
23+
properties.put("Status", "Success");
24+
}
25+
]]>
26+
</post-processing>
3027
<command program='${GROOVY_HOME}/bin/groovy'>
3128
<arg value='-cp' />
32-
<arg path='classes:lib/groovy-plugin-utils-1.0.jar' />
29+
<arg path='classes' />
3330
<arg file='install.groovy' />
3431
<arg file='${PLUGIN_INPUT_PROPS}' />
3532
<arg file='${PLUGIN_OUTPUT_PROPS}' />
@@ -49,16 +46,17 @@
4946
</property>
5047
</properties>
5148
<post-processing><![CDATA[
52-
if (properties.get("exitCode") != 0) {
53-
properties.put(new java.lang.String("Status"), new java.lang.String("Failure"));
54-
}
55-
else {
56-
properties.put("Status", "Success");
57-
}
58-
]]></post-processing>
49+
if (properties.get("exitCode") != 0) {
50+
properties.put(new java.lang.String("Status"), new java.lang.String("Failure"));
51+
}
52+
else {
53+
properties.put("Status", "Success");
54+
}
55+
]]>
56+
</post-processing>
5957
<command program='${GROOVY_HOME}/bin/groovy'>
6058
<arg value='-cp' />
61-
<arg path='classes:lib/groovy-plugin-utils-1.0.jar' />
59+
<arg path='classes' />
6260
<arg file='install_module.groovy' />
6361
<arg file='${PLUGIN_INPUT_PROPS}' />
6462
<arg file='${PLUGIN_OUTPUT_PROPS}' />
@@ -78,16 +76,17 @@
7876
</property>
7977
</properties>
8078
<post-processing><![CDATA[
81-
if (properties.get("exitCode") != 0) {
82-
properties.put(new java.lang.String("Status"), new java.lang.String("Failure"));
83-
}
84-
else {
85-
properties.put("Status", "Success");
86-
}
87-
]]></post-processing>
79+
if (properties.get("exitCode") != 0) {
80+
properties.put(new java.lang.String("Status"), new java.lang.String("Failure"));
81+
}
82+
else {
83+
properties.put("Status", "Success");
84+
}
85+
]]>
86+
</post-processing>
8887
<command program='${GROOVY_HOME}/bin/groovy'>
8988
<arg value='-cp' />
90-
<arg path='classes:lib/groovy-plugin-utils-1.0.jar' />
89+
<arg path='classes' />
9190
<arg file='configure-node.groovy' />
9291
<arg file='${PLUGIN_INPUT_PROPS}' />
9392
<arg file='${PLUGIN_OUTPUT_PROPS}' />

‎plugin/upgrade.xml‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,23 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
4-
/**
5-
* © Copyright IBM Corporation 2014.
6-
* This is licensed under the following license.
7-
* The Eclipse Public 1.0 License (http://www.eclipse.org/legal/epl-v10.html)
8-
* U.S. Government Users Restricted Rights: Use, duplication or disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
9-
*/
10-
3+
© Copyright IBM Corporation 2014, 2016.
4+
This is licensed under the following license.
5+
The Eclipse Public 1.0 License (http://www.eclipse.org/legal/epl-v10.html)
6+
U.S. Government Users Restricted Rights: Use, duplication or disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
117
-->
128
<plugin-upgrade
139
xmlns="http://www.urbancode.com/UpgradeXMLSchema_v1"
1410
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
11+
12+
<migrate to-version="2">
13+
</migrate>
14+
<migrate to-version="3">
15+
</migrate>
16+
<migrate to-version="4">
17+
<migrate-command name="Install Module">
18+
<migrate-properties>
19+
<migrate-property name="moduleVersion"/>
20+
</migrate-properties>
21+
</migrate-command>
22+
</migrate>
1523
</plugin-upgrade>

‎src/classes/com/urbancode/air/plugin/amazonec2/AmazonEC2Helper.groovy‎

Lines changed: 0 additions & 134 deletions
This file was deleted.

‎src/main/groovy/.gitignore‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# ignore all dotfiles by except git specific ones
2+
.*
3+
!.gitignore
4+
!.git*
5+
6+
# ignore all temporary files and ahp specific files
7+
*.bak
8+
*.bom
9+
*.swp
10+
*~
11+
12+
# ignore compilation related directories in the root of the project
13+
/releases
14+
/build
15+
/lib

0 commit comments

Comments
 (0)