ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hi...@apache.org
Subject svn commit: r1375628 - in /ant/sandbox/antdsl/trunk: ./ org.apache.ant.antdsl/ org.apache.ant.antdsl/.launch/ org.apache.ant.antdsl/META-INF/ org.apache.ant.antdsl/xtend-gen/org/apache/ant/antdsl/xtext/generator/
Date Tue, 21 Aug 2012 15:55:47 GMT
Author: hibou
Date: Tue Aug 21 15:55:46 2012
New Revision: 1375628

URL: http://svn.apache.org/viewvc?rev=1375628&view=rev
Log:
- update to use Eclipse juno repository, so a new version of Xtext
- less hack for the OSGi build, by using Ivy 2.4 and Ant 1.9

Added:
    ant/sandbox/antdsl/trunk/ivy-fixed.xml   (with props)
Removed:
    ant/sandbox/antdsl/trunk/org.apache.ant.antdsl/xtend-gen/org/apache/ant/antdsl/xtext/generator/AntDSLGenerator.java
Modified:
    ant/sandbox/antdsl/trunk/   (props changed)
    ant/sandbox/antdsl/trunk/build.xml
    ant/sandbox/antdsl/trunk/ivy.xml
    ant/sandbox/antdsl/trunk/ivysettings.xml
    ant/sandbox/antdsl/trunk/org.apache.ant.antdsl/.classpath
    ant/sandbox/antdsl/trunk/org.apache.ant.antdsl/.launch/AntDSL.launch
    ant/sandbox/antdsl/trunk/org.apache.ant.antdsl/.launch/GenerateAntDSL.mwe2.launch
    ant/sandbox/antdsl/trunk/org.apache.ant.antdsl/META-INF/MANIFEST.MF

Propchange: ant/sandbox/antdsl/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Aug 21 15:55:46 2012
@@ -1,3 +1,4 @@
 build
 lib
 build-deps
+build.classpath

Modified: ant/sandbox/antdsl/trunk/build.xml
URL: http://svn.apache.org/viewvc/ant/sandbox/antdsl/trunk/build.xml?rev=1375628&r1=1375627&r2=1375628&view=diff
==============================================================================
--- ant/sandbox/antdsl/trunk/build.xml (original)
+++ ant/sandbox/antdsl/trunk/build.xml Tue Aug 21 15:55:46 2012
@@ -1,6 +1,6 @@
 <project name="ant-dsl" xmlns:ivy="antlib:org.apache.ivy.ant">
 
-    <property name="ivy.version" value="2.3.0-rc1" />
+    <property name="ivy.version" value="2.4.0-alpha" />
 
     <target name="-check-build-deps">
         <condition property="build-deps.exist">
@@ -8,6 +8,7 @@
                 <available file="${basedir}/build-deps/antlr-3.4-complete.jar" />
                 <available file="${basedir}/build-deps/antlr3-task/ant-antlr3.jar" />
                 <available file="${basedir}/build-deps/ivy-${ivy.version}.jar" />
+                <available file="${basedir}/build-deps/apache-ant-1.9.0alpha-bin.zip" />
             </and>
         </condition>
         <mkdir dir="${user.home}/.ivy2/lib/" />
@@ -15,10 +16,12 @@
 
     <target name="-download-build-deps" depends="-check-build-deps" unless="build-deps.exist">
         <mkdir dir="${basedir}/build-deps" />
-        <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/${ivy.version}/ivy-${ivy.version}.jar" dest="${basedir}/build-deps/ivy-${ivy.version}.jar" usetimestamp="true" />
+        <get src="https://builds.apache.org/pview/job/Ivy/lastSuccessfulBuild/artifact/trunk/build/artifact/jars/ivy.jar" dest="${basedir}/build-deps/ivy-${ivy.version}.jar" usetimestamp="true" />
         <get src="http://antlr.org/download/antlr-3.4-complete.jar" dest="${basedir}/build-deps/antlr-3.4-complete.jar" usetimestamp="true" />
         <get src="http://www.antlr.org/share/1169924912745/antlr3-task.zip" dest="${basedir}/build-deps/antlr3-task.zip" usetimestamp="true" />
         <unzip src="${basedir}/build-deps/antlr3-task.zip" dest="${basedir}/build-deps/" />
+        <get src="https://builds.apache.org/job/Ant_Nightly/lastSuccessfulBuild/artifact/trunk/distribution/binaries/apache-ant-1.9.0alpha-bin.zip" dest="${basedir}/build-deps/apache-ant-1.9.0alpha-bin.zip" usetimestamp="true" />
+        <unzip src="${basedir}/build-deps/apache-ant-1.9.0alpha-bin.zip" dest="${basedir}/build-deps/" />
     </target>
 
     <target name="init" depends="-download-build-deps">
@@ -31,10 +34,23 @@
         <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" >
+        <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" />
-        <ivy:resolve file="ivy.xml" conf="*" />
-        <ivy:retrieve conf="*" pattern="${basedir}/lib/[artifact]_[revision].[ext]" sync="true" />
+        <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" />
+        <!-- Now we need to hack since we the ant trunk to build -->
+        <path id="build.classpath">
+            <fileset dir="build-deps/apache-ant-1.9.0alpha/lib" includes="*.jar" />
+            <path refid="build.classpath.ivy" />
+        </path>
+        <echo message="${toString:build.classpath}" file="build.classpath" />        
     </target>
 
     <target name="clean" description="Clean build artifacts">
@@ -65,25 +81,9 @@
     </target>
 
     <target name="build" description="Full build of a antdsl jar">
-        <!--copy todir="${basedir}/build">
-            <zipentry zipfile="${basedir}/lib/org.eclipse.jdt.core_3.7.3.v_OTDT_r202_201202051448.jar" name="jdtCompilerAdapter.jar" />
-        </copy>
-        <componentdef name="jdtCompilerAdapter" classname="org.eclipse.jdt.core.JDTCompilerAdapter">
-            <classpath>
-                <pathelement path="${basedir}/build/jdtCompilerAdapter.jar" />
-                <pathelement path="${basedir}/lib/org.eclipse.jdt.core_3.7.3.v_OTDT_r202_201202051448.jar" />
-            </classpath>
-        </componentdef-->
-        <unzip src="${basedir}/lib/org.apache.ant_1.8.2.v20120109-1030.jar" dest="${basedir}/build/ant" />
+        <loadpath pathid="build.classpath" file="build.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">
-            <classpath>
-                <fileset dir="${basedir}/lib" includes="*.jar" />
-                <fileset dir="${basedir}/build/ant/lib/" includes="*.jar" />
-            </classpath>
-            <!--jdtCompilerAdapter />
-            <compilerarg line="-proceedOnError" /-->
-        </javac>
+        <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" />
         <copy todir="${basedir}/build/classes">
             <fileset dir="${basedir}/org.apache.ant.antdsl/src">
                 <exclude name="*.java" />
@@ -100,10 +100,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" />
         <typedef classname="org.apache.ant.antdsl.xtext.AntDslXTextProjectHelper" name="antDslProjectHelper">
             <classpath>
-                <fileset dir="${basedir}/lib" includes="*.jar" />
                 <pathelement path="${basedir}/build/antdsl.jar" />
+                <path refid="build.classpath" />
             </classpath>
         </typedef>
         <projecthelper>
@@ -113,10 +114,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" />
         <typedef classname="org.apache.ant.antdsl.antlr.AntDslAntlrProjectHelper" name="antDslProjectHelper">
             <classpath>
-                <fileset dir="${basedir}/lib" includes="*.jar" />
                 <pathelement path="${basedir}/build/antdsl.jar" />
+                <path refid="build.classpath" />
             </classpath>
         </typedef>
         <projecthelper>
@@ -124,4 +126,21 @@
         </projecthelper>
         <ant antfile="test/build.ant" target="build" />
     </target>
+
+    <macrodef name="loadpath">
+        <attribute name="pathid" />
+        <attribute name="file" />
+        <sequential>
+            <path id="@{pathid}">
+                <resourcelist>
+                    <file file="@{file}" />
+                    <filterchain>
+                        <tokenfilter>
+                            <replacestring from="${path.separator}" to="${line.separator}"/>
+                        </tokenfilter>
+                    </filterchain>
+                </resourcelist>
+            </path>
+        </sequential>
+    </macrodef>
 </project>
\ No newline at end of file

Added: ant/sandbox/antdsl/trunk/ivy-fixed.xml
URL: http://svn.apache.org/viewvc/ant/sandbox/antdsl/trunk/ivy-fixed.xml?rev=1375628&view=auto
==============================================================================
--- ant/sandbox/antdsl/trunk/ivy-fixed.xml (added)
+++ ant/sandbox/antdsl/trunk/ivy-fixed.xml Tue Aug 21 15:55:46 2012
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ivy-module version="2.0">
+	<info organisation="org.apache.ant"
+		module="ant-dsl"
+		revision="1.0.0"
+		status="integration"
+		publication="20120804183628"
+	/>
+	<configurations>
+		<conf name="default" visibility="public" extends="antruntime"/>
+		<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"/>
+		<conf name="use_org.apache.ant.antdsl.xtext.services" visibility="public" description="Exported package org.apache.ant.antdsl.xtext.services" extends="default"/>
+		<conf name="use_org.apache.ant.antdsl.xtext.antdsl" visibility="public" description="Exported package org.apache.ant.antdsl.xtext.antdsl" extends="default"/>
+		<conf name="use_org.apache.ant.antdsl.xtext.antdsl.impl" visibility="public" description="Exported package org.apache.ant.antdsl.xtext.antdsl.impl" extends="default"/>
+		<conf name="use_org.apache.ant.antdsl.xtext.antdsl.util" visibility="public" description="Exported package org.apache.ant.antdsl.xtext.antdsl.util" extends="default"/>
+		<conf name="use_org.apache.ant.antdsl.xtext.serializer" visibility="public" description="Exported package org.apache.ant.antdsl.xtext.serializer" extends="default"/>
+		<conf name="use_org.apache.ant.antdsl.xtext.parser.antlr" visibility="public" description="Exported package org.apache.ant.antdsl.xtext.parser.antlr" extends="default"/>
+		<conf name="use_org.apache.ant.antdsl.xtext.parser.antlr.internal" visibility="public" description="Exported package org.apache.ant.antdsl.xtext.parser.antlr.internal" extends="default"/>
+		<conf name="use_org.apache.ant.antdsl.xtext.validation" visibility="public" description="Exported package org.apache.ant.antdsl.xtext.validation" extends="default"/>
+		<conf name="use_org.apache.ant.antdsl.xtext.scoping" visibility="public" description="Exported package org.apache.ant.antdsl.xtext.scoping" extends="default"/>
+		<conf name="use_org.apache.ant.antdsl.xtext.generator" visibility="public" description="Exported package org.apache.ant.antdsl.xtext.generator" extends="default"/>
+		<conf name="use_org.apache.ant.antdsl.xtext.formatting" visibility="public" description="Exported package org.apache.ant.antdsl.xtext.formatting" extends="default"/>
+		<conf name="use_org.apache.log4j" visibility="public" description="Exported package org.apache.log4j" extends="default"/>
+		<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"/>
+	</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.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"/>
+		<dependency org="bundle" name="org.eclipse.equinox.registry" rev="3.5.200.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.runtime;use_org.apache.commons.logging->default;use_org.apache.ant.antdsl.xtext->default;use_org.apache.ant.antdsl.xtext.s
 ervices->default;antruntime->default"/>
+		<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="de.itemis.xtext.antlr" rev="2.0.0.v201108011202" force="true" transitive="false" conf="transitive-optional->default,optional,transitive-optional"/>
+		<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.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"/>
+		<dependency org="bundle" name="org.eclipse.help" rev="3.6.0.v20120521-2344" force="true" transitive="false" conf="transitive-optional->default"/>
+		<dependency org="bundle" name="org.eclipse.jface.text" rev="3.8.0.v20120531-0600" force="true" transitive="false" conf="transitive-optional->default"/>
+		<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.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"/>
+		<dependency org="bundle" name="org.eclipse.core.databinding.observable" rev="1.4.1.v20120521-2329" force="true" transitive="false" conf="transitive-optional->default"/>
+		<dependency org="bundle" name="org.eclipse.e4.core.services" rev="1.0.0.v20120521-2346" force="true" transitive="false" conf="transitive-optional->use_org.eclipse.e4.core.services.util,default,use_org.eclipse.e4.core.services.log"/>
+		<dependency org="bundle" name="org.eclipse.e4.core.contexts" rev="1.1.0.v20120523-2004" force="true" transitive="false" conf="transitive-optional->default,use_org.eclipse.e4.core.contexts"/>
+		<dependency org="bundle" name="org.eclipse.e4.core.di" rev="1.1.0.v20120521-2346" force="true" transitive="false" conf="transitive-optional->default"/>
+		<dependency org="bundle" name="org.eclipse.e4.ui.workbench.swt" rev="0.10.1.v20120525-2014" force="true" transitive="false" conf="transitive-optional->use_org.eclipse.e4.ui.internal.workbench.swt,default"/>
+		<dependency org="bundle" name="org.eclipse.e4.ui.di" rev="0.10.1.v20120523-1955" force="true" transitive="false" conf="transitive-optional->default"/>
+		<dependency org="bundle" name="org.eclipse.e4.ui.model.workbench" rev="0.10.1.v20120523-1955" force="true" transitive="false" conf="transitive-optional->default"/>
+		<dependency org="bundle" name="org.eclipse.e4.ui.css.swt.theme" rev="0.9.2.v20120523-1955" force="true" transitive="false" conf="transitive-optional->default"/>
+		<dependency org="bundle" name="org.eclipse.e4.ui.bindings" rev="0.10.1.v20120523-1955" force="true" transitive="false" conf="transitive-optional->default"/>
+		<dependency org="bundle" name="org.eclipse.e4.ui.css.swt" rev="0.10.1.v20120523-1955" force="true" transitive="false" conf="transitive-optional->default"/>
+		<dependency org="bundle" name="org.eclipse.e4.ui.css.core" rev="0.10.1.v20120523-1955" force="true" transitive="false" conf="transitive-optional->default"/>
+		<dependency org="bundle" name="org.eclipse.e4.ui.workbench3" rev="0.12.0.v20120521-2329" force="true" transitive="false" conf="transitive-optional->default"/>
+		<dependency org="bundle" name="org.eclipse.core.databinding" rev="1.4.1.v20120521-2329" force="true" transitive="false" conf="transitive-optional->default"/>
+		<dependency org="bundle" name="org.eclipse.e4.ui.workbench" rev="0.10.2.v20120531-1742" force="true" transitive="false" conf="transitive-optional->default,use_org.eclipse.e4.ui.workbench.modeling,use_org.eclipse.e4.ui.workbench,use_org.eclipse.e4.ui.internal.workbench"/>
+		<dependency org="bundle" name="org.eclipse.e4.ui.services" rev="0.10.1.v20120523-1955" force="true" transitive="false" conf="transitive-optional->default,use_org.eclipse.e4.ui.services"/>
+		<dependency org="bundle" name="org.w3c.css.sac" rev="1.3.1.v200903091627" force="true" transitive="false" conf="transitive-optional->default"/>
+		<dependency org="bundle" name="org.eclipse.osgi.services" rev="3.3.100.v20120522-1822" force="true" transitive="false" conf="transitive-optional->use_org.osgi.service.event,use_org.osgi.service.component,default,use_org.osgi.service.cm"/>
+		<dependency org="bundle" name="org.eclipse.e4.core.commands" rev="0.10.1.v20120523-1955" force="true" transitive="false" conf="transitive-optional->default,use_org.eclipse.e4.core.commands,use_org.eclipse.e4.core.commands.internal"/>
+		<dependency org="bundle" name="org.eclipse.e4.ui.widgets" rev="0.12.0.v20120523-1955" force="true" transitive="false" conf="transitive-optional->default"/>
+		<dependency org="bundle" name="org.eclipse.equinox.ds" rev="1.4.0.v20120522-1841" force="true" transitive="false" conf="transitive-optional->default"/>
+		<dependency org="bundle" name="org.eclipse.equinox.event" rev="1.2.200.v20120522-2049" force="true" transitive="false" conf="transitive-optional->default"/>
+		<dependency org="bundle" name="org.eclipse.emf.ecore.change" rev="2.8.0.v20120606-0717" force="true" transitive="false" conf="transitive-optional->default"/>
+		<dependency org="bundle" name="org.eclipse.e4.core.di.extensions" rev="0.11.0.v20120523-2004" force="true" transitive="false" conf="transitive-optional->default"/>
+		<dependency org="bundle" name="org.apache.batik.css" rev="1.6.0.v201011041432" force="true" transitive="false" conf="transitive-optional->use_org.apache.batik.css.engine,default"/>
+		<dependency org="bundle" name="org.apache.batik.util" rev="1.6.0.v201011041432" force="true" transitive="false" conf="transitive-optional->default"/>
+		<dependency org="bundle" name="org.w3c.dom.svg" rev="1.1.0.v201011041433" force="true" transitive="false" conf="transitive-optional->default"/>
+		<dependency org="bundle" name="org.apache.batik.util.gui" rev="1.6.0.v201011041432" force="true" transitive="false" conf="transitive-optional->default"/>
+		<dependency org="bundle" name="org.w3c.dom.smil" rev="1.0.1.v200903091627" force="true" transitive="false" conf="transitive-optional->default"/>
+		<dependency org="bundle" name="org.eclipse.equinox.util" rev="1.0.400.v20120522-2049" force="true" transitive="false" conf="transitive-optional->use_org.eclipse.equinox.internal.util.timer,use_org.eclipse.equinox.internal.util.hash,default,use_org.eclipse.equinox.internal.util.threadpool,use_org.eclipse.equinox.internal.util.ref,use_org.eclipse.equinox.internal.util.event,use_org.eclipse.equinox.internal.util.pool"/>
+		<dependency org="bundle" name="org.eclipse.e4.ui.workbench.renderers.swt" rev="0.10.1.v20120523-1955" force="true" transitive="false" conf="transitive-optional->default,use_org.eclipse.e4.ui.internal.workbench.renderers.swt,use_org.eclipse.e4.ui.workbench.renderers.swt"/>
+		<dependency org="bundle" name="org.eclipse.compare.core" rev="3.5.200.v20120522-1148" force="true" transitive="false" conf="transitive-optional->default"/>
+		<dependency org="bundle" name="org.eclipse.equinox.p2.engine" rev="2.2.0.v20120501-1502" force="true" transitive="false" conf="transitive-optional->default"/>
+		<dependency org="bundle" name="org.eclipse.equinox.p2.metadata" rev="2.1.0.v20120430-2001" force="true" transitive="false" conf="transitive-optional->default,use_org.eclipse.equinox.p2.query,use_org.eclipse.equinox.internal.p2.metadata.index,use_org.eclipse.equinox.internal.p2.metadata,use_org.eclipse.equinox.p2.metadata.index,use_org.eclipse.equinox.p2.metadata.expression,use_org.eclipse.equinox.p2.metadata"/>
+		<dependency org="bundle" name="org.eclipse.equinox.p2.core" rev="2.2.0.v20120430-0525" force="true" transitive="false" conf="transitive-optional->use_org.eclipse.equinox.internal.provisional.p2.core.eventbus,default,use_org.eclipse.equinox.p2.core,use_org.eclipse.equinox.internal.p2.core,use_org.eclipse.equinox.p2.core.spi,use_org.eclipse.equinox.internal.p2.core.helpers"/>
+		<dependency org="bundle" name="org.eclipse.equinox.p2.metadata.repository" rev="1.2.100.v20120524-1717" force="true" transitive="false" conf="transitive-optional->default,use_org.eclipse.equinox.internal.p2.metadata.repository.io"/>
+		<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.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"/>
+		<dependency org="bundle" name="org.eclipse.jdt.core.manipulation" rev="1.5.0.v20120523-1543" force="true" transitive="false" conf="transitive-optional->default"/>
+		<dependency org="bundle" name="org.eclipse.search" rev="3.8.0.v20120523-1540" force="true" transitive="false" conf="transitive-optional->default"/>
+		<dependency org="bundle" name="org.eclipse.compare" rev="3.5.300.v20120522-1148" force="true" transitive="false" conf="transitive-optional->default"/>
+		<dependency org="bundle" name="org.eclipse.team.ui" rev="3.6.200.v20120522-1148" force="true" transitive="false" conf="transitive-optional->default"/>
+		<dependency org="bundle" name="org.eclipse.ui.views" rev="3.6.100.v20120521-2329" force="true" transitive="false" conf="transitive-optional->default"/>
+		<dependency org="bundle" name="org.eclipse.ltk.ui.refactoring" rev="3.7.0.v20120523-1543" force="true" transitive="false" conf="transitive-optional->default"/>
+		<dependency org="bundle" name="org.eclipse.ui.navigator" rev="3.5.200.v20120523-1955" force="true" transitive="false" conf="transitive-optional->default"/>
+		<dependency org="bundle" name="org.eclipse.ui.navigator.resources" rev="3.4.400.v20120523-1955" force="true" transitive="false" conf="transitive-optional->default"/>
+		<dependency org="bundle" name="org.eclipse.ui.views.properties.tabbed" rev="3.5.300.v20120523-1955" force="true" transitive="false" conf="transitive-optional->default"/>
+	</dependencies>
+</ivy-module>

Propchange: ant/sandbox/antdsl/trunk/ivy-fixed.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/sandbox/antdsl/trunk/ivy-fixed.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/sandbox/antdsl/trunk/ivy-fixed.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: ant/sandbox/antdsl/trunk/ivy.xml
URL: http://svn.apache.org/viewvc/ant/sandbox/antdsl/trunk/ivy.xml?rev=1375628&r1=1375627&r2=1375628&view=diff
==============================================================================
--- ant/sandbox/antdsl/trunk/ivy.xml (original)
+++ ant/sandbox/antdsl/trunk/ivy.xml Tue Aug 21 15:55:46 2012
@@ -1,56 +1,29 @@
 <ivy-module version="2.0">
-    <info organisation="org.apache.ant" module="ant-dsl" />
+    <info organisation="org.apache.ant" module="ant-dsl">
+        <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" />
     </configurations>
     <dependencies>
-        <!--dependency org="bundle" name="org.eclipse.xtext" rev="2.2.1.v201112130541" conf="default->default" /-->
-        <dependency org="bundle" name="org.apache.ant" rev="1.8.2.v20120109-1030" conf="antruntime->default" transitive="false" />
-        <!--dependency org="bundle" name="org.eclipse.equinox.launcher" rev="1.2.0.v20110502" conf="default->default" /-->
-        <dependency org="bundle" name="org.eclipse.emf.mwe2.launch" rev="2.2.0.v201112071250" conf="antruntime->default" transitive="false" />
-        
-        <dependency org="bundle" name="org.eclipse.xtext" rev="2.2.1.v201112130541" conf="antruntime->default" transitive="false" />
-        <dependency org="bundle" name="com.google.guava" rev="10.0.1.1" conf="antruntime->default" transitive="false" />
-        <dependency org="bundle" name="org.eclipse.emf.ecore" rev="2.7.0.v20120127-1122" conf="antruntime->default" transitive="false" />
-        <dependency org="bundle" name="org.eclipse.emf.ecore.xmi" rev="2.7.0.v20120127-1122" conf="antruntime->default" transitive="false" />
-        <dependency org="bundle" name="org.eclipse.emf.common" rev="2.7.0.v20120127-1122" conf="antruntime->default" transitive="false" />
-        <dependency org="bundle" name="com.google.inject" rev="3.0.0.no_aop" conf="antruntime->default" transitive="false" />
-        <dependency org="bundle" name="org.apache.log4j" rev="1.2.15.v201012070815" conf="antruntime->default" transitive="false" />
-        <dependency org="bundle" name="javax.inject" rev="1.0.0.v20091030" conf="antruntime->default" transitive="false" />
-        <dependency org="bundle" name="org.eclipse.xtext.util" rev="2.2.1.v201112130541" conf="antruntime->default" transitive="false" />
-        <dependency org="bundle" name="org.antlr.runtime" rev="3.2.0.v201101311130" conf="antruntime->default" transitive="false" />
-        <dependency org="bundle" name="org.eclipse.xtext.common.types" rev="2.2.1.v201112130541" conf="antruntime->default" transitive="false" />
+        <!-- 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.commons.cli" rev="1.2.0.v201105210650" conf="generate->default" transitive="false" />
-        <dependency org="bundle" name="org.eclipse.emf.mwe2.language" rev="2.2.0.v201112071250" conf="generate->default" transitive="false" />
-        <dependency org="bundle" name="org.eclipse.emf.mwe2.runtime" rev="2.2.0.v201112070431" conf="generate->default" transitive="false" />
-        <dependency org="bundle" name="org.eclipse.emf.mwe.utils" rev="1.2.1.v201112070431" conf="generate->default" transitive="false" />
-        <dependency org="bundle" name="org.eclipse.emf.mwe.core" rev="1.2.1.v201112070431" conf="generate->default" transitive="false" />
-        <dependency org="bundle" name="org.apache.commons.logging" rev="1.0.4.v201101211617" conf="generate->default" transitive="false" />
-        <dependency org="bundle" name="org.eclipse.xtext.generator" rev="2.2.1.v201112130541" conf="generate->default" transitive="false" />
-        <dependency org="bundle" name="org.eclipse.xpand" rev="1.1.0.v201108020519" conf="generate->default" transitive="false" />
-        <dependency org="bundle" name="org.eclipse.xtend" rev="1.1.0.v201108020519" conf="generate->default" transitive="false" />
-        <dependency org="bundle" name="org.eclipse.emf.codegen.ecore" rev="2.7.0.v20110913-1156" conf="generate->default" transitive="false" />
-        <dependency org="bundle" name="org.eclipse.xtext.xbase" rev="2.2.1.v201112130541" conf="generate->default" transitive="false" />
-        <dependency org="bundle" name="org.eclipse.emf.codegen" rev="2.6.0.v20120130-0943" conf="generate->default" transitive="false" />
-        <dependency org="bundle" name="org.eclipse.xtext.xbase.lib" rev="2.2.1.v201112130541" conf="generate->default" transitive="false" />
-        <dependency org="bundle" name="de.itemis.xtext.antlr" rev="2.0.0.v201108011202" conf="generate->default" transitive="false" />
-        <dependency org="bundle" name="com.ibm.icu" rev="4.4.2.v20110823" conf="generate->default" transitive="false" />
-        <dependency org="bundle" name="org.eclipse.xtend2.lib" rev="2.2.1.v201112130541" conf="generate->default" transitive="false" />
-        <dependency org="bundle" name="org.antlr.generator" rev="3.2.0.v201108011202" conf="generate->default" transitive="false" />
-        <dependency org="bundle" name="org.eclipse.emf.mwe2.lib" rev="2.2.0.v201112070431" conf="generate->default" transitive="false" />
-        
-        <!--dependency org="bundle" name="org.eclipse.jdt.core" rev="3.7.3.v20120119-1537" conf="default->default" transitive="false" /-->
-
-        <exclude org="package" module="org.eclipse.swt.accessibility2" />
-        <exclude org="package" module="org.mozilla.xpcom" />
-        <exclude org="package" module="javax.crypto" />
-        <exclude org="package" module="javax.crypto.spec" />
-        <exclude org="package" module="javax.security.auth" />
-        <exclude org="package" module="javax.security.auth.callback" />
-        <exclude org="package" module="javax.security.auth.login" />
-        <exclude org="package" module="javax.security.auth.spi" />
+        <!-- provided -->
+        <exclude org="package" module="javax.xml.parsers" />
+        <exclude org="package" module="javax.xml.transform" />
+        <exclude org="package" module="javax.xml.transform.dom" />
+        <exclude org="package" module="javax.xml.transform.stream" />
+        <exclude org="package" module="org.xml.sax" />
+        <exclude org="package" module="org.xml.sax.helpers" />
+        <exclude org="package" module="org.xml.sax.ext" />
+        <exclude org="package" module="org.w3c.dom" />
+        <exclude org="package" module="org.w3c.dom.events" />
+        <exclude org="package" module="javax.annotation" />
     </dependencies>
 </ivy-module>

Modified: ant/sandbox/antdsl/trunk/ivysettings.xml
URL: http://svn.apache.org/viewvc/ant/sandbox/antdsl/trunk/ivysettings.xml?rev=1375628&r1=1375627&r2=1375628&view=diff
==============================================================================
--- ant/sandbox/antdsl/trunk/ivysettings.xml (original)
+++ ant/sandbox/antdsl/trunk/ivysettings.xml Tue Aug 21 15:55:46 2012
@@ -5,17 +5,17 @@
     <property name="caches.basedir" value="${ivy.default.ivy.user.dir}/repo-caches" />
 
     <caches resolutionCacheDir="${ivy.default.ivy.user.dir}/resolution-cache">
-        <cache name="eclipse-indigo" basedir="${caches.basedir}/eclipse-indigo" />
+        <cache name="eclipse-juno" basedir="${caches.basedir}/eclipse-juno" />
         <cache name="xtext" basedir="${caches.basedir}/xtext" />
     </caches>
 
     <resolvers>
 
-        <updatesite name="eclipse-indigo" url="http://download.eclipse.org/releases/indigo" cache="eclipse-indigo" requirementStrategy="first" />
+        <updatesite name="eclipse-juno" url="http://download.eclipse.org/releases/juno" cache="eclipse-juno" requirementStrategy="first" />
         <updatesite name="xtext" url="http://download.itemis.com/updates/releases" cache="xtext" requirementStrategy="first" />
 
         <chain name="all" returnFirst="true">
-            <resolver ref="eclipse-indigo" />
+            <resolver ref="eclipse-juno" />
             <resolver ref="xtext" />
         </chain>
 

Modified: ant/sandbox/antdsl/trunk/org.apache.ant.antdsl/.classpath
URL: http://svn.apache.org/viewvc/ant/sandbox/antdsl/trunk/org.apache.ant.antdsl/.classpath?rev=1375628&r1=1375627&r2=1375628&view=diff
==============================================================================
Binary files - no diff available.

Modified: ant/sandbox/antdsl/trunk/org.apache.ant.antdsl/.launch/AntDSL.launch
URL: http://svn.apache.org/viewvc/ant/sandbox/antdsl/trunk/org.apache.ant.antdsl/.launch/AntDSL.launch?rev=1375628&r1=1375627&r2=1375628&view=diff
==============================================================================
Binary files - no diff available.

Modified: ant/sandbox/antdsl/trunk/org.apache.ant.antdsl/.launch/GenerateAntDSL.mwe2.launch
URL: http://svn.apache.org/viewvc/ant/sandbox/antdsl/trunk/org.apache.ant.antdsl/.launch/GenerateAntDSL.mwe2.launch?rev=1375628&r1=1375627&r2=1375628&view=diff
==============================================================================
Binary files - no diff available.

Modified: ant/sandbox/antdsl/trunk/org.apache.ant.antdsl/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/ant/sandbox/antdsl/trunk/org.apache.ant.antdsl/META-INF/MANIFEST.MF?rev=1375628&r1=1375627&r2=1375628&view=diff
==============================================================================
--- ant/sandbox/antdsl/trunk/org.apache.ant.antdsl/META-INF/MANIFEST.MF (original)
+++ ant/sandbox/antdsl/trunk/org.apache.ant.antdsl/META-INF/MANIFEST.MF Tue Aug 21 15:55:46 2012
@@ -5,8 +5,8 @@ Bundle-Vendor: Apache Software Fundation
 Bundle-Version: 1.0.0
 Bundle-SymbolicName: org.apache.ant.antdsl; singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.xtext;bundle-version="2.1.0";visibility:=reexport,
- org.eclipse.xtext.xbase;bundle-version="2.1.0";resolution:=optional;visibility:=reexport,
+Require-Bundle: org.eclipse.xtext;bundle-version="2.3.0";visibility:=reexport,
+ org.eclipse.xtext.xbase;bundle-version="2.3.0";resolution:=optional;visibility:=reexport,
  org.apache.log4j;bundle-version="1.2.15";visibility:=reexport,
  org.apache.commons.logging;bundle-version="1.0.4";resolution:=optional;visibility:=reexport,
  org.eclipse.xtext.generator;resolution:=optional,



Mime
View raw message