[FIXED HUDSON-7211] fix Hudson build on case-insensitive filesystems.

hudson/model/label/*.class conflicted with hudson/model/Label/*.jelly,
so renamed new package to hudson.model.labels


git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33875 71c3de6d-444a-0410-be80-ed276b4c234a

core/src/main/grammar/labelExpr.g

@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 header {
-  package hudson.model.label;
+  package hudson.model.labels;
   import hudson.model.Label;
 }
 

core/src/main/java/hudson/model/Hudson.java

@@ -67,7 +67,7 @@ import hudson.lifecycle.Lifecycle;
 import hudson.logging.LogRecorderManager;
 import hudson.lifecycle.RestartNotSupportedException;
 import hudson.model.Descriptor.FormException;
-import hudson.model.label.LabelAtom;
+import hudson.model.labels.LabelAtom;
 import hudson.model.listeners.ItemListener;
 import hudson.model.listeners.SCMListener;
 import hudson.model.listeners.SaveableListener;

core/src/main/java/hudson/model/Label.java

 /*
  * The MIT License
  * 
- * Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Tom Huybrechts
+ * Copyright (c) 2004-2010, Sun Microsystems, Inc., Kohsuke Kawaguchi, Tom Huybrechts
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -27,11 +27,11 @@ import antlr.ANTLRException;
 import hudson.Util;
 import static hudson.Util.fixNull;
 
-import hudson.model.label.LabelAtom;
-import hudson.model.label.LabelExpression;
-import hudson.model.label.LabelExpressionLexer;
-import hudson.model.label.LabelExpressionParser;
-import hudson.model.label.LabelOperatorPrecedence;
+import hudson.model.labels.LabelAtom;
+import hudson.model.labels.LabelExpression;
+import hudson.model.labels.LabelExpressionLexer;
+import hudson.model.labels.LabelExpressionParser;
+import hudson.model.labels.LabelOperatorPrecedence;
 import hudson.slaves.NodeProvisioner;
 import hudson.slaves.Cloud;
 import hudson.util.VariableResolver;

core/src/main/java/hudson/model/LabelFinder.java

 /*
  * The MIT License
  * 
- * Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Stephen Connolly
+ * Copyright (c) 2004-2010, Sun Microsystems, Inc., Kohsuke Kawaguchi, Stephen Connolly
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -26,7 +26,7 @@ package hudson.model;
 import hudson.Extension;
 import hudson.ExtensionList;
 import hudson.ExtensionPoint;
-import hudson.model.label.LabelAtom;
+import hudson.model.labels.LabelAtom;
 
 import java.util.Collection;
 

core/src/main/java/hudson/model/Node.java

 /*
  * The MIT License
  * 
- * Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Seiji Sogabe, Stephen Connolly
+ * Copyright (c) 2004-2010, Sun Microsystems, Inc., Kohsuke Kawaguchi,
+ * Seiji Sogabe, Stephen Connolly
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -29,7 +30,7 @@ import hudson.FilePath;
 import hudson.FileSystemProvisioner;
 import hudson.Launcher;
 import hudson.model.Queue.Task;
-import hudson.model.label.LabelAtom;
+import hudson.model.labels.LabelAtom;
 import hudson.model.queue.CauseOfBlockage;
 import hudson.node_monitors.NodeMonitor;
 import hudson.remoting.VirtualChannel;

core/src/main/java/hudson/model/label/LabelAtom.java → core/src/main/java/hudson/model/labels/LabelAtom.java

@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package hudson.model.label;
+package hudson.model.labels;
 
 import hudson.BulkChange;
 import hudson.CopyOnWrite;

core/src/main/java/hudson/model/label/LabelAtomProperty.java → core/src/main/java/hudson/model/labels/LabelAtomProperty.java

@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package hudson.model.label;
+package hudson.model.labels;
 
 import hudson.DescriptorExtensionList;
 import hudson.ExtensionPoint;

core/src/main/java/hudson/model/label/LabelAtomPropertyDescriptor.java → core/src/main/java/hudson/model/labels/LabelAtomPropertyDescriptor.java

@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package hudson.model.label;
+package hudson.model.labels;
 
 import hudson.Extension;
 import hudson.model.Descriptor;

core/src/main/java/hudson/model/label/LabelExpression.java → core/src/main/java/hudson/model/labels/LabelExpression.java

@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package hudson.model.label;
+package hudson.model.labels;
 
 import hudson.model.Label;
 import hudson.util.VariableResolver;

core/src/main/java/hudson/model/label/LabelOperatorPrecedence.java → core/src/main/java/hudson/model/labels/LabelOperatorPrecedence.java

@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package hudson.model.label;
+package hudson.model.labels;
 
 /**
  * Precedence of the top most operator.

core/src/main/java/hudson/model/label/package-info.java → core/src/main/java/hudson/model/labels/package-info.java

 /**
  * Boolean expression over labels.
  */
-package hudson.model.label;
+package hudson.model.labels;

test/src/test/java/hudson/model/label/LabelAtomPropertyTest.java → test/src/test/java/hudson/model/labels/LabelAtomPropertyTest.java

@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package hudson.model.label;
+package hudson.model.labels;
 
 import org.jvnet.hudson.test.HudsonTestCase;
 import org.jvnet.hudson.test.TestExtension;

test/src/test/java/hudson/model/label/LabelExpressionTest.java → test/src/test/java/hudson/model/labels/LabelExpressionTest.java

@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package hudson.model.label;
+package hudson.model.labels;
 
 import antlr.ANTLRException;
 import hudson.Launcher;

test/src/test/java/hudson/tasks/EnvVarsInConfigTasksTest.java

 package hudson.tasks;
 
 import hudson.EnvVars;
-import hudson.model.label.LabelAtom;
+import hudson.model.labels.LabelAtom;
 import hudson.tools.ToolProperty;
 import hudson.maven.MavenModuleSet;
 import hudson.maven.MavenModuleSetBuild;

test/src/test/java/hudson/tools/ToolLocationNodePropertyTest.java

 /*
  * The MIT License
  *
- * Copyright (c) 2004-2009, Sun Microsystems, Inc., Tom Huybrechts
+ * Copyright (c) 2004-2010, Sun Microsystems, Inc., Tom Huybrechts
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -26,7 +26,7 @@ package hudson.tools;
 
 import hudson.Functions;
 import hudson.model.*;
-import hudson.model.label.LabelAtom;
+import hudson.model.labels.LabelAtom;
 import hudson.slaves.DumbSlave;
 import hudson.tasks.Maven;
 import hudson.tasks.BatchFile;
@@ -187,4 +187,4 @@ public class ToolLocationNodePropertyTest extends HudsonTestCase {
         project = createFreeStyleProject();
         project.setAssignedLabel(slave.getSelfLabel());
     }
-}
\ No newline at end of file
+}