You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by hi...@apache.org on 2012/08/21 18:39:03 UTC

svn commit: r1375653 - in /ant/sandbox/antdsl/trunk: ./ build.xml ivy-fixed.xml ivy.xml

Author: hibou
Date: Tue Aug 21 16:39:03 2012
New Revision: 1375653

URL: http://svn.apache.org/viewvc?rev=1375653&view=rev
Log:
Improve dependency declaration

Modified:
    ant/sandbox/antdsl/trunk/   (props changed)
    ant/sandbox/antdsl/trunk/build.xml
    ant/sandbox/antdsl/trunk/ivy-fixed.xml
    ant/sandbox/antdsl/trunk/ivy.xml

Propchange: ant/sandbox/antdsl/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Aug 21 16:39:03 2012
@@ -1,4 +1,4 @@
 build
 lib
 build-deps
-build.classpath
+*.classpath

Modified: ant/sandbox/antdsl/trunk/build.xml
URL: http://svn.apache.org/viewvc/ant/sandbox/antdsl/trunk/build.xml?rev=1375653&r1=1375652&r2=1375653&view=diff
==============================================================================
--- ant/sandbox/antdsl/trunk/build.xml (original)
+++ ant/sandbox/antdsl/trunk/build.xml Tue Aug 21 16:39:03 2012
@@ -34,25 +34,35 @@
         <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" classpath="${basedir}/build-deps/ivy-${ivy.version}.jar" />
     </target>
 
-    <target name="update-deps" depends="init" description="Update dependencies" >
+    <target name="ivy:configure" depends="init">
         <ivy:configure file="ivysettings.xml" />
-        <ivy:resolve file="ivy.xml" conf="*" uncompress="true" />
-        <ivy:fixdeps tofile="ivy-fixed.xml" />
     </target>
 
-    <target name="get-deps" depends="init" description="Download dependencies" >
-        <ivy:configure file="ivysettings.xml" />
+    <target name="get-deps" depends="init,ivy:configure" description="Download dependencies" >
         <ivy:resolve file="ivy-fixed.xml" conf="*" uncompress="true" />
         <!--ivy:retrieve conf="*" pattern="${basedir}/lib/[type]s/[artifact]_[revision](.[ext])" sync="true" uncompress="true" /-->
-        <ivy:cachepath pathid="build.classpath.ivy" conf="default" type="jar" uncompress="true" />
+        <ivy:cachepath pathid="antruntime.classpath.ivy" conf="antruntime" type="jar" uncompress="true" osgi="true" />
+        <ivy:cachepath pathid="generate.classpath.ivy" conf="generate" type="jar" uncompress="true" osgi="true" />
         <!-- Now we need to hack since we the ant trunk to build -->
-        <path id="build.classpath">
+        <path id="antruntime.classpath">
+            <fileset dir="build-deps/apache-ant-1.9.0alpha/lib" includes="*.jar" />
+            <path refid="antruntime.classpath.ivy" />
+        </path>
+        <path id="generate.classpath">
             <fileset dir="build-deps/apache-ant-1.9.0alpha/lib" includes="*.jar" />
-            <path refid="build.classpath.ivy" />
+            <path refid="generate.classpath.ivy" />
         </path>
-        <echo message="${toString:build.classpath}" file="build.classpath" />        
+        <echo message="${toString:antruntime.classpath}" file=".antruntime.classpath" />
+        <echo message="${toString:generate.classpath}" file=".generate.classpath" />
     </target>
 
+    <target name="-do-update-deps" depends="init,ivy:configure">
+        <ivy:resolve file="ivy.xml" conf="*" uncompress="true" resolveId="antdsl-update-deps" />
+        <ivy:fixdeps tofile="ivy-fixed.xml" resolveId="antdsl-update-deps" />
+    </target>
+
+    <target name="update-deps" depends="-do-update-deps,get-deps" description="Update dependencies (to be called on ivy.xml chnage)" />
+
     <target name="clean" description="Clean build artifacts">
         <delete dir="${basedir}/build" />
     </target>
@@ -71,19 +81,20 @@
     </target>
 
     <target name="generate-xtext" description="Generate XText and Ecore files for the full plugin">
+        <loadpath pathid="generate.classpath" file=".generate.classpath" />
         <java classname="org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher" dir="${basedir}/org.apache.ant.antdsl" fork="true" failonerror="true">
             <classpath>
                 <pathelement path="${basedir}/org.apache.ant.antdsl/src/" />
-                <fileset dir="${basedir}/lib" includes="*.jar" />
+                <path refid="generate.classpath" />
             </classpath>
             <arg line="src/org/apache/ant/antdsl/xtext/GenerateAntDSL.mwe2" />
         </java>
     </target>
 
     <target name="build" description="Full build of a antdsl jar">
-        <loadpath pathid="build.classpath" file="build.classpath" />
+        <loadpath pathid="antruntime.classpath" file=".antruntime.classpath" />
         <mkdir dir="${basedir}/build/classes" />
-        <javac srcdir="${basedir}/org.apache.ant.antdsl/src/:${basedir}/org.apache.ant.antdsl/src-gen/:${basedir}/org.apache.ant.antdsl/xtend-gen" destdir="${basedir}/build/classes" debug="on" includeantruntime="false" source="1.6" target="1.6" classpathref="build.classpath" />
+        <javac srcdir="${basedir}/org.apache.ant.antdsl/src/:${basedir}/org.apache.ant.antdsl/src-gen/:${basedir}/org.apache.ant.antdsl/xtend-gen" destdir="${basedir}/build/classes" debug="on" includeantruntime="false" source="1.6" target="1.6" classpathref="antruntime.classpath" />
         <copy todir="${basedir}/build/classes">
             <fileset dir="${basedir}/org.apache.ant.antdsl/src">
                 <exclude name="*.java" />
@@ -100,11 +111,11 @@
     </target>
 
     <target name="test-xtext" description="Test the run of an antdsl file with Xtext-generated parser">
-        <loadpath pathid="build.classpath" file="build.classpath" />
+        <loadpath pathid="antruntime.classpath" file="antruntime.classpath" />
         <typedef classname="org.apache.ant.antdsl.xtext.AntDslXTextProjectHelper" name="antDslProjectHelper">
             <classpath>
                 <pathelement path="${basedir}/build/antdsl.jar" />
-                <path refid="build.classpath" />
+                <path refid="antruntime.classpath" />
             </classpath>
         </typedef>
         <projecthelper>
@@ -114,11 +125,11 @@
     </target>
 
     <target name="test-antlr" description="Test the run of an antdsl file with Xtext-generated parser">
-        <loadpath pathid="build.classpath" file="build.classpath" />
+        <loadpath pathid="antruntime.classpath" file="antruntime.classpath" />
         <typedef classname="org.apache.ant.antdsl.antlr.AntDslAntlrProjectHelper" name="antDslProjectHelper">
             <classpath>
                 <pathelement path="${basedir}/build/antdsl.jar" />
-                <path refid="build.classpath" />
+                <path refid="antruntime.classpath" />
             </classpath>
         </typedef>
         <projecthelper>

Modified: ant/sandbox/antdsl/trunk/ivy-fixed.xml
URL: http://svn.apache.org/viewvc/ant/sandbox/antdsl/trunk/ivy-fixed.xml?rev=1375653&r1=1375652&r2=1375653&view=diff
==============================================================================
--- ant/sandbox/antdsl/trunk/ivy-fixed.xml (original)
+++ ant/sandbox/antdsl/trunk/ivy-fixed.xml Tue Aug 21 16:39:03 2012
@@ -4,10 +4,10 @@
 		module="ant-dsl"
 		revision="1.0.0"
 		status="integration"
-		publication="20120804183628"
+		publication="20120821183201"
 	/>
 	<configurations>
-		<conf name="default" visibility="public" extends="antruntime"/>
+		<conf name="default" visibility="public"/>
 		<conf name="optional" visibility="public" description="Optional dependencies" extends="default"/>
 		<conf name="transitive-optional" visibility="public" description="Optional dependencies" extends="optional"/>
 		<conf name="use_org.apache.ant.antdsl.xtext" visibility="public" description="Exported package org.apache.ant.antdsl.xtext" extends="default"/>
@@ -26,18 +26,22 @@
 		<conf name="use_org.apache.commons.logging" visibility="public" description="Exported package org.apache.commons.logging" extends="default"/>
 		<conf name="use_org.eclipse.xtext.xbase.lib" visibility="public" description="Exported package org.eclipse.xtext.xbase.lib" extends="default"/>
 		<conf name="use_org.eclipse.xtend2.lib" visibility="public" description="Exported package org.eclipse.xtend2.lib" extends="default"/>
-		<conf name="antruntime" visibility="public"/>
-		<conf name="generate" visibility="public" extends="antruntime"/>
+		<conf name="antruntime" visibility="public" extends="default"/>
+		<conf name="generate" visibility="public" extends="optional"/>
 	</configurations>
 	<publications>
 	</publications>
 	<dependencies>
-		<dependency org="bundle" name="org.apache.log4j" rev="1.2.15.v201012070815" force="true" transitive="false" conf="use_org.apache.ant.antdsl.xtext.antdsl.util->default,use_org.apache.log4j;use_org.apache.ant.antdsl.xtext.validation->default,use_org.apache.log4j;use_org.eclipse.xtend2.lib->default,use_org.apache.log4j;generate->default;use_org.eclipse.xtext.xbase.lib->default,use_org.apache.log4j;use_org.apache.log4j->default,use_org.apache.log4j;use_org.apache.ant.antdsl.xtext.parser.antlr->default,use_org.apache.log4j;use_org.apache.ant.antdsl.xtext.parser.antlr.internal->default,use_org.apache.log4j;use_org.apache.ant.antdsl.xtext.scoping->default,use_org.apache.log4j;use_org.apache.ant.antdsl.xtext.formatting->default,use_org.apache.log4j;default->default,use_org.apache.log4j;use_org.apache.ant.antdsl.xtext.serializer->default,use_org.apache.log4j;use_org.apache.ant.antdsl.xtext.antdsl->default,use_org.apache.log4j;optional->default,use_org.apache.log4j;use_org.apache.an
 t.antdsl.xtext.antdsl.impl->default,use_org.apache.log4j;use_org.apache.ant.antdsl.xtext.generator->default,use_org.apache.log4j;transitive-optional->default,use_org.apache.log4j;use_org.apache.commons.logging->default,use_org.apache.log4j;use_org.apache.ant.antdsl.xtext->default,use_org.apache.log4j;use_org.apache.ant.antdsl.xtext.services->default,use_org.apache.log4j;antruntime->default"/>
-		<dependency org="bundle" name="org.apache.commons.logging" rev="1.1.1.v201101211721" force="true" transitive="false" conf="use_org.apache.ant.antdsl.xtext.antdsl.util->default,use_org.apache.commons.logging;use_org.apache.ant.antdsl.xtext.validation->default,use_org.apache.commons.logging;use_org.eclipse.xtend2.lib->default,use_org.apache.commons.logging;generate->default;use_org.eclipse.xtext.xbase.lib->default,use_org.apache.commons.logging;use_org.apache.log4j->default,use_org.apache.commons.logging;use_org.apache.ant.antdsl.xtext.parser.antlr->default,use_org.apache.commons.logging;use_org.apache.ant.antdsl.xtext.parser.antlr.internal->default,use_org.apache.commons.logging;use_org.apache.ant.antdsl.xtext.scoping->default,use_org.apache.commons.logging;use_org.apache.ant.antdsl.xtext.formatting->default,use_org.apache.commons.logging;default->default,use_org.apache.commons.logging;use_org.apache.ant.antdsl.xtext.serializer->default,use_org.apache.commons.logging;use_or
 g.apache.ant.antdsl.xtext.antdsl->default,use_org.apache.commons.logging;optional->default,use_org.apache.commons.logging;use_org.apache.ant.antdsl.xtext.antdsl.impl->default,use_org.apache.commons.logging;use_org.apache.ant.antdsl.xtext.generator->default,use_org.apache.commons.logging;transitive-optional->default,optional,transitive-optional,use_org.apache.commons.logging;use_org.apache.commons.logging->default,use_org.apache.commons.logging;use_org.apache.ant.antdsl.xtext->default,use_org.apache.commons.logging;use_org.apache.ant.antdsl.xtext.services->default,use_org.apache.commons.logging;antruntime->default"/>
-		<dependency org="bundle" name="com.ibm.icu" rev="4.4.2.v20110823" force="true" transitive="false" conf="use_org.apache.ant.antdsl.xtext.antdsl.util->default,use_com.ibm.icu.text;use_org.apache.ant.antdsl.xtext.validation->default,use_com.ibm.icu.text;use_org.eclipse.xtend2.lib->default,use_com.ibm.icu.text;generate->default,use_com.ibm.icu.text;use_org.eclipse.xtext.xbase.lib->default,use_com.ibm.icu.text;use_org.apache.log4j->default,use_com.ibm.icu.text;use_org.apache.ant.antdsl.xtext.parser.antlr->default,use_com.ibm.icu.text;use_org.apache.ant.antdsl.xtext.parser.antlr.internal->default,use_com.ibm.icu.text;use_org.apache.ant.antdsl.xtext.scoping->default,use_com.ibm.icu.text;use_org.apache.ant.antdsl.xtext.formatting->default,use_com.ibm.icu.text;default->default,use_com.ibm.icu.text;use_org.apache.ant.antdsl.xtext.serializer->default,use_com.ibm.icu.text;use_org.apache.ant.antdsl.xtext.antdsl->default,use_com.ibm.icu.text;optional->default,use_com.ibm.icu.text,use_co
 m.ibm.icu.util;use_org.apache.ant.antdsl.xtext.antdsl.impl->default,use_com.ibm.icu.text;use_org.apache.ant.antdsl.xtext.generator->default,use_com.ibm.icu.text;transitive-optional->default,use_com.ibm.icu.text,optional,use_com.ibm.icu.util,transitive-optional;use_org.apache.commons.logging->default,use_com.ibm.icu.text;use_org.apache.ant.antdsl.xtext->default,use_com.ibm.icu.text;use_org.apache.ant.antdsl.xtext.services->default,use_com.ibm.icu.text;antruntime->default,use_com.ibm.icu.text"/>
-		<dependency org="bundle" name="org.eclipse.ui.forms" rev="3.5.200.v20120521-2329" force="true" transitive="false" conf="use_org.apache.ant.antdsl.xtext.antdsl.util->default;use_org.apache.ant.antdsl.xtext.validation->default;use_org.eclipse.xtend2.lib->default;generate->default;use_org.eclipse.xtext.xbase.lib->default;use_org.apache.log4j->default;use_org.apache.ant.antdsl.xtext.parser.antlr->default;use_org.apache.ant.antdsl.xtext.parser.antlr.internal->default;use_org.apache.ant.antdsl.xtext.scoping->default;use_org.apache.ant.antdsl.xtext.formatting->default;default->default;use_org.apache.ant.antdsl.xtext.serializer->default;use_org.apache.ant.antdsl.xtext.antdsl->default;optional->default;use_org.apache.ant.antdsl.xtext.antdsl.impl->default;use_org.apache.ant.antdsl.xtext.generator->default;transitive-optional->default,use_org.eclipse.ui.forms.widgets;use_org.apache.commons.logging->default;use_org.apache.ant.antdsl.xtext->default;use_org.apache.ant.antdsl.xtext.servi
 ces->default;antruntime->default"/>
+		<dependency org="bundle" name="org.eclipse.xtext" rev="2.3.0.v201206120633" force="true" transitive="false" conf="use_org.apache.ant.antdsl.xtext.antdsl.util->default;use_org.apache.ant.antdsl.xtext.validation->default;use_org.eclipse.xtend2.lib->default;generate->default;use_org.eclipse.xtext.xbase.lib->default;use_org.apache.log4j->default;use_org.apache.ant.antdsl.xtext.parser.antlr->default;use_org.apache.ant.antdsl.xtext.parser.antlr.internal->default;use_org.apache.ant.antdsl.xtext.scoping->default;use_org.apache.ant.antdsl.xtext.formatting->default;default->default;use_org.apache.ant.antdsl.xtext.serializer->default;use_org.apache.ant.antdsl.xtext.antdsl->default;optional->default;use_org.apache.ant.antdsl.xtext.antdsl.impl->default;use_org.apache.ant.antdsl.xtext.generator->default;transitive-optional->default,optional,transitive-optional;use_org.apache.commons.logging->default;use_org.apache.ant.antdsl.xtext->default;use_org.apache.ant.antdsl.xtext.services->defau
 lt;antruntime->default"/>
+		<dependency org="bundle" name="org.apache.log4j" rev="1.2.15.v201012070815" force="true" transitive="false" conf="use_org.apache.ant.antdsl.xtext.antdsl.util->default;use_org.apache.ant.antdsl.xtext.validation->default;use_org.eclipse.xtend2.lib->default;generate->default;use_org.eclipse.xtext.xbase.lib->default;use_org.apache.log4j->default;use_org.apache.ant.antdsl.xtext.parser.antlr->default;use_org.apache.ant.antdsl.xtext.parser.antlr.internal->default;use_org.apache.ant.antdsl.xtext.scoping->default;use_org.apache.ant.antdsl.xtext.formatting->default;default->default;use_org.apache.ant.antdsl.xtext.serializer->default;use_org.apache.ant.antdsl.xtext.antdsl->default;optional->default;use_org.apache.ant.antdsl.xtext.antdsl.impl->default;use_org.apache.ant.antdsl.xtext.generator->default;transitive-optional->default;use_org.apache.commons.logging->default;use_org.apache.ant.antdsl.xtext->default;use_org.apache.ant.antdsl.xtext.services->default;antruntime->default"/>
+		<dependency org="bundle" name="org.eclipse.xtext.util" rev="2.3.0.v201206120633" force="true" transitive="false" conf="use_org.apache.ant.antdsl.xtext.antdsl.util->default;use_org.apache.ant.antdsl.xtext.validation->default;use_org.eclipse.xtend2.lib->default;generate->default;use_org.eclipse.xtext.xbase.lib->default;use_org.apache.log4j->default;use_org.apache.ant.antdsl.xtext.parser.antlr->default;use_org.apache.ant.antdsl.xtext.parser.antlr.internal->default;use_org.apache.ant.antdsl.xtext.scoping->default;use_org.apache.ant.antdsl.xtext.formatting->default;default->default;use_org.apache.ant.antdsl.xtext.serializer->default;use_org.apache.ant.antdsl.xtext.antdsl->default;optional->default;use_org.apache.ant.antdsl.xtext.antdsl.impl->default;use_org.apache.ant.antdsl.xtext.generator->default;transitive-optional->default,optional,transitive-optional;use_org.apache.commons.logging->default;use_org.apache.ant.antdsl.xtext->default;use_org.apache.ant.antdsl.xtext.services->
 default;antruntime->default"/>
+		<dependency org="bundle" name="org.eclipse.emf.ecore" rev="2.8.0.v20120606-0717" force="true" transitive="false" conf="use_org.apache.ant.antdsl.xtext.antdsl.util->default;use_org.apache.ant.antdsl.xtext.validation->default;use_org.eclipse.xtend2.lib->default;generate->default;use_org.eclipse.xtext.xbase.lib->default;use_org.apache.log4j->default;use_org.apache.ant.antdsl.xtext.parser.antlr->default;use_org.apache.ant.antdsl.xtext.parser.antlr.internal->default;use_org.apache.ant.antdsl.xtext.scoping->default;use_org.apache.ant.antdsl.xtext.formatting->default;default->default;use_org.apache.ant.antdsl.xtext.serializer->default;use_org.apache.ant.antdsl.xtext.antdsl->default;optional->default;use_org.apache.ant.antdsl.xtext.antdsl.impl->default;use_org.apache.ant.antdsl.xtext.generator->default;transitive-optional->default,use_org.eclipse.emf.ecore,use_org.eclipse.emf.ecore.util;use_org.apache.commons.logging->default;use_org.apache.ant.antdsl.xtext->default;use_org.apache
 .ant.antdsl.xtext.services->default;antruntime->default"/>
+		<dependency org="bundle" name="org.eclipse.emf.common" rev="2.8.0.v20120606-0717" force="true" transitive="false" conf="use_org.apache.ant.antdsl.xtext.antdsl.util->default;use_org.apache.ant.antdsl.xtext.validation->default;use_org.eclipse.xtend2.lib->default;generate->default;use_org.eclipse.xtext.xbase.lib->default;use_org.apache.log4j->default;use_org.apache.ant.antdsl.xtext.parser.antlr->default;use_org.apache.ant.antdsl.xtext.parser.antlr.internal->default;use_org.apache.ant.antdsl.xtext.scoping->default;use_org.apache.ant.antdsl.xtext.formatting->default;default->default;use_org.apache.ant.antdsl.xtext.serializer->default;use_org.apache.ant.antdsl.xtext.antdsl->default;optional->default;use_org.apache.ant.antdsl.xtext.antdsl.impl->default;use_org.apache.ant.antdsl.xtext.generator->default;transitive-optional->default,use_org.eclipse.emf.common.util;use_org.apache.commons.logging->default;use_org.apache.ant.antdsl.xtext->default;use_org.apache.ant.antdsl.xtext.servic
 es->default;antruntime->default"/>
+		<dependency org="bundle" name="org.antlr.runtime" rev="3.2.0.v201101311130" force="true" transitive="false" conf="use_org.apache.ant.antdsl.xtext.antdsl.util->default;use_org.apache.ant.antdsl.xtext.validation->default;use_org.eclipse.xtend2.lib->default;generate->default;use_org.eclipse.xtext.xbase.lib->default;use_org.apache.log4j->default;use_org.apache.ant.antdsl.xtext.parser.antlr->default;use_org.apache.ant.antdsl.xtext.parser.antlr.internal->default;use_org.apache.ant.antdsl.xtext.scoping->default;use_org.apache.ant.antdsl.xtext.formatting->default;default->default;use_org.apache.ant.antdsl.xtext.serializer->default;use_org.apache.ant.antdsl.xtext.antdsl->default;optional->default;use_org.apache.ant.antdsl.xtext.antdsl.impl->default;use_org.apache.ant.antdsl.xtext.generator->default;transitive-optional->default;use_org.apache.commons.logging->default;use_org.apache.ant.antdsl.xtext->default;use_org.apache.ant.antdsl.xtext.services->default;antruntime->default"/>
+		<dependency org="bundle" name="org.eclipse.xtext.common.types" rev="2.3.0.v201206120633" force="true" transitive="false" conf="use_org.apache.ant.antdsl.xtext.antdsl.util->default;use_org.apache.ant.antdsl.xtext.validation->default;use_org.eclipse.xtend2.lib->default;generate->default;use_org.eclipse.xtext.xbase.lib->default;use_org.apache.log4j->default;use_org.apache.ant.antdsl.xtext.parser.antlr->default;use_org.apache.ant.antdsl.xtext.parser.antlr.internal->default;use_org.apache.ant.antdsl.xtext.scoping->default;use_org.apache.ant.antdsl.xtext.formatting->default;default->default;use_org.apache.ant.antdsl.xtext.serializer->default;use_org.apache.ant.antdsl.xtext.antdsl->default;optional->default;use_org.apache.ant.antdsl.xtext.antdsl.impl->default;use_org.apache.ant.antdsl.xtext.generator->default;transitive-optional->default,optional,transitive-optional;use_org.apache.commons.logging->default;use_org.apache.ant.antdsl.xtext->default;use_org.apache.ant.antdsl.xtext.se
 rvices->default;antruntime->default"/>
+		<dependency org="bundle" name="org.apache.ant" rev="1.8.3.v20120321-1730" force="true" transitive="false" conf="use_org.apache.ant.antdsl.xtext.antdsl.util->default;use_org.apache.ant.antdsl.xtext.validation->default;use_org.eclipse.xtend2.lib->default;generate->default;use_org.eclipse.xtext.xbase.lib->default;use_org.apache.log4j->default;use_org.apache.ant.antdsl.xtext.parser.antlr->default;use_org.apache.ant.antdsl.xtext.parser.antlr.internal->default;use_org.apache.ant.antdsl.xtext.scoping->default;use_org.apache.ant.antdsl.xtext.formatting->default;default->default;use_org.apache.ant.antdsl.xtext.serializer->default;use_org.apache.ant.antdsl.xtext.antdsl->default;optional->default;use_org.apache.ant.antdsl.xtext.antdsl.impl->default;use_org.apache.ant.antdsl.xtext.generator->default;transitive-optional->default,optional,transitive-optional;use_org.apache.commons.logging->default;use_org.apache.ant.antdsl.xtext->default;use_org.apache.ant.antdsl.xtext.services->default
 ;antruntime->default"/>
+		<dependency org="bundle" name="org.eclipse.emf.ecore.xmi" rev="2.8.0.v20120606-0717" force="true" transitive="false" conf="use_org.apache.ant.antdsl.xtext.antdsl.util->default;use_org.apache.ant.antdsl.xtext.validation->default;use_org.eclipse.xtend2.lib->default;generate->default;use_org.eclipse.xtext.xbase.lib->default;use_org.apache.log4j->default;use_org.apache.ant.antdsl.xtext.parser.antlr->default;use_org.apache.ant.antdsl.xtext.parser.antlr.internal->default;use_org.apache.ant.antdsl.xtext.scoping->default;use_org.apache.ant.antdsl.xtext.formatting->default;default->default;use_org.apache.ant.antdsl.xtext.serializer->default;use_org.apache.ant.antdsl.xtext.antdsl->default;optional->default;use_org.apache.ant.antdsl.xtext.antdsl.impl->default;use_org.apache.ant.antdsl.xtext.generator->default;transitive-optional->default;use_org.apache.commons.logging->default;use_org.apache.ant.antdsl.xtext->default;use_org.apache.ant.antdsl.xtext.services->default;antruntime->defau
 lt"/>
 		<dependency org="bundle" name="org.eclipse.core.runtime" rev="3.8.0.v20120521-2346" force="true" transitive="false" conf="use_org.apache.ant.antdsl.xtext.antdsl.util->default;use_org.apache.ant.antdsl.xtext.validation->default;use_org.eclipse.xtend2.lib->default;generate->default;use_org.eclipse.xtext.xbase.lib->default;use_org.apache.log4j->default;use_org.apache.ant.antdsl.xtext.parser.antlr->default;use_org.apache.ant.antdsl.xtext.parser.antlr.internal->default;use_org.apache.ant.antdsl.xtext.scoping->default;use_org.apache.ant.antdsl.xtext.formatting->default;default->default;use_org.apache.ant.antdsl.xtext.serializer->default;use_org.apache.ant.antdsl.xtext.antdsl->default;optional->default;use_org.apache.ant.antdsl.xtext.antdsl.impl->default;use_org.apache.ant.antdsl.xtext.generator->default;transitive-optional->default,optional,transitive-optional;use_org.apache.commons.logging->default;use_org.apache.ant.antdsl.xtext->default;use_org.apache.ant.antdsl.xtext.service
 s->default;antruntime->default"/>
-		<dependency org="bundle" name="org.eclipse.jface" rev="3.8.0.v20120521-2329" force="true" transitive="false" conf="use_org.apache.ant.antdsl.xtext.antdsl.util->default;use_org.apache.ant.antdsl.xtext.validation->default;use_org.eclipse.xtend2.lib->default;generate->default;use_org.eclipse.xtext.xbase.lib->default;use_org.apache.log4j->default;use_org.apache.ant.antdsl.xtext.parser.antlr->default;use_org.apache.ant.antdsl.xtext.parser.antlr.internal->default;use_org.apache.ant.antdsl.xtext.scoping->default;use_org.apache.ant.antdsl.xtext.formatting->default;default->default;use_org.apache.ant.antdsl.xtext.serializer->default;use_org.apache.ant.antdsl.xtext.antdsl->default;optional->default;use_org.apache.ant.antdsl.xtext.antdsl.impl->default;use_org.apache.ant.antdsl.xtext.generator->default;transitive-optional->use_org.eclipse.jface.window,default,use_org.eclipse.jface.bindings.keys.formatting,use_org.eclipse.jface.dialogs,optional,transitive-optional,use_org.eclipse.jface
 .bindings,use_org.eclipse.jface.bindings.keys;use_org.apache.commons.logging->default;use_org.apache.ant.antdsl.xtext->default;use_org.apache.ant.antdsl.xtext.services->default;antruntime->default"/>
 		<dependency org="bundle" name="org.eclipse.osgi" rev="3.8.0.v20120529-1548" force="true" transitive="false" conf="use_org.apache.ant.antdsl.xtext.antdsl.util->use_org.osgi.framework,use_org.eclipse.osgi.service.debug,use_org.eclipse.osgi.service.environment,use_org.eclipse.osgi.service.runnable,use_org.eclipse.osgi.framework.log,use_org.eclipse.osgi.service.urlconversion,use_org.eclipse.osgi.service.datalocation,use_org.eclipse.osgi.storagemanager,use_org.eclipse.osgi.util,default,use_org.osgi.util.tracker,use_org.eclipse.osgi.service.localization,use_org.eclipse.equinox.log,use_org.osgi.service.url,use_org.osgi.service.packageadmin,use_org.osgi.service.log;use_org.apache.ant.antdsl.xtext.validation->use_org.osgi.framework,use_org.eclipse.osgi.service.debug,use_org.eclipse.osgi.service.environment,use_org.eclipse.osgi.service.runnable,use_org.eclipse.osgi.framework.log,use_org.eclipse.osgi.service.urlconversion,use_org.eclipse.osgi.service.datalocation,use_org.eclipse.osgi
 .storagemanager,use_org.eclipse.osgi.util,default,use_org.osgi.util.tracker,use_org.eclipse.osgi.service.localization,use_org.eclipse.equinox.log,use_org.osgi.service.url,use_org.osgi.service.packageadmin,use_org.osgi.service.log;use_org.eclipse.xtend2.lib->use_org.osgi.framework,use_org.eclipse.osgi.service.debug,use_org.eclipse.osgi.service.environment,use_org.eclipse.osgi.service.runnable,use_org.eclipse.osgi.framework.log,use_org.eclipse.osgi.service.urlconversion,use_org.eclipse.osgi.service.datalocation,use_org.eclipse.osgi.storagemanager,use_org.eclipse.osgi.util,default,use_org.osgi.util.tracker,use_org.eclipse.osgi.service.localization,use_org.eclipse.equinox.log,use_org.osgi.service.url,use_org.osgi.service.packageadmin,use_org.osgi.service.log;generate->use_org.osgi.framework,use_org.eclipse.osgi.service.debug,use_org.eclipse.osgi.service.environment,use_org.eclipse.osgi.service.runnable,use_org.eclipse.osgi.framework.log,use_org.eclipse.osgi.service.urlconversion
 ,use_org.eclipse.osgi.service.datalocation,use_org.eclipse.osgi.storagemanager,use_org.eclipse.osgi.util,default,use_org.osgi.util.tracker,use_org.eclipse.osgi.service.localization,use_org.eclipse.equinox.log,use_org.osgi.service.url,use_org.osgi.service.packageadmin,use_org.osgi.service.log;use_org.eclipse.xtext.xbase.lib->use_org.osgi.framework,use_org.eclipse.osgi.service.debug,use_org.eclipse.osgi.service.environment,use_org.eclipse.osgi.service.runnable,use_org.eclipse.osgi.framework.log,use_org.eclipse.osgi.service.urlconversion,use_org.eclipse.osgi.service.datalocation,use_org.eclipse.osgi.storagemanager,use_org.eclipse.osgi.util,default,use_org.osgi.util.tracker,use_org.eclipse.osgi.service.localization,use_org.eclipse.equinox.log,use_org.osgi.service.url,use_org.osgi.service.packageadmin,use_org.osgi.service.log;use_org.apache.log4j->use_org.osgi.framework,use_org.eclipse.osgi.service.debug,use_org.eclipse.osgi.service.environment,use_org.eclipse.osgi.service.runnab
 le,use_org.eclipse.osgi.framework.log,use_org.eclipse.osgi.service.urlconversion,use_org.eclipse.osgi.service.datalocation,use_org.eclipse.osgi.storagemanager,use_org.eclipse.osgi.util,default,use_org.osgi.util.tracker,use_org.eclipse.osgi.service.localization,use_org.eclipse.equinox.log,use_org.osgi.service.url,use_org.osgi.service.packageadmin,use_org.osgi.service.log;use_org.apache.ant.antdsl.xtext.parser.antlr->use_org.osgi.framework,use_org.eclipse.osgi.service.debug,use_org.eclipse.osgi.service.environment,use_org.eclipse.osgi.service.runnable,use_org.eclipse.osgi.framework.log,use_org.eclipse.osgi.service.urlconversion,use_org.eclipse.osgi.service.datalocation,use_org.eclipse.osgi.storagemanager,use_org.eclipse.osgi.util,default,use_org.osgi.util.tracker,use_org.eclipse.osgi.service.localization,use_org.eclipse.equinox.log,use_org.osgi.service.url,use_org.osgi.service.packageadmin,use_org.osgi.service.log;use_org.apache.ant.antdsl.xtext.parser.antlr.internal->use_org.
 osgi.framework,use_org.eclipse.osgi.service.debug,use_org.eclipse.osgi.service.environment,use_org.eclipse.osgi.service.runnable,use_org.eclipse.osgi.framework.log,use_org.eclipse.osgi.service.urlconversion,use_org.eclipse.osgi.service.datalocation,use_org.eclipse.osgi.storagemanager,use_org.eclipse.osgi.util,default,use_org.osgi.util.tracker,use_org.eclipse.osgi.service.localization,use_org.eclipse.equinox.log,use_org.osgi.service.url,use_org.osgi.service.packageadmin,use_org.osgi.service.log;use_org.apache.ant.antdsl.xtext.scoping->use_org.osgi.framework,use_org.eclipse.osgi.service.debug,use_org.eclipse.osgi.service.environment,use_org.eclipse.osgi.service.runnable,use_org.eclipse.osgi.framework.log,use_org.eclipse.osgi.service.urlconversion,use_org.eclipse.osgi.service.datalocation,use_org.eclipse.osgi.storagemanager,use_org.eclipse.osgi.util,default,use_org.osgi.util.tracker,use_org.eclipse.osgi.service.localization,use_org.eclipse.equinox.log,use_org.osgi.service.url,u
 se_org.osgi.service.packageadmin,use_org.osgi.service.log;use_org.apache.ant.antdsl.xtext.formatting->use_org.osgi.framework,use_org.eclipse.osgi.service.debug,use_org.eclipse.osgi.service.environment,use_org.eclipse.osgi.service.runnable,use_org.eclipse.osgi.framework.log,use_org.eclipse.osgi.service.urlconversion,use_org.eclipse.osgi.service.datalocation,use_org.eclipse.osgi.storagemanager,use_org.eclipse.osgi.util,default,use_org.osgi.util.tracker,use_org.eclipse.osgi.service.localization,use_org.eclipse.equinox.log,use_org.osgi.service.url,use_org.osgi.service.packageadmin,use_org.osgi.service.log;default->use_org.osgi.framework,use_org.eclipse.osgi.service.debug,use_org.eclipse.osgi.service.environment,use_org.eclipse.osgi.service.runnable,use_org.eclipse.osgi.framework.log,use_org.eclipse.osgi.service.urlconversion,use_org.eclipse.osgi.service.datalocation,use_org.eclipse.osgi.storagemanager,use_org.eclipse.osgi.util,default,use_org.osgi.util.tracker,use_org.eclipse.os
 gi.service.localization,use_org.eclipse.equinox.log,use_org.osgi.service.url,use_org.osgi.service.packageadmin,use_org.osgi.service.log;use_org.apache.ant.antdsl.xtext.serializer->use_org.osgi.framework,use_org.eclipse.osgi.service.debug,use_org.eclipse.osgi.service.environment,use_org.eclipse.osgi.service.runnable,use_org.eclipse.osgi.framework.log,use_org.eclipse.osgi.service.urlconversion,use_org.eclipse.osgi.service.datalocation,use_org.eclipse.osgi.storagemanager,use_org.eclipse.osgi.util,default,use_org.osgi.util.tracker,use_org.eclipse.osgi.service.localization,use_org.eclipse.equinox.log,use_org.osgi.service.url,use_org.osgi.service.packageadmin,use_org.osgi.service.log;use_org.apache.ant.antdsl.xtext.antdsl->use_org.osgi.framework,use_org.eclipse.osgi.service.debug,use_org.eclipse.osgi.service.environment,use_org.eclipse.osgi.service.runnable,use_org.eclipse.osgi.framework.log,use_org.eclipse.osgi.service.urlconversion,use_org.eclipse.osgi.service.datalocation,use_o
 rg.eclipse.osgi.storagemanager,use_org.eclipse.osgi.util,default,use_org.osgi.util.tracker,use_org.eclipse.osgi.service.localization,use_org.eclipse.equinox.log,use_org.osgi.service.url,use_org.osgi.service.packageadmin,use_org.osgi.service.log;optional->use_org.osgi.framework,use_org.eclipse.osgi.service.debug,use_org.eclipse.osgi.service.environment,use_org.eclipse.osgi.service.runnable,use_org.eclipse.osgi.framework.log,use_org.eclipse.osgi.service.urlconversion,use_org.eclipse.osgi.service.datalocation,use_org.eclipse.osgi.storagemanager,use_org.eclipse.osgi.util,default,use_org.osgi.util.tracker,use_org.eclipse.osgi.service.localization,use_org.eclipse.equinox.log,use_org.osgi.service.url,use_org.osgi.service.packageadmin,use_org.osgi.service.log;use_org.apache.ant.antdsl.xtext.antdsl.impl->use_org.osgi.framework,use_org.eclipse.osgi.service.debug,use_org.eclipse.osgi.service.environment,use_org.eclipse.osgi.service.runnable,use_org.eclipse.osgi.framework.log,use_org.ec
 lipse.osgi.service.urlconversion,use_org.eclipse.osgi.service.datalocation,use_org.eclipse.osgi.storagemanager,use_org.eclipse.osgi.util,default,use_org.osgi.util.tracker,use_org.eclipse.osgi.service.localization,use_org.eclipse.equinox.log,use_org.osgi.service.url,use_org.osgi.service.packageadmin,use_org.osgi.service.log;use_org.apache.ant.antdsl.xtext.generator->use_org.osgi.framework,use_org.eclipse.osgi.service.debug,use_org.eclipse.osgi.service.environment,use_org.eclipse.osgi.service.runnable,use_org.eclipse.osgi.framework.log,use_org.eclipse.osgi.service.urlconversion,use_org.eclipse.osgi.service.datalocation,use_org.eclipse.osgi.storagemanager,use_org.eclipse.osgi.util,default,use_org.osgi.util.tracker,use_org.eclipse.osgi.service.localization,use_org.eclipse.equinox.log,use_org.osgi.service.url,use_org.osgi.service.packageadmin,use_org.osgi.service.log;transitive-optional->use_org.osgi.framework,use_org.eclipse.osgi.service.debug,use_org.eclipse.osgi.framework.even
 tmgr,use_org.eclipse.osgi.service.environment,use_org.eclipse.osgi.service.runnable,use_org.eclipse.osgi.framework.log,use_org.eclipse.osgi.signedcontent,use_org.eclipse.osgi.service.urlconversion,use_org.eclipse.osgi.service.datalocation,use_org.eclipse.osgi.storagemanager,use_org.eclipse.osgi.util,default,use_org.osgi.util.tracker,use_org.eclipse.osgi.service.localization,use_org.eclipse.equinox.log,use_org.osgi.service.url,use_org.eclipse.osgi.service.security,use_org.osgi.service.packageadmin,use_org.osgi.service.log;use_org.apache.commons.logging->use_org.osgi.framework,use_org.eclipse.osgi.service.debug,use_org.eclipse.osgi.service.environment,use_org.eclipse.osgi.service.runnable,use_org.eclipse.osgi.framework.log,use_org.eclipse.osgi.service.urlconversion,use_org.eclipse.osgi.service.datalocation,use_org.eclipse.osgi.storagemanager,use_org.eclipse.osgi.util,default,use_org.osgi.util.tracker,use_org.eclipse.osgi.service.localization,use_org.eclipse.equinox.log,use_org
 .osgi.service.url,use_org.osgi.service.packageadmin,use_org.osgi.service.log;use_org.apache.ant.antdsl.xtext->use_org.osgi.framework,use_org.eclipse.osgi.service.debug,use_org.eclipse.osgi.service.environment,use_org.eclipse.osgi.service.runnable,use_org.eclipse.osgi.framework.log,use_org.eclipse.osgi.service.urlconversion,use_org.eclipse.osgi.service.datalocation,use_org.eclipse.osgi.storagemanager,use_org.eclipse.osgi.util,default,use_org.osgi.util.tracker,use_org.eclipse.osgi.service.localization,use_org.eclipse.equinox.log,use_org.osgi.service.url,use_org.osgi.service.packageadmin,use_org.osgi.service.log;use_org.apache.ant.antdsl.xtext.services->use_org.osgi.framework,use_org.eclipse.osgi.service.debug,use_org.eclipse.osgi.service.environment,use_org.eclipse.osgi.service.runnable,use_org.eclipse.osgi.framework.log,use_org.eclipse.osgi.service.urlconversion,use_org.eclipse.osgi.service.datalocation,use_org.eclipse.osgi.storagemanager,use_org.eclipse.osgi.util,default,use
 _org.osgi.util.tracker,use_org.eclipse.osgi.service.localization,use_org.eclipse.equinox.log,use_org.osgi.service.url,use_org.osgi.service.packageadmin,use_org.osgi.service.log;antruntime->use_org.osgi.framework,use_org.eclipse.osgi.service.debug,use_org.eclipse.osgi.service.environment,use_org.eclipse.osgi.service.runnable,use_org.eclipse.osgi.framework.log,use_org.eclipse.osgi.service.urlconversion,use_org.eclipse.osgi.service.datalocation,use_org.eclipse.osgi.storagemanager,use_org.eclipse.osgi.util,default,use_org.osgi.util.tracker,use_org.eclipse.osgi.service.localization,use_org.eclipse.equinox.log,use_org.osgi.service.url,use_org.osgi.service.packageadmin,use_org.osgi.service.log"/>
 		<dependency org="bundle" name="org.eclipse.equinox.common" rev="3.6.100.v20120522-1841" force="true" transitive="false" conf="use_org.apache.ant.antdsl.xtext.antdsl.util->default;use_org.apache.ant.antdsl.xtext.validation->default;use_org.eclipse.xtend2.lib->default;generate->default;use_org.eclipse.xtext.xbase.lib->default;use_org.apache.log4j->default;use_org.apache.ant.antdsl.xtext.parser.antlr->default;use_org.apache.ant.antdsl.xtext.parser.antlr.internal->default;use_org.apache.ant.antdsl.xtext.scoping->default;use_org.apache.ant.antdsl.xtext.formatting->default;default->default;use_org.apache.ant.antdsl.xtext.serializer->default;use_org.apache.ant.antdsl.xtext.antdsl->default;optional->default;use_org.apache.ant.antdsl.xtext.antdsl.impl->default;use_org.apache.ant.antdsl.xtext.generator->default;transitive-optional->default,use_org.eclipse.core.internal.runtime;use_org.apache.commons.logging->default;use_org.apache.ant.antdsl.xtext->default;use_org.apache.ant.antdsl.
 xtext.services->default;antruntime->default"/>
 		<dependency org="bundle" name="org.eclipse.core.jobs" rev="3.5.200.v20120521-2346" force="true" transitive="false" conf="use_org.apache.ant.antdsl.xtext.antdsl.util->default;use_org.apache.ant.antdsl.xtext.validation->default;use_org.eclipse.xtend2.lib->default;generate->default;use_org.eclipse.xtext.xbase.lib->default;use_org.apache.log4j->default;use_org.apache.ant.antdsl.xtext.parser.antlr->default;use_org.apache.ant.antdsl.xtext.parser.antlr.internal->default;use_org.apache.ant.antdsl.xtext.scoping->default;use_org.apache.ant.antdsl.xtext.formatting->default;default->default;use_org.apache.ant.antdsl.xtext.serializer->default;use_org.apache.ant.antdsl.xtext.antdsl->default;optional->default;use_org.apache.ant.antdsl.xtext.antdsl.impl->default;use_org.apache.ant.antdsl.xtext.generator->default;transitive-optional->default,use_org.eclipse.core.runtime.jobs;use_org.apache.commons.logging->default;use_org.apache.ant.antdsl.xtext->default;use_org.apache.ant.antdsl.xtext.ser
 vices->default;antruntime->default"/>
@@ -45,53 +49,50 @@
 		<dependency org="bundle" name="org.eclipse.equinox.preferences" rev="3.5.0.v20120522-1841" force="true" transitive="false" conf="use_org.apache.ant.antdsl.xtext.antdsl.util->default;use_org.apache.ant.antdsl.xtext.validation->default;use_org.eclipse.xtend2.lib->default;generate->default;use_org.eclipse.xtext.xbase.lib->default;use_org.apache.log4j->default;use_org.apache.ant.antdsl.xtext.parser.antlr->default;use_org.apache.ant.antdsl.xtext.parser.antlr.internal->default;use_org.apache.ant.antdsl.xtext.scoping->default;use_org.apache.ant.antdsl.xtext.formatting->default;default->default;use_org.apache.ant.antdsl.xtext.serializer->default;use_org.apache.ant.antdsl.xtext.antdsl->default;optional->default;use_org.apache.ant.antdsl.xtext.antdsl.impl->default;use_org.apache.ant.antdsl.xtext.generator->default;transitive-optional->use_org.osgi.service.prefs,default,use_org.eclipse.core.runtime.preferences,use_org.eclipse.core.internal.preferences;use_org.apache.commons.logging->
 default;use_org.apache.ant.antdsl.xtext->default;use_org.apache.ant.antdsl.xtext.services->default;antruntime->default"/>
 		<dependency org="bundle" name="org.eclipse.core.contenttype" rev="3.4.200.v20120523-2004" force="true" transitive="false" conf="use_org.apache.ant.antdsl.xtext.antdsl.util->default;use_org.apache.ant.antdsl.xtext.validation->default;use_org.eclipse.xtend2.lib->default;generate->default;use_org.eclipse.xtext.xbase.lib->default;use_org.apache.log4j->default;use_org.apache.ant.antdsl.xtext.parser.antlr->default;use_org.apache.ant.antdsl.xtext.parser.antlr.internal->default;use_org.apache.ant.antdsl.xtext.scoping->default;use_org.apache.ant.antdsl.xtext.formatting->default;default->default;use_org.apache.ant.antdsl.xtext.serializer->default;use_org.apache.ant.antdsl.xtext.antdsl->default;optional->default;use_org.apache.ant.antdsl.xtext.antdsl.impl->default;use_org.apache.ant.antdsl.xtext.generator->default;transitive-optional->default;use_org.apache.commons.logging->default;use_org.apache.ant.antdsl.xtext->default;use_org.apache.ant.antdsl.xtext.services->default;antruntime->
 default"/>
 		<dependency org="bundle" name="org.eclipse.equinox.app" rev="1.3.100.v20120522-1841" force="true" transitive="false" conf="use_org.apache.ant.antdsl.xtext.antdsl.util->default;use_org.apache.ant.antdsl.xtext.validation->default;use_org.eclipse.xtend2.lib->default;generate->default;use_org.eclipse.xtext.xbase.lib->default;use_org.apache.log4j->default;use_org.apache.ant.antdsl.xtext.parser.antlr->default;use_org.apache.ant.antdsl.xtext.parser.antlr.internal->default;use_org.apache.ant.antdsl.xtext.scoping->default;use_org.apache.ant.antdsl.xtext.formatting->default;default->default;use_org.apache.ant.antdsl.xtext.serializer->default;use_org.apache.ant.antdsl.xtext.antdsl->default;optional->default;use_org.apache.ant.antdsl.xtext.antdsl.impl->default;use_org.apache.ant.antdsl.xtext.generator->default;transitive-optional->default;use_org.apache.commons.logging->default;use_org.apache.ant.antdsl.xtext->default;use_org.apache.ant.antdsl.xtext.services->default;antruntime->defau
 lt"/>
-		<dependency org="bundle" name="org.eclipse.swt" rev="3.100.0.v4233d" force="true" transitive="false" conf="use_org.apache.ant.antdsl.xtext.antdsl.util->default;use_org.apache.ant.antdsl.xtext.validation->default;use_org.eclipse.xtend2.lib->default;generate->default;use_org.eclipse.xtext.xbase.lib->default;use_org.apache.log4j->default;use_org.apache.ant.antdsl.xtext.parser.antlr->default;use_org.apache.ant.antdsl.xtext.parser.antlr.internal->default;use_org.apache.ant.antdsl.xtext.scoping->default;use_org.apache.ant.antdsl.xtext.formatting->default;default->default;use_org.apache.ant.antdsl.xtext.serializer->default;use_org.apache.ant.antdsl.xtext.antdsl->default;optional->default;use_org.apache.ant.antdsl.xtext.antdsl.impl->default;use_org.apache.ant.antdsl.xtext.generator->default;transitive-optional->default;use_org.apache.commons.logging->default;use_org.apache.ant.antdsl.xtext->default;use_org.apache.ant.antdsl.xtext.services->default;antruntime->default"/>
-		<dependency org="bundle" name="org.eclipse.core.commands" rev="3.6.1.v20120521-2332" force="true" transitive="false" conf="use_org.apache.ant.antdsl.xtext.antdsl.util->default;use_org.apache.ant.antdsl.xtext.validation->default;use_org.eclipse.xtend2.lib->default;generate->default;use_org.eclipse.xtext.xbase.lib->default;use_org.apache.log4j->default;use_org.apache.ant.antdsl.xtext.parser.antlr->default;use_org.apache.ant.antdsl.xtext.parser.antlr.internal->default;use_org.apache.ant.antdsl.xtext.scoping->default;use_org.apache.ant.antdsl.xtext.formatting->default;default->default;use_org.apache.ant.antdsl.xtext.serializer->default;use_org.apache.ant.antdsl.xtext.antdsl->default;optional->default;use_org.apache.ant.antdsl.xtext.antdsl.impl->default;use_org.apache.ant.antdsl.xtext.generator->default;transitive-optional->default,use_org.eclipse.core.commands.common,use_org.eclipse.core.commands;use_org.apache.commons.logging->default;use_org.apache.ant.antdsl.xtext->default;
 use_org.apache.ant.antdsl.xtext.services->default;antruntime->default"/>
-		<dependency org="bundle" name="org.eclipse.xtext" rev="2.3.0.v201206120633" force="true" transitive="false" conf="use_org.apache.ant.antdsl.xtext.antdsl.util->default;use_org.apache.ant.antdsl.xtext.validation->default;use_org.eclipse.xtend2.lib->default;use_org.eclipse.xtext.xbase.lib->default;use_org.apache.log4j->default;use_org.apache.ant.antdsl.xtext.parser.antlr->default;use_org.apache.ant.antdsl.xtext.parser.antlr.internal->default;use_org.apache.ant.antdsl.xtext.scoping->default;use_org.apache.ant.antdsl.xtext.formatting->default;default->default;use_org.apache.ant.antdsl.xtext.serializer->default;use_org.apache.ant.antdsl.xtext.antdsl->default;optional->default;use_org.apache.ant.antdsl.xtext.antdsl.impl->default;use_org.apache.ant.antdsl.xtext.generator->default;transitive-optional->default,optional,transitive-optional;use_org.apache.commons.logging->default;use_org.apache.ant.antdsl.xtext->default;use_org.apache.ant.antdsl.xtext.services->default"/>
-		<dependency org="bundle" name="org.eclipse.xtext.util" rev="2.3.0.v201206120633" force="true" transitive="false" conf="use_org.apache.ant.antdsl.xtext.antdsl.util->default;use_org.apache.ant.antdsl.xtext.validation->default;use_org.eclipse.xtend2.lib->default;use_org.eclipse.xtext.xbase.lib->default;use_org.apache.log4j->default;use_org.apache.ant.antdsl.xtext.parser.antlr->default;use_org.apache.ant.antdsl.xtext.parser.antlr.internal->default;use_org.apache.ant.antdsl.xtext.scoping->default;use_org.apache.ant.antdsl.xtext.formatting->default;default->default;use_org.apache.ant.antdsl.xtext.serializer->default;use_org.apache.ant.antdsl.xtext.antdsl->default;optional->default;use_org.apache.ant.antdsl.xtext.antdsl.impl->default;use_org.apache.ant.antdsl.xtext.generator->default;transitive-optional->default,optional,transitive-optional;use_org.apache.commons.logging->default;use_org.apache.ant.antdsl.xtext->default;use_org.apache.ant.antdsl.xtext.services->default"/>
-		<dependency org="bundle" name="org.eclipse.emf.ecore" rev="2.8.0.v20120606-0717" force="true" transitive="false" conf="use_org.apache.ant.antdsl.xtext.antdsl.util->default;use_org.apache.ant.antdsl.xtext.validation->default;use_org.eclipse.xtend2.lib->default;use_org.eclipse.xtext.xbase.lib->default;use_org.apache.log4j->default;use_org.apache.ant.antdsl.xtext.parser.antlr->default;use_org.apache.ant.antdsl.xtext.parser.antlr.internal->default;use_org.apache.ant.antdsl.xtext.scoping->default;use_org.apache.ant.antdsl.xtext.formatting->default;default->default;use_org.apache.ant.antdsl.xtext.serializer->default;use_org.apache.ant.antdsl.xtext.antdsl->default;optional->default;use_org.apache.ant.antdsl.xtext.antdsl.impl->default;use_org.apache.ant.antdsl.xtext.generator->default;transitive-optional->default,use_org.eclipse.emf.ecore,use_org.eclipse.emf.ecore.util;use_org.apache.commons.logging->default;use_org.apache.ant.antdsl.xtext->default;use_org.apache.ant.antdsl.xtext.
 services->default"/>
-		<dependency org="bundle" name="org.eclipse.emf.common" rev="2.8.0.v20120606-0717" force="true" transitive="false" conf="use_org.apache.ant.antdsl.xtext.antdsl.util->default;use_org.apache.ant.antdsl.xtext.validation->default;use_org.eclipse.xtend2.lib->default;use_org.eclipse.xtext.xbase.lib->default;use_org.apache.log4j->default;use_org.apache.ant.antdsl.xtext.parser.antlr->default;use_org.apache.ant.antdsl.xtext.parser.antlr.internal->default;use_org.apache.ant.antdsl.xtext.scoping->default;use_org.apache.ant.antdsl.xtext.formatting->default;default->default;use_org.apache.ant.antdsl.xtext.serializer->default;use_org.apache.ant.antdsl.xtext.antdsl->default;optional->default;use_org.apache.ant.antdsl.xtext.antdsl.impl->default;use_org.apache.ant.antdsl.xtext.generator->default;transitive-optional->default,use_org.eclipse.emf.common.util;use_org.apache.commons.logging->default;use_org.apache.ant.antdsl.xtext->default;use_org.apache.ant.antdsl.xtext.services->default"/>
-		<dependency org="bundle" name="org.antlr.runtime" rev="3.2.0.v201101311130" force="true" transitive="false" conf="use_org.apache.ant.antdsl.xtext.antdsl.util->default;use_org.apache.ant.antdsl.xtext.validation->default;use_org.eclipse.xtend2.lib->default;use_org.eclipse.xtext.xbase.lib->default;use_org.apache.log4j->default;use_org.apache.ant.antdsl.xtext.parser.antlr->default;use_org.apache.ant.antdsl.xtext.parser.antlr.internal->default;use_org.apache.ant.antdsl.xtext.scoping->default;use_org.apache.ant.antdsl.xtext.formatting->default;default->default;use_org.apache.ant.antdsl.xtext.serializer->default;use_org.apache.ant.antdsl.xtext.antdsl->default;optional->default;use_org.apache.ant.antdsl.xtext.antdsl.impl->default;use_org.apache.ant.antdsl.xtext.generator->default;transitive-optional->default;use_org.apache.commons.logging->default;use_org.apache.ant.antdsl.xtext->default;use_org.apache.ant.antdsl.xtext.services->default"/>
-		<dependency org="bundle" name="org.eclipse.xtext.common.types" rev="2.3.0.v201206120633" force="true" transitive="false" conf="use_org.apache.ant.antdsl.xtext.antdsl.util->default;use_org.apache.ant.antdsl.xtext.validation->default;use_org.eclipse.xtend2.lib->default;use_org.eclipse.xtext.xbase.lib->default;use_org.apache.log4j->default;use_org.apache.ant.antdsl.xtext.parser.antlr->default;use_org.apache.ant.antdsl.xtext.parser.antlr.internal->default;use_org.apache.ant.antdsl.xtext.scoping->default;use_org.apache.ant.antdsl.xtext.formatting->default;default->default;use_org.apache.ant.antdsl.xtext.serializer->default;use_org.apache.ant.antdsl.xtext.antdsl->default;optional->default;use_org.apache.ant.antdsl.xtext.antdsl.impl->default;use_org.apache.ant.antdsl.xtext.generator->default;transitive-optional->default,optional,transitive-optional;use_org.apache.commons.logging->default;use_org.apache.ant.antdsl.xtext->default;use_org.apache.ant.antdsl.xtext.services->default"/>
-		<dependency org="bundle" name="org.apache.ant" rev="1.8.3.v20120321-1730" force="true" transitive="false" conf="use_org.apache.ant.antdsl.xtext.antdsl.util->default;use_org.apache.ant.antdsl.xtext.validation->default;use_org.eclipse.xtend2.lib->default;use_org.eclipse.xtext.xbase.lib->default;use_org.apache.log4j->default;use_org.apache.ant.antdsl.xtext.parser.antlr->default;use_org.apache.ant.antdsl.xtext.parser.antlr.internal->default;use_org.apache.ant.antdsl.xtext.scoping->default;use_org.apache.ant.antdsl.xtext.formatting->default;default->default;use_org.apache.ant.antdsl.xtext.serializer->default;use_org.apache.ant.antdsl.xtext.antdsl->default;optional->default;use_org.apache.ant.antdsl.xtext.antdsl.impl->default;use_org.apache.ant.antdsl.xtext.generator->default;transitive-optional->default,optional,transitive-optional;use_org.apache.commons.logging->default;use_org.apache.ant.antdsl.xtext->default;use_org.apache.ant.antdsl.xtext.services->default"/>
-		<dependency org="bundle" name="org.eclipse.emf.ecore.xmi" rev="2.8.0.v20120606-0717" force="true" transitive="false" conf="use_org.apache.ant.antdsl.xtext.antdsl.util->default;use_org.apache.ant.antdsl.xtext.validation->default;use_org.eclipse.xtend2.lib->default;use_org.eclipse.xtext.xbase.lib->default;use_org.apache.log4j->default;use_org.apache.ant.antdsl.xtext.parser.antlr->default;use_org.apache.ant.antdsl.xtext.parser.antlr.internal->default;use_org.apache.ant.antdsl.xtext.scoping->default;use_org.apache.ant.antdsl.xtext.formatting->default;default->default;use_org.apache.ant.antdsl.xtext.serializer->default;use_org.apache.ant.antdsl.xtext.antdsl->default;optional->default;use_org.apache.ant.antdsl.xtext.antdsl.impl->default;use_org.apache.ant.antdsl.xtext.generator->default;transitive-optional->default;use_org.apache.commons.logging->default;use_org.apache.ant.antdsl.xtext->default;use_org.apache.ant.antdsl.xtext.services->default"/>
-		<dependency org="bundle" name="com.google.inject" rev="3.0.0.v201203062045" force="true" transitive="false" conf="use_org.apache.ant.antdsl.xtext.antdsl.util->default;use_org.apache.ant.antdsl.xtext.validation->default;use_org.eclipse.xtend2.lib->default;use_org.eclipse.xtext.xbase.lib->default;use_org.apache.log4j->default;use_org.apache.ant.antdsl.xtext.parser.antlr->default;use_org.apache.ant.antdsl.xtext.parser.antlr.internal->default;use_org.apache.ant.antdsl.xtext.scoping->default;use_org.apache.ant.antdsl.xtext.formatting->default;default->default;use_org.apache.ant.antdsl.xtext.serializer->default;use_org.apache.ant.antdsl.xtext.antdsl->default;optional->default;use_org.apache.ant.antdsl.xtext.antdsl.impl->default;use_org.apache.ant.antdsl.xtext.generator->default;transitive-optional->default,optional,transitive-optional;use_org.apache.commons.logging->default;use_org.apache.ant.antdsl.xtext->default;use_org.apache.ant.antdsl.xtext.services->default"/>
-		<dependency org="bundle" name="javax.inject" rev="1.0.0.v20091030" force="true" transitive="false" conf="use_org.apache.ant.antdsl.xtext.antdsl.util->default,use_javax.inject;use_org.apache.ant.antdsl.xtext.validation->default,use_javax.inject;use_org.eclipse.xtend2.lib->default,use_javax.inject;use_org.eclipse.xtext.xbase.lib->default,use_javax.inject;use_org.apache.log4j->default,use_javax.inject;use_org.apache.ant.antdsl.xtext.parser.antlr->default,use_javax.inject;use_org.apache.ant.antdsl.xtext.parser.antlr.internal->default,use_javax.inject;use_org.apache.ant.antdsl.xtext.scoping->default,use_javax.inject;use_org.apache.ant.antdsl.xtext.formatting->default,use_javax.inject;default->default,use_javax.inject;use_org.apache.ant.antdsl.xtext.serializer->default,use_javax.inject;use_org.apache.ant.antdsl.xtext.antdsl->default,use_javax.inject;optional->default,use_javax.inject;use_org.apache.ant.antdsl.xtext.antdsl.impl->default,use_javax.inject;use_org.apache.ant.antdsl.
 xtext.generator->default,use_javax.inject;transitive-optional->default,optional,transitive-optional,use_javax.inject;use_org.apache.commons.logging->default,use_javax.inject;use_org.apache.ant.antdsl.xtext->default,use_javax.inject;use_org.apache.ant.antdsl.xtext.services->default,use_javax.inject"/>
-		<dependency org="bundle" name="org.eclipse.xtext.xbase.lib" rev="2.3.0.v201206120633" force="true" transitive="false" conf="use_org.apache.ant.antdsl.xtext.antdsl.util->use_org.eclipse.xtend2.lib,default,use_org.eclipse.xtext.xbase.lib;use_org.apache.ant.antdsl.xtext.validation->use_org.eclipse.xtend2.lib,default,use_org.eclipse.xtext.xbase.lib;use_org.eclipse.xtend2.lib->use_org.eclipse.xtend2.lib,default,use_org.eclipse.xtext.xbase.lib;use_org.eclipse.xtext.xbase.lib->use_org.eclipse.xtend2.lib,default,use_org.eclipse.xtext.xbase.lib;use_org.apache.log4j->use_org.eclipse.xtend2.lib,default,use_org.eclipse.xtext.xbase.lib;use_org.apache.ant.antdsl.xtext.parser.antlr->use_org.eclipse.xtend2.lib,default,use_org.eclipse.xtext.xbase.lib;use_org.apache.ant.antdsl.xtext.parser.antlr.internal->use_org.eclipse.xtend2.lib,default,use_org.eclipse.xtext.xbase.lib;use_org.apache.ant.antdsl.xtext.scoping->use_org.eclipse.xtend2.lib,default,use_org.eclipse.xtext.xbase.lib;use_org.apach
 e.ant.antdsl.xtext.formatting->use_org.eclipse.xtend2.lib,default,use_org.eclipse.xtext.xbase.lib;default->use_org.eclipse.xtend2.lib,default,use_org.eclipse.xtext.xbase.lib;use_org.apache.ant.antdsl.xtext.serializer->use_org.eclipse.xtend2.lib,default,use_org.eclipse.xtext.xbase.lib;use_org.apache.ant.antdsl.xtext.antdsl->use_org.eclipse.xtend2.lib,default,use_org.eclipse.xtext.xbase.lib;optional->use_org.eclipse.xtend2.lib,default,use_org.eclipse.xtext.xbase.lib;use_org.apache.ant.antdsl.xtext.antdsl.impl->use_org.eclipse.xtend2.lib,default,use_org.eclipse.xtext.xbase.lib;use_org.apache.ant.antdsl.xtext.generator->use_org.eclipse.xtend2.lib,default,use_org.eclipse.xtext.xbase.lib;transitive-optional->use_org.eclipse.xtend2.lib,default,use_org.eclipse.xtext.xbase.lib,optional,transitive-optional;use_org.apache.commons.logging->use_org.eclipse.xtend2.lib,default,use_org.eclipse.xtext.xbase.lib;use_org.apache.ant.antdsl.xtext->use_org.eclipse.xtend2.lib,default,use_org.eclips
 e.xtext.xbase.lib;use_org.apache.ant.antdsl.xtext.services->use_org.eclipse.xtend2.lib,default,use_org.eclipse.xtext.xbase.lib"/>
-		<dependency org="bundle" name="com.google.guava" rev="10.0.1.v201203051515" force="true" transitive="false" conf="use_org.apache.ant.antdsl.xtext.antdsl.util->default;use_org.apache.ant.antdsl.xtext.validation->default;use_org.eclipse.xtend2.lib->default;use_org.eclipse.xtext.xbase.lib->default;use_org.apache.log4j->default;use_org.apache.ant.antdsl.xtext.parser.antlr->default;use_org.apache.ant.antdsl.xtext.parser.antlr.internal->default;use_org.apache.ant.antdsl.xtext.scoping->default;use_org.apache.ant.antdsl.xtext.formatting->default;default->default;use_org.apache.ant.antdsl.xtext.serializer->default;use_org.apache.ant.antdsl.xtext.antdsl->default;optional->default;use_org.apache.ant.antdsl.xtext.antdsl.impl->default;use_org.apache.ant.antdsl.xtext.generator->default;transitive-optional->default,use_com.google.common.base,optional,use_com.google.common.collect,transitive-optional;use_org.apache.commons.logging->default;use_org.apache.ant.antdsl.xtext->default;use_org.
 apache.ant.antdsl.xtext.services->default"/>
-		<dependency org="bundle" name="org.eclipse.xtext.xbase" rev="2.3.0.v201206120633" force="true" transitive="false" conf="optional->default;transitive-optional->default,optional,transitive-optional"/>
-		<dependency org="bundle" name="org.eclipse.xtext.generator" rev="2.3.0.v201206120633" force="true" transitive="false" conf="optional->default;transitive-optional->default,optional,transitive-optional"/>
-		<dependency org="bundle" name="org.eclipse.emf.codegen.ecore" rev="2.8.0.v20120608-0554" force="true" transitive="false" conf="optional->default;transitive-optional->default,optional,transitive-optional"/>
-		<dependency org="bundle" name="org.eclipse.emf.mwe.utils" rev="1.2.1.v201206110920" force="true" transitive="false" conf="optional->default,use_org.eclipse.emf.mwe.utils;transitive-optional->default,use_org.eclipse.emf.mwe.utils,optional,transitive-optional"/>
-		<dependency org="bundle" name="org.eclipse.emf.mwe2.launch" rev="2.3.0.v201206120758" force="true" transitive="false" conf="optional->default;transitive-optional->default,optional,transitive-optional"/>
-		<dependency org="bundle" name="org.eclipse.xtend.lib" rev="2.3.0.v201206120633" force="true" transitive="false" conf="optional->default;transitive-optional->default"/>
-		<dependency org="bundle" name="org.eclipse.xtend" rev="1.2.0.v201206110941" force="true" transitive="false" conf="optional->default;transitive-optional->default,optional,transitive-optional"/>
-		<dependency org="bundle" name="org.eclipse.xpand" rev="1.2.0.v201206110941" force="true" transitive="false" conf="optional->default;transitive-optional->default"/>
-		<dependency org="bundle" name="org.eclipse.xtend.typesystem.emf" rev="1.2.0.v201206110941" force="true" transitive="false" conf="optional->default;transitive-optional->default,optional,transitive-optional"/>
-		<dependency org="bundle" name="org.eclipse.xtext.ecore" rev="2.3.0.v201206120633" force="true" transitive="false" conf="optional->default;transitive-optional->default"/>
-		<dependency org="bundle" name="org.eclipse.emf.mwe.core" rev="1.2.1.v201206110920" force="true" transitive="false" conf="optional->default;transitive-optional->default,optional,transitive-optional"/>
-		<dependency org="bundle" name="org.apache.commons.cli" rev="1.2.0.v201105210650" force="true" transitive="false" conf="optional->default;transitive-optional->default"/>
-		<dependency org="bundle" name="org.eclipse.emf.mwe2.runtime" rev="2.3.0.v201206110920" force="true" transitive="false" conf="optional->default;transitive-optional->default"/>
-		<dependency org="bundle" name="org.apache.commons.lang" rev="2.6.0.v201205030909" force="true" transitive="false" conf="optional->default;transitive-optional->default"/>
-		<dependency org="bundle" name="org.eclipse.core.resources" rev="3.8.0.v20120522-2034" force="true" transitive="false" conf="optional->default;transitive-optional->default,optional,transitive-optional"/>
-		<dependency org="bundle" name="org.eclipse.jdt.core" rev="3.8.1.v_OTDT_r210_201206090452" force="true" transitive="false" conf="optional->default;transitive-optional->default,optional,transitive-optional"/>
-		<dependency org="bundle" name="org.eclipse.jdt.launching" rev="3.6.100.v20120523-1953" force="true" transitive="false" conf="optional->default;transitive-optional->default,optional,transitive-optional"/>
-		<dependency org="bundle" name="org.eclipse.emf.codegen" rev="2.8.0.v20120608-0554" force="true" transitive="false" conf="optional->default;transitive-optional->default,optional,transitive-optional"/>
-		<dependency org="bundle" name="org.eclipse.text" rev="3.5.200.v20120523-1310" force="true" transitive="false" conf="optional->default;transitive-optional->default"/>
-		<dependency org="bundle" name="org.eclipse.core.expressions" rev="3.4.400.v20120523-2004" force="true" transitive="false" conf="optional->default;transitive-optional->default"/>
-		<dependency org="bundle" name="org.eclipse.core.filesystem" rev="1.3.200.v20120522-2012" force="true" transitive="false" conf="optional->default;transitive-optional->default"/>
-		<dependency org="bundle" name="org.eclipse.jdt.annotation" rev="1.0.0.v20120522-1651" force="true" transitive="false" conf="optional->default;transitive-optional->default,optional,transitive-optional"/>
-		<dependency org="bundle" name="org.eclipse.debug.core" rev="3.7.100.v20120521-2012" force="true" transitive="false" conf="optional->default;transitive-optional->default,optional,transitive-optional"/>
-		<dependency org="bundle" name="org.eclipse.jdt.debug" rev="3.7.100.v20120529-1702" force="true" transitive="false" conf="optional->default;transitive-optional->default"/>
-		<dependency org="bundle" name="org.eclipse.core.variables" rev="3.2.600.v20120521-2012" force="true" transitive="false" conf="optional->default;transitive-optional->default"/>
-		<dependency org="bundle" name="org.eclipse.emf.mwe2.language" rev="2.3.0.v201206120758" force="true" transitive="false" conf="optional->default;transitive-optional->default"/>
+		<dependency org="bundle" name="org.slf4j.log4j" rev="1.6.4.v20120130-2120" force="true" transitive="false" conf="use_org.apache.ant.antdsl.xtext.antdsl.util->default,use_org.apache.log4j;use_org.apache.ant.antdsl.xtext.validation->default,use_org.apache.log4j;use_org.eclipse.xtend2.lib->default,use_org.apache.log4j;generate->default,use_org.apache.log4j;use_org.eclipse.xtext.xbase.lib->default,use_org.apache.log4j;use_org.apache.log4j->default,use_org.apache.log4j;use_org.apache.ant.antdsl.xtext.parser.antlr->default,use_org.apache.log4j;use_org.apache.ant.antdsl.xtext.parser.antlr.internal->default,use_org.apache.log4j;use_org.apache.ant.antdsl.xtext.scoping->default,use_org.apache.log4j;use_org.apache.ant.antdsl.xtext.formatting->default,use_org.apache.log4j;default->default,use_org.apache.log4j;use_org.apache.ant.antdsl.xtext.serializer->default,use_org.apache.log4j;use_org.apache.ant.antdsl.xtext.antdsl->default,use_org.apache.log4j;optional->default,use_org.apache.log
 4j;use_org.apache.ant.antdsl.xtext.antdsl.impl->default,use_org.apache.log4j;use_org.apache.ant.antdsl.xtext.generator->default,use_org.apache.log4j;transitive-optional->default,use_org.apache.log4j;use_org.apache.commons.logging->default,use_org.apache.log4j;use_org.apache.ant.antdsl.xtext->default,use_org.apache.log4j;use_org.apache.ant.antdsl.xtext.services->default,use_org.apache.log4j;antruntime->default,use_org.apache.log4j"/>
+		<dependency org="bundle" name="org.slf4j.api" rev="1.6.4.v20120130-2120" force="true" transitive="false" conf="use_org.apache.ant.antdsl.xtext.antdsl.util->default,use_org.slf4j.spi,use_org.slf4j;use_org.apache.ant.antdsl.xtext.validation->default,use_org.slf4j.spi,use_org.slf4j;use_org.eclipse.xtend2.lib->default,use_org.slf4j.spi,use_org.slf4j;generate->default,use_org.slf4j.spi,use_org.slf4j;use_org.eclipse.xtext.xbase.lib->default,use_org.slf4j.spi,use_org.slf4j;use_org.apache.log4j->default,use_org.slf4j.spi,use_org.slf4j;use_org.apache.ant.antdsl.xtext.parser.antlr->default,use_org.slf4j.spi,use_org.slf4j;use_org.apache.ant.antdsl.xtext.parser.antlr.internal->default,use_org.slf4j.spi,use_org.slf4j;use_org.apache.ant.antdsl.xtext.scoping->default,use_org.slf4j.spi,use_org.slf4j;use_org.apache.ant.antdsl.xtext.formatting->default,use_org.slf4j.spi,use_org.slf4j;default->default,use_org.slf4j.spi,use_org.slf4j;use_org.apache.ant.antdsl.xtext.serializer->default,use_org
 .slf4j.spi,use_org.slf4j;use_org.apache.ant.antdsl.xtext.antdsl->default,use_org.slf4j.spi,use_org.slf4j;optional->default,use_org.slf4j.spi,use_org.slf4j;use_org.apache.ant.antdsl.xtext.antdsl.impl->default,use_org.slf4j.spi,use_org.slf4j;use_org.apache.ant.antdsl.xtext.generator->default,use_org.slf4j.spi,use_org.slf4j;transitive-optional->default,use_org.slf4j.spi,use_org.slf4j;use_org.apache.commons.logging->default,use_org.slf4j.spi,use_org.slf4j;use_org.apache.ant.antdsl.xtext->default,use_org.slf4j.spi,use_org.slf4j;use_org.apache.ant.antdsl.xtext.services->default,use_org.slf4j.spi,use_org.slf4j;antruntime->default,use_org.slf4j.spi,use_org.slf4j"/>
+		<dependency org="bundle" name="com.google.inject" rev="3.0.0.v201203062045" force="true" transitive="false" conf="use_org.apache.ant.antdsl.xtext.antdsl.util->default;use_org.apache.ant.antdsl.xtext.validation->default;use_org.eclipse.xtend2.lib->default;generate->default;use_org.eclipse.xtext.xbase.lib->default;use_org.apache.log4j->default;use_org.apache.ant.antdsl.xtext.parser.antlr->default;use_org.apache.ant.antdsl.xtext.parser.antlr.internal->default;use_org.apache.ant.antdsl.xtext.scoping->default;use_org.apache.ant.antdsl.xtext.formatting->default;default->default;use_org.apache.ant.antdsl.xtext.serializer->default;use_org.apache.ant.antdsl.xtext.antdsl->default;optional->default;use_org.apache.ant.antdsl.xtext.antdsl.impl->default;use_org.apache.ant.antdsl.xtext.generator->default;transitive-optional->default,optional,transitive-optional;use_org.apache.commons.logging->default;use_org.apache.ant.antdsl.xtext->default;use_org.apache.ant.antdsl.xtext.services->defau
 lt;antruntime->default"/>
+		<dependency org="bundle" name="javax.inject" rev="1.0.0.v20091030" force="true" transitive="false" conf="use_org.apache.ant.antdsl.xtext.antdsl.util->default,use_javax.inject;use_org.apache.ant.antdsl.xtext.validation->default,use_javax.inject;use_org.eclipse.xtend2.lib->default,use_javax.inject;generate->default,use_javax.inject;use_org.eclipse.xtext.xbase.lib->default,use_javax.inject;use_org.apache.log4j->default,use_javax.inject;use_org.apache.ant.antdsl.xtext.parser.antlr->default,use_javax.inject;use_org.apache.ant.antdsl.xtext.parser.antlr.internal->default,use_javax.inject;use_org.apache.ant.antdsl.xtext.scoping->default,use_javax.inject;use_org.apache.ant.antdsl.xtext.formatting->default,use_javax.inject;default->default,use_javax.inject;use_org.apache.ant.antdsl.xtext.serializer->default,use_javax.inject;use_org.apache.ant.antdsl.xtext.antdsl->default,use_javax.inject;optional->default,use_javax.inject;use_org.apache.ant.antdsl.xtext.antdsl.impl->default,use_java
 x.inject;use_org.apache.ant.antdsl.xtext.generator->default,use_javax.inject;transitive-optional->default,optional,transitive-optional,use_javax.inject;use_org.apache.commons.logging->default,use_javax.inject;use_org.apache.ant.antdsl.xtext->default,use_javax.inject;use_org.apache.ant.antdsl.xtext.services->default,use_javax.inject;antruntime->default,use_javax.inject"/>
+		<dependency org="bundle" name="org.apache.commons.logging" rev="1.1.1.v201101211721" force="true" transitive="false" conf="use_org.apache.ant.antdsl.xtext.antdsl.util->default,use_org.apache.commons.logging;use_org.apache.ant.antdsl.xtext.validation->default,use_org.apache.commons.logging;use_org.eclipse.xtend2.lib->default,use_org.apache.commons.logging;generate->default,use_org.apache.commons.logging;use_org.eclipse.xtext.xbase.lib->default,use_org.apache.commons.logging;use_org.apache.log4j->default,use_org.apache.commons.logging;use_org.apache.ant.antdsl.xtext.parser.antlr->default,use_org.apache.commons.logging;use_org.apache.ant.antdsl.xtext.parser.antlr.internal->default,use_org.apache.commons.logging;use_org.apache.ant.antdsl.xtext.scoping->default,use_org.apache.commons.logging;use_org.apache.ant.antdsl.xtext.formatting->default,use_org.apache.commons.logging;default->default,use_org.apache.commons.logging;use_org.apache.ant.antdsl.xtext.serializer->default,use_or
 g.apache.commons.logging;use_org.apache.ant.antdsl.xtext.antdsl->default,use_org.apache.commons.logging;optional->default,use_org.apache.commons.logging;use_org.apache.ant.antdsl.xtext.antdsl.impl->default,use_org.apache.commons.logging;use_org.apache.ant.antdsl.xtext.generator->default,use_org.apache.commons.logging;transitive-optional->default,optional,transitive-optional,use_org.apache.commons.logging;use_org.apache.commons.logging->default,use_org.apache.commons.logging;use_org.apache.ant.antdsl.xtext->default,use_org.apache.commons.logging;use_org.apache.ant.antdsl.xtext.services->default,use_org.apache.commons.logging;antruntime->default,use_org.apache.commons.logging"/>
+		<dependency org="bundle" name="org.eclipse.xtext.xbase.lib" rev="2.3.0.v201206120633" force="true" transitive="false" conf="use_org.apache.ant.antdsl.xtext.antdsl.util->use_org.eclipse.xtend2.lib,default,use_org.eclipse.xtext.xbase.lib;use_org.apache.ant.antdsl.xtext.validation->use_org.eclipse.xtend2.lib,default,use_org.eclipse.xtext.xbase.lib;use_org.eclipse.xtend2.lib->use_org.eclipse.xtend2.lib,default,use_org.eclipse.xtext.xbase.lib;generate->use_org.eclipse.xtend2.lib,default,use_org.eclipse.xtext.xbase.lib;use_org.eclipse.xtext.xbase.lib->use_org.eclipse.xtend2.lib,default,use_org.eclipse.xtext.xbase.lib;use_org.apache.log4j->use_org.eclipse.xtend2.lib,default,use_org.eclipse.xtext.xbase.lib;use_org.apache.ant.antdsl.xtext.parser.antlr->use_org.eclipse.xtend2.lib,default,use_org.eclipse.xtext.xbase.lib;use_org.apache.ant.antdsl.xtext.parser.antlr.internal->use_org.eclipse.xtend2.lib,default,use_org.eclipse.xtext.xbase.lib;use_org.apache.ant.antdsl.xtext.scoping->use
 _org.eclipse.xtend2.lib,default,use_org.eclipse.xtext.xbase.lib;use_org.apache.ant.antdsl.xtext.formatting->use_org.eclipse.xtend2.lib,default,use_org.eclipse.xtext.xbase.lib;default->use_org.eclipse.xtend2.lib,default,use_org.eclipse.xtext.xbase.lib;use_org.apache.ant.antdsl.xtext.serializer->use_org.eclipse.xtend2.lib,default,use_org.eclipse.xtext.xbase.lib;use_org.apache.ant.antdsl.xtext.antdsl->use_org.eclipse.xtend2.lib,default,use_org.eclipse.xtext.xbase.lib;optional->use_org.eclipse.xtend2.lib,default,use_org.eclipse.xtext.xbase.lib;use_org.apache.ant.antdsl.xtext.antdsl.impl->use_org.eclipse.xtend2.lib,default,use_org.eclipse.xtext.xbase.lib;use_org.apache.ant.antdsl.xtext.generator->use_org.eclipse.xtend2.lib,default,use_org.eclipse.xtext.xbase.lib;transitive-optional->use_org.eclipse.xtend2.lib,default,use_org.eclipse.xtext.xbase.lib,optional,transitive-optional;use_org.apache.commons.logging->use_org.eclipse.xtend2.lib,default,use_org.eclipse.xtext.xbase.lib;use_o
 rg.apache.ant.antdsl.xtext->use_org.eclipse.xtend2.lib,default,use_org.eclipse.xtext.xbase.lib;use_org.apache.ant.antdsl.xtext.services->use_org.eclipse.xtend2.lib,default,use_org.eclipse.xtext.xbase.lib;antruntime->use_org.eclipse.xtend2.lib,default,use_org.eclipse.xtext.xbase.lib"/>
+		<dependency org="bundle" name="com.google.guava" rev="10.0.1.v201203051515" force="true" transitive="false" conf="use_org.apache.ant.antdsl.xtext.antdsl.util->default;use_org.apache.ant.antdsl.xtext.validation->default;use_org.eclipse.xtend2.lib->default;generate->default;use_org.eclipse.xtext.xbase.lib->default;use_org.apache.log4j->default;use_org.apache.ant.antdsl.xtext.parser.antlr->default;use_org.apache.ant.antdsl.xtext.parser.antlr.internal->default;use_org.apache.ant.antdsl.xtext.scoping->default;use_org.apache.ant.antdsl.xtext.formatting->default;default->default;use_org.apache.ant.antdsl.xtext.serializer->default;use_org.apache.ant.antdsl.xtext.antdsl->default;optional->default;use_org.apache.ant.antdsl.xtext.antdsl.impl->default;use_org.apache.ant.antdsl.xtext.generator->default;transitive-optional->default,use_com.google.common.base,optional,use_com.google.common.collect,transitive-optional;use_org.apache.commons.logging->default;use_org.apache.ant.antdsl.xtext
 ->default;use_org.apache.ant.antdsl.xtext.services->default;antruntime->default"/>
+		<dependency org="bundle" name="org.eclipse.xtext.xbase" rev="2.3.0.v201206120633" force="true" transitive="false" conf="generate->default;optional->default;transitive-optional->default,optional,transitive-optional"/>
+		<dependency org="bundle" name="org.eclipse.xtext.generator" rev="2.3.0.v201206120633" force="true" transitive="false" conf="generate->default;optional->default;transitive-optional->default,optional,transitive-optional"/>
+		<dependency org="bundle" name="org.eclipse.emf.codegen.ecore" rev="2.8.0.v20120608-0554" force="true" transitive="false" conf="generate->default;optional->default;transitive-optional->default,optional,transitive-optional"/>
+		<dependency org="bundle" name="org.eclipse.emf.mwe.utils" rev="1.2.1.v201206110920" force="true" transitive="false" conf="generate->default,use_org.eclipse.emf.mwe.utils;optional->default,use_org.eclipse.emf.mwe.utils;transitive-optional->default,use_org.eclipse.emf.mwe.utils,optional,transitive-optional"/>
+		<dependency org="bundle" name="org.eclipse.emf.mwe2.launch" rev="2.3.0.v201206120758" force="true" transitive="false" conf="generate->default;optional->default;transitive-optional->default,optional,transitive-optional"/>
+		<dependency org="bundle" name="org.eclipse.xtend.lib" rev="2.3.0.v201206120633" force="true" transitive="false" conf="generate->default;optional->default;transitive-optional->default"/>
+		<dependency org="bundle" name="org.eclipse.xtend" rev="1.2.0.v201206110941" force="true" transitive="false" conf="generate->default;optional->default;transitive-optional->default,optional,transitive-optional"/>
+		<dependency org="bundle" name="org.eclipse.xpand" rev="1.2.0.v201206110941" force="true" transitive="false" conf="generate->default;optional->default;transitive-optional->default"/>
+		<dependency org="bundle" name="org.eclipse.xtend.typesystem.emf" rev="1.2.0.v201206110941" force="true" transitive="false" conf="generate->default;optional->default;transitive-optional->default,optional,transitive-optional"/>
+		<dependency org="bundle" name="org.eclipse.xtext.ecore" rev="2.3.0.v201206120633" force="true" transitive="false" conf="generate->default;optional->default;transitive-optional->default"/>
+		<dependency org="bundle" name="org.eclipse.emf.mwe.core" rev="1.2.1.v201206110920" force="true" transitive="false" conf="generate->default;optional->default;transitive-optional->default,optional,transitive-optional"/>
+		<dependency org="bundle" name="org.apache.commons.cli" rev="1.2.0.v201105210650" force="true" transitive="false" conf="generate->default;optional->default;transitive-optional->default"/>
+		<dependency org="bundle" name="org.eclipse.emf.mwe2.runtime" rev="2.3.0.v201206110920" force="true" transitive="false" conf="generate->default;optional->default;transitive-optional->default"/>
+		<dependency org="bundle" name="org.apache.commons.lang" rev="2.6.0.v201205030909" force="true" transitive="false" conf="generate->default;optional->default;transitive-optional->default"/>
+		<dependency org="bundle" name="com.ibm.icu.base" rev="4.4.2.v20110831" force="true" transitive="false" conf="generate->default,use_com.ibm.icu.text,use_com.ibm.icu.util;optional->default,use_com.ibm.icu.text,use_com.ibm.icu.util;transitive-optional->default,use_com.ibm.icu.text,use_com.ibm.icu.util;antruntime->default,use_com.ibm.icu.text"/>
+		<dependency org="bundle" name="org.eclipse.core.resources" rev="3.8.0.v20120522-2034" force="true" transitive="false" conf="generate->default;optional->default;transitive-optional->default,optional,transitive-optional"/>
+		<dependency org="bundle" name="org.eclipse.jdt.core" rev="3.8.1.v_OTDT_r210_201206090452" force="true" transitive="false" conf="generate->default;optional->default;transitive-optional->default,optional,transitive-optional"/>
+		<dependency org="bundle" name="org.eclipse.jdt.launching" rev="3.6.100.v20120523-1953" force="true" transitive="false" conf="generate->default;optional->default;transitive-optional->default,optional,transitive-optional"/>
+		<dependency org="bundle" name="org.eclipse.emf.codegen" rev="2.8.0.v20120608-0554" force="true" transitive="false" conf="generate->default;optional->default;transitive-optional->default,optional,transitive-optional"/>
+		<dependency org="bundle" name="org.eclipse.text" rev="3.5.200.v20120523-1310" force="true" transitive="false" conf="generate->default;optional->default;transitive-optional->default"/>
+		<dependency org="bundle" name="org.eclipse.core.expressions" rev="3.4.400.v20120523-2004" force="true" transitive="false" conf="generate->default;optional->default;transitive-optional->default"/>
+		<dependency org="bundle" name="org.eclipse.core.filesystem" rev="1.3.200.v20120522-2012" force="true" transitive="false" conf="generate->default;optional->default;transitive-optional->default"/>
+		<dependency org="bundle" name="org.eclipse.jdt.annotation" rev="1.0.0.v20120522-1651" force="true" transitive="false" conf="generate->default;optional->default;transitive-optional->default,optional,transitive-optional"/>
+		<dependency org="bundle" name="org.eclipse.core.commands" rev="3.6.1.v20120521-2332" force="true" transitive="false" conf="generate->default;optional->default;transitive-optional->default,use_org.eclipse.core.commands.common,use_org.eclipse.core.commands;antruntime->default"/>
+		<dependency org="bundle" name="org.eclipse.debug.core" rev="3.7.100.v20120521-2012" force="true" transitive="false" conf="generate->default;optional->default;transitive-optional->default,optional,transitive-optional"/>
+		<dependency org="bundle" name="org.eclipse.jdt.debug" rev="3.7.100.v20120529-1702" force="true" transitive="false" conf="generate->default;optional->default;transitive-optional->default"/>
+		<dependency org="bundle" name="org.eclipse.core.variables" rev="3.2.600.v20120521-2012" force="true" transitive="false" conf="generate->default;optional->default;transitive-optional->default"/>
+		<dependency org="bundle" name="org.eclipse.emf.mwe2.language" rev="2.3.0.v201206120758" force="true" transitive="false" conf="generate->default;optional->default;transitive-optional->default"/>
 		<dependency org="bundle" name="de.itemis.xtext.antlr" rev="2.0.0.v201108011202" force="true" transitive="false" conf="transitive-optional->default,optional,transitive-optional"/>
+		<dependency org="bundle" name="com.ibm.icu" rev="4.4.2.v20110823" force="true" transitive="false" conf="transitive-optional->default,optional,transitive-optional;antruntime->default"/>
 		<dependency org="bundle" name="org.eclipse.emf.mwe2.lib" rev="2.3.0.v201206110920" force="true" transitive="false" conf="transitive-optional->default,optional,transitive-optional"/>
 		<dependency org="bundle" name="org.eclipse.xtext.smap" rev="2.3.0.v201206120633" force="true" transitive="false" conf="transitive-optional->default,optional,transitive-optional"/>
 		<dependency org="bundle" name="org.eclipse.core.runtime.compatibility.auth" rev="3.2.200.v20110110" force="true" transitive="false" conf="transitive-optional->default,optional,transitive-optional"/>
 		<dependency org="bundle" name="org.eclipse.ant.core" rev="3.2.400.v20120523-1752" force="true" transitive="false" conf="transitive-optional->default,optional,transitive-optional"/>
 		<dependency org="bundle" name="org.antlr.generator" rev="3.2.0.v201108011202" force="true" transitive="false" conf="transitive-optional->default"/>
 		<dependency org="bundle" name="org.eclipse.debug.ui" rev="3.8.0.v20120530-1753" force="true" transitive="false" conf="transitive-optional->default,optional,transitive-optional"/>
+		<dependency org="bundle" name="org.eclipse.jface" rev="3.8.0.v20120521-2329" force="true" transitive="false" conf="transitive-optional->use_org.eclipse.jface.window,default,use_org.eclipse.jface.bindings.keys.formatting,use_org.eclipse.jface.dialogs,optional,transitive-optional,use_org.eclipse.jface.bindings,use_org.eclipse.jface.bindings.keys;antruntime->default"/>
 		<dependency org="bundle" name="org.eclipse.ui" rev="3.103.0.v20120521-2329" force="true" transitive="false" conf="transitive-optional->default,optional,transitive-optional"/>
 		<dependency org="bundle" name="org.eclipse.jdt.debug.ui" rev="3.6.100.v20120530-1425" force="true" transitive="false" conf="transitive-optional->default,optional,transitive-optional"/>
 		<dependency org="bundle" name="org.eclipse.ui.console" rev="3.5.100.v20120521-2012" force="true" transitive="false" conf="transitive-optional->default"/>
@@ -100,6 +101,7 @@
 		<dependency org="bundle" name="org.eclipse.ui.workbench.texteditor" rev="3.8.0.v20120523-1310" force="true" transitive="false" conf="transitive-optional->default"/>
 		<dependency org="bundle" name="org.eclipse.ui.ide" rev="3.8.0.v20120521-2329" force="true" transitive="false" conf="transitive-optional->default"/>
 		<dependency org="bundle" name="org.eclipse.ui.editors" rev="3.8.0.v20120523-1540" force="true" transitive="false" conf="transitive-optional->default"/>
+		<dependency org="bundle" name="org.eclipse.swt" rev="3.100.0.v4233d" force="true" transitive="false" conf="transitive-optional->default;antruntime->default"/>
 		<dependency org="bundle" name="org.eclipse.ui.workbench" rev="3.103.0.v20120530-1824" force="true" transitive="false" conf="transitive-optional->default"/>
 		<dependency org="bundle" name="org.eclipse.jface.databinding" rev="1.6.0.v20120521-2329" force="true" transitive="false" conf="transitive-optional->default"/>
 		<dependency org="bundle" name="org.eclipse.core.databinding.property" rev="1.4.100.v20120523-1955" force="true" transitive="false" conf="transitive-optional->default"/>
@@ -141,6 +143,7 @@
 		<dependency org="bundle" name="org.eclipse.equinox.p2.repository" rev="2.2.0.v20120524-1945" force="true" transitive="false" conf="transitive-optional->use_org.eclipse.equinox.p2.repository.spi,use_org.eclipse.equinox.internal.p2.repository.helpers,use_org.eclipse.equinox.p2.repository.artifact,use_org.eclipse.equinox.internal.provisional.p2.repository,use_org.eclipse.equinox.internal.p2.repository,use_org.eclipse.equinox.p2.repository.metadata.spi,use_org.eclipse.equinox.p2.repository,default,use_org.eclipse.equinox.internal.p2.persistence,use_org.eclipse.equinox.p2.repository.metadata"/>
 		<dependency org="bundle" name="org.eclipse.equinox.security" rev="1.1.100.v20120522-1841" force="true" transitive="false" conf="transitive-optional->default,use_org.eclipse.equinox.security.storage"/>
 		<dependency org="bundle" name="org.eclipse.core.filebuffers" rev="3.5.200.v20120523-1310" force="true" transitive="false" conf="transitive-optional->default"/>
+		<dependency org="bundle" name="org.eclipse.ui.forms" rev="3.5.200.v20120521-2329" force="true" transitive="false" conf="transitive-optional->default,use_org.eclipse.ui.forms.widgets;antruntime->default"/>
 		<dependency org="bundle" name="org.eclipse.team.core" rev="3.6.100.v20120524-0627" force="true" transitive="false" conf="transitive-optional->default,optional,transitive-optional"/>
 		<dependency org="bundle" name="org.eclipse.jdt.ui" rev="3.8.0.v20120524-1551" force="true" transitive="false" conf="transitive-optional->default"/>
 		<dependency org="bundle" name="org.eclipse.ltk.core.refactoring" rev="3.6.0.v20120523-1543" force="true" transitive="false" conf="transitive-optional->default"/>

Modified: ant/sandbox/antdsl/trunk/ivy.xml
URL: http://svn.apache.org/viewvc/ant/sandbox/antdsl/trunk/ivy.xml?rev=1375653&r1=1375652&r2=1375653&view=diff
==============================================================================
--- ant/sandbox/antdsl/trunk/ivy.xml (original)
+++ ant/sandbox/antdsl/trunk/ivy.xml Tue Aug 21 16:39:03 2012
@@ -3,16 +3,15 @@
         <extends organisation="bundle" module="org.apache.ant.antdsl" revision="1.0.0" location="org.apache.ant.antdsl/META-INF/MANIFEST.MF"/>
     </info>
     <configurations>
-        <conf name="default" extends="antruntime" />
-        <conf name="antruntime" />
-        <conf name="generate" extends="antruntime" />
+        <conf name="antruntime" extends="default" />
+        <conf name="generate" extends="optional" />
     </configurations>
     <dependencies>
         <!-- ambiguity fix -->
-        <dependency org="bundle" name="org.apache.log4j" rev="1.2.15.v201012070815" conf="*->default" />
-        <dependency org="bundle" name="org.apache.commons.logging" rev="1.1.1.v201101211721" conf="*->default" />
-        <dependency org="bundle" name="com.ibm.icu" rev="4.4.2.v20110823" conf="*->default" />
-        <dependency org="bundle" name="org.eclipse.ui.forms" rev="3.5.200.v20120521-2329" conf="*->default" />
+        <dependency org="bundle" name="org.apache.log4j" rev="1.2.15.v201012070815" conf="antruntime->default" />
+        <dependency org="bundle" name="org.apache.commons.logging" rev="1.1.1.v201101211721" conf="antruntime->default" />
+        <dependency org="bundle" name="com.ibm.icu" rev="4.4.2.v20110823" conf="antruntime->default" />
+        <dependency org="bundle" name="org.eclipse.ui.forms" rev="3.5.200.v20120521-2329" conf="antruntime->default" />
 
         <!-- provided -->
         <exclude org="package" module="javax.xml.parsers" />