Merge pull request jenkinsci#60 from scaytrase/feature/enhanced-project-keys

Enhanced project keys

Author: gruetter

src/main/java/org/jenkinsci/plugins/stashNotifier/StashNotifier.java

@@ -19,12 +19,18 @@
    <f:entry title="Commit SHA-1" field="commitSha1">
     <f:textbox />
   </f:entry>
-   <f:entry title="Ignore unverified SSL certificates" 
+   <f:entry title="Ignore unverified SSL certificates"
    		field="ignoreUnverifiedSSLPeer">
     <f:checkbox />
   </f:entry>
   <f:entry title="Keep repeated builds in Stash" field="includeBuildNumberInKey">
     <f:checkbox />
   </f:entry>
+  <f:entry title="Override project key" field="projectKey">
+    <f:textbox />
+  </f:entry>
+  <f:entry title="Prepend parent project name to key" field="prependParentProjectKey">
+    <f:checkbox />
+  </f:entry>
  </f:advanced>
 </j:jelly>

src/main/resources/org/jenkinsci/plugins/stashNotifier/StashNotifier/config.jelly

@@ -25,5 +25,10 @@
                help="${rootURL}/plugin/stashNotifier/help-globalConfig-includeBuildNumberInKey.html">
           <f:checkbox />
       </f:entry>
+      <f:entry title="Prepend parent project name to key"
+               field="prependParentProjectKey"
+               help="${rootURL}/plugin/stashNotifier/help-globalConfig-prependParentProjectKey.html">
+          <f:checkbox />
+      </f:entry>
   </f:section>
 </j:jelly>

src/main/resources/org/jenkinsci/plugins/stashNotifier/StashNotifier/global.jelly

@@ -0,0 +1,3 @@
+<div>
+  Whether to prepend parent project while forming notify key
+</div>

src/main/resources/org/jenkinsci/plugins/stashNotifier/StashNotifier/help-prependParentProjectKey.html

@@ -0,0 +1,3 @@
+<div>
+  If not empty, this key will be used instead of automatically configured project key
+</div>

src/main/resources/org/jenkinsci/plugins/stashNotifier/StashNotifier/help-projectKey.html

@@ -0,0 +1,6 @@
+<div>
+  <p>
+    Check this if you want to prepend parent project when forming project key while notifying stash. This is made for
+      compatability with older version and unchecked by default. This is useful for subproject with the same name (like modules)
+  </p>
+</div>

src/main/webapp/help-globalConfig-prependParentProjectKey.html

@@ -0,0 +1,5 @@
+<div>
+  <p>
+      Override project key for all notifies
+  </p>
+</div>

src/main/webapp/help-globalConfig-projectKey.html

@@ -42,7 +42,9 @@ public StashNotifier buildStashNotifier() {
 			"tiger",
 			true,
 			null,
-			true
+			true,
+			null,
+			false
 		);
 	}