From 0b983546382b25546e15acaf5e30bde7fd207f84 Mon Sep 17 00:00:00 2001
From: Jean-Louis Boudart <jeanlouis.boudart@gmail.com>
Date: Sat, 21 Jul 2012 14:21:03 +0200
Subject: [PATCH 1/4] Add easyant files support to syntax highlighting .ant and
 .ivy files are both XML

---
 lib/linguist/languages.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index ddfd5e90..e6555449 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -1297,7 +1297,9 @@ XML:
   ace_mode: xml
   primary_extension: .xml
   extensions:
+  - .ant
   - .glade
+  - .ivy
   - .kml
   - .mxml
   - .plist

From 1027047bc7c28a0c0b2dd03aee6d5daa1864e7cd Mon Sep 17 00:00:00 2001
From: Jean-Louis Boudart <jeanlouis.boudart@gmail.com>
Date: Sat, 21 Jul 2012 14:21:16 +0200
Subject: [PATCH 2/4] Add easyant sample files

---
 samples/xml/module.ant | 15 +++++++++++++++
 samples/xml/module.ivy | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+)
 create mode 100644 samples/xml/module.ant
 create mode 100644 samples/xml/module.ivy

diff --git a/samples/xml/module.ant b/samples/xml/module.ant
new file mode 100644
index 00000000..8f3a10db
--- /dev/null
+++ b/samples/xml/module.ant
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<project name="org.apache.easyant#standard-java-app" xmlns:ea="antlib:org.apache.easyant">
+    <description>
+        This easyant module.ant sample file is optionnal and designed to customize your build with your own specific target.
+    </description>
+
+    <target name="an-additionnal-target">
+       <echo>my awesome additionnal target</echo>
+    </target>
+
+    <target name="a-specific-pre-compile-step" extensionOf="abstract-compile:compile-ready">
+       <echo>i would love easyant i could easily plug my own specific pre compile step</echo>
+    </target>                
+                
+</project>              
diff --git a/samples/xml/module.ivy b/samples/xml/module.ivy
new file mode 100644
index 00000000..0185531d
--- /dev/null
+++ b/samples/xml/module.ivy
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<ivy-module version="2.0" xmlns:ea="http://www.easyant.org"> 
+    <info organisation="org.apache.easyant" module="standard-java-app" revision="0.1" status="integration" >
+        <description>
+            this is a easyant module.ivy sample file for java standard application
+        </description>
+        <!--
+            This easyant section is equivalent to having a module.ant like this:
+            
+            <project name="org.apache.easyant#standard-java-app"
+                xmlns:ea="antlib:org.apache.easyant">
+                
+                <property name="run.main.classname" value="org.apache.easyant.example.Example"/>
+            
+                <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-java" revision="0.9"/>
+                <ea:plugin organisation="org.apache.easyant.plugins" module="run-java" revision="0.9"/>
+            </project>              
+          -->
+        <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-java" revision="0.9"/>
+            <ea:property name="run.main.classname" value="org.apache.easyant.example.Example"/>
+            <ea:plugin organisation="org.apache.easyant.plugins" module="run-java" revision="0.9"/>
+        </ea:build>
+    </info>
+    <configurations>
+        <conf name="default" visibility="public" description="runtime dependencies and master artifact can be used with this conf"/>
+        <conf name="test" visibility="private" description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases."/>
+    </configurations>
+    <dependencies>
+        <dependency org="hsqldb" name="hsqldb" rev="1.8.0.7" conf="default->default"/>
+        <dependency org="junit" name="junit" rev="4.4" conf="test->default" />
+
+    </dependencies>
+</ivy-module>

From d23ab8dcda7efef3b9cde01118a5ecf08c6d9c2b Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Sat, 21 Jul 2012 09:39:51 -0500
Subject: [PATCH 3/4] Revert "Add easyant files support to syntax highlighting
 .ant and .ivy files are both XML"

This reverts commit 0b983546382b25546e15acaf5e30bde7fd207f84.
---
 lib/linguist/languages.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index e6555449..ddfd5e90 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -1297,9 +1297,7 @@ XML:
   ace_mode: xml
   primary_extension: .xml
   extensions:
-  - .ant
   - .glade
-  - .ivy
   - .kml
   - .mxml
   - .plist

From 8ecf2ad322370722cfa43c580c8737be8ed1517e Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Sat, 21 Jul 2012 09:40:37 -0500
Subject: [PATCH 4/4] Update classifier db

---
 lib/linguist/classifier.yml | 112 ++++++++++++++++++++++++++++--------
 1 file changed, 87 insertions(+), 25 deletions(-)

diff --git a/lib/linguist/classifier.yml b/lib/linguist/classifier.yml
index a39b135a..5874b621 100644
--- a/lib/linguist/classifier.yml
+++ b/lib/linguist/classifier.yml
@@ -1,6 +1,6 @@
 --- !ruby/object:Linguist::Classifier
-languages_total: 241
-tokens_total: 164005
+languages_total: 243
+tokens_total: 164127
 languages:
   "Apex": 6
   "AppleScript": 2
@@ -64,7 +64,7 @@ languages:
   "Verilog": 13
   "VimL": 2
   "Visual Basic": 1
-  "XML": 1
+  "XML": 3
   "XQuery": 1
   "XSLT": 1
   "YAML": 1
@@ -131,7 +131,7 @@ language_tokens:
   "Verilog": 3440
   "VimL": 20
   "Visual Basic": 294
-  "XML": 5505
+  "XML": 5627
   "XQuery": 801
   "XSLT": 44
   "YAML": 30
@@ -18878,28 +18878,53 @@ tokens:
     "*always*": 1
     "*before*": 2
     "*must*": 1
-    "-": 48
+    "-": 49
+    "-->": 1
     ".": 22
-    "/": 5
+    ".4": 1
+    "/": 6
     ";": 10
+    "<!--": 1
     "</assembly>": 1
+    "</configurations>": 1
+    "</dependencies>": 1
+    "</description>": 2
     "</doc>": 1
+    "</ea:build>": 1
+    "</echo>": 2
+    "</info>": 1
+    "</ivy-module>": 1
     "</member>": 120
     "</members>": 1
     "</name>": 1
     "</param>": 83
+    "</project>": 1
     "</returns>": 36
     "</summary>": 121
+    "</target>": 2
     "</typeparam>": 12
-    "<?xml>": 1
+    "<?xml>": 3
     "<assembly>": 1
+    "<conf>": 2
+    "<configurations>": 1
+    "<dependencies>": 1
+    "<dependency>": 1
+    "<description>": 2
     "<doc>": 1
+    "<ea:build>": 1
+    "<ea:plugin>": 1
+    "<ea:property>": 1
+    "<echo>": 2
+    "<info>": 1
+    "<ivy-module>": 1
     "<member>": 120
     "<members>": 1
     "<name>": 1
     "<param>": 84
+    "<project>": 1
     "<returns>": 36
     "<summary>": 120
+    "<target>": 2
     "<typeparam>": 12
     "A": 19
     "AddRange": 2
@@ -19025,7 +19050,7 @@ tokens:
     "TaskpoolScheduler": 2
     "Test": 1
     "The": 74
-    "This": 20
+    "This": 21
     "This.GetValue": 1
     "Threadpool": 1
     "Timer.": 2
@@ -19048,7 +19073,7 @@ tokens:
     "When": 5
     "WhenAny": 12
     "Works": 2
-    "a": 126
+    "a": 127
     "able": 1
     "about": 5
     "access": 3
@@ -19062,6 +19087,7 @@ tokens:
     "adding": 2
     "addition": 3
     "additional": 3
+    "additionnal": 1
     "adds": 2
     "after": 1
     "all": 4
@@ -19072,11 +19098,11 @@ tokens:
     "also": 17
     "always": 4
     "an": 88
-    "and": 43
+    "and": 44
     "another": 3
     "any": 11
     "anything": 2
-    "application": 1
+    "application": 2
     "applies": 1
     "apply": 3
     "arbitrarily": 2
@@ -19093,6 +19119,7 @@ tokens:
     "automatically": 3
     "available.": 1
     "avoid": 2
+    "awesome": 1
     "backed": 1
     "background": 1
     "backing": 9
@@ -19107,6 +19134,7 @@ tokens:
     "binding.": 1
     "bindings": 13
     "both": 2
+    "build": 1
     "bus.": 1
     "but": 7
     "by": 13
@@ -19144,11 +19172,13 @@ tokens:
     "common": 1
     "communicate": 2
     "compatible": 1
+    "compile": 1
     "complete": 1
     "completes": 4
     "compute": 1
     "concurrent": 5
     "concurrently": 2
+    "conf=": 1
     "configured": 1
     "constructors": 12
     "contents": 2
@@ -19157,15 +19187,17 @@ tokens:
     "convention": 2
     "convert": 2
     "corresponding": 2
+    "could": 1
     "coupled": 2
     "created": 2
     "creating": 2
     "current": 10
     "currently": 2
     "custom": 4
+    "customize": 1
     "data": 1
     "declare": 1
-    "default": 6
+    "default": 9
     "default.": 2
     "defaults": 1
     "defined": 1
@@ -19174,6 +19206,8 @@ tokens:
     "delete": 1
     "depends": 1
     "derive": 1
+    "description=": 2
+    "designed": 1
     "determine": 1
     "determined": 1
     "directly": 1
@@ -19189,7 +19223,10 @@ tokens:
     "download": 1
     "dummy": 1
     "duplicate": 2
+    "ea=": 2
     "each": 7
+    "easily": 1
+    "easyant": 3
     "either": 1
     "empty": 1
     "enabled": 8
@@ -19212,6 +19249,7 @@ tokens:
     "expression.": 1
     "extended": 1
     "extension": 2
+    "extensionOf=": 1
     "fail.": 1
     "fake": 4
     "faking": 4
@@ -19220,7 +19258,7 @@ tokens:
     "fetch": 1
     "field": 10
     "field.": 1
-    "file": 1
+    "file": 3
     "file.": 1
     "filled": 1
     "filters": 1
@@ -19233,7 +19271,7 @@ tokens:
     "flight": 2
     "folder": 1
     "followed": 1
-    "for": 58
+    "for": 59
     "found.": 1
     "framework": 1
     "framework.": 1
@@ -19259,6 +19297,7 @@ tokens:
     "helps": 1
     "heuristically": 1
     "hundreds": 2
+    "i": 2
     "i.e.": 23
     "identical": 11
     "if": 27
@@ -19279,7 +19318,7 @@ tokens:
     "interface": 4
     "into": 2
     "invoke": 4
-    "is": 121
+    "is": 123
     "issue": 2
     "it": 16
     "item": 19
@@ -19287,6 +19326,8 @@ tokens:
     "items": 27
     "its": 4
     "itself": 2
+    "java": 1
+    "junit": 2
     "keep": 1
     "key": 12
     "keyword.": 2
@@ -19302,6 +19343,7 @@ tokens:
     "log": 2
     "logger": 2
     "loosely": 2
+    "love": 1
     "maintain": 1
     "make": 2
     "making": 3
@@ -19328,13 +19370,17 @@ tokens:
     "mock": 4
     "mode": 2
     "modes": 1
+    "module.ant": 1
+    "module.ivy": 1
+    "module=": 3
     "monitor": 1
     "more": 16
     "multiple": 6
     "must": 2
+    "my": 2
     "name": 7
     "name.": 1
-    "name=": 216
+    "name=": 223
     "named": 2
     "naming": 1
     "need": 12
@@ -19380,7 +19426,10 @@ tokens:
     "operations": 6
     "optional": 2
     "optionally": 2
+    "optionnal": 1
     "or": 24
+    "org=": 1
+    "organisation=": 3
     "other": 9
     "otherwise": 1
     "out": 4
@@ -19388,6 +19437,7 @@ tokens:
     "output": 1
     "overload": 2
     "override": 1
+    "own": 2
     "parameter": 6
     "parameter.": 1
     "parameters.": 1
@@ -19400,12 +19450,14 @@ tokens:
     "performance": 1
     "performs": 1
     "places": 1
+    "plug": 1
     "populate": 1
     "populated": 4
     "possible": 1
     "post": 2
     "posted": 3
     "potentially": 2
+    "pre": 1
     "previous": 2
     "private": 1
     "progress": 1
@@ -19462,11 +19514,14 @@ tokens:
     "returned.": 2
     "returning": 1
     "returns": 5
+    "rev=": 1
+    "revision=": 3
     "run": 7
     "running": 4
     "running.": 1
     "s": 1
     "same": 8
+    "sample": 2
     "save": 1
     "scenarios": 4
     "schedule": 2
@@ -19500,10 +19555,13 @@ tokens:
     "slot": 1
     "so": 1
     "spamming": 2
-    "specific": 6
+    "specific": 8
     "specified": 7
+    "standard": 1
     "start": 1
     "startup.": 1
+    "status=": 1
+    "step": 1
     "steps": 1
     "still": 1
     "stream": 7
@@ -19520,23 +19578,24 @@ tokens:
     "take": 2
     "taken": 1
     "takes": 1
-    "target": 5
+    "target": 6
+    "target.": 1
     "target.property": 1
     "temporary": 1
-    "test": 6
+    "test": 7
     "tests.": 1
     "than": 5
     "that": 94
     "the": 260
     "them": 1
     "then": 3
-    "this": 76
+    "this": 77
     "thread.": 3
     "through": 3
     "thrown": 1
     "time": 3
     "times.": 4
-    "to": 163
+    "to": 164
     "to.": 7
     "too": 1
     "traditional": 3
@@ -19564,13 +19623,15 @@ tokens:
     "usually": 1
     "value": 44
     "value.": 2
+    "value=": 1
     "values": 4
     "varables": 1
     "version": 3
-    "version=": 1
+    "version=": 4
     "versions": 2
     "very": 2
     "via": 8
+    "visibility=": 2
     "wait": 3
     "want": 2
     "was": 6
@@ -19585,18 +19646,19 @@ tokens:
     "which": 12
     "whose": 7
     "will": 65
-    "with": 22
+    "with": 23
     "withDelay": 2
     "without": 1
     "work": 2
-    "would": 1
+    "would": 2
     "write": 2
     "writing": 1
     "x": 1
     "x.Foo.Bar.Baz": 1
     "x.SomeProperty": 1
+    "xmlns": 2
     "you": 20
-    "your": 6
+    "your": 8
   "XQuery":
     "(": 38
     ")": 38