Index: v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/.classpath
===================================================================
--- v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/.classpath	(revision 81)
+++ v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/.classpath	(revision 82)
@@ -3,19 +3,19 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
+	<classpathentry excluding="libs/" kind="src" path="src"/>
 	<classpathentry kind="src" path="src-gen"/>
 	<classpathentry kind="src" path="xtend-gen"/>
-	<classpathentry kind="src" path="libs"/>
-	<classpathentry kind="lib" path="libs/avalon-framework-4.2.0.jar"/>
-	<classpathentry kind="lib" path="libs/batik-all-1.7.jar"/>
-	<classpathentry kind="lib" path="libs/commons-io-1.3.1.jar"/>
-	<classpathentry kind="lib" path="libs/commons-logging-1.0.4.jar"/>
-	<classpathentry kind="lib" path="libs/fop.jar"/>
-	<classpathentry kind="lib" path="libs/serializer-2.7.0.jar"/>
-	<classpathentry kind="lib" path="libs/xalan-2.7.0.jar"/>
-	<classpathentry kind="lib" path="libs/xercesImpl-2.7.1.jar"/>
-	<classpathentry kind="lib" path="libs/xml-apis-1.3.04.jar"/>
-	<classpathentry kind="lib" path="libs/xml-apis-ext-1.3.04.jar"/>
-	<classpathentry kind="lib" path="libs/xmlgraphics-commons-1.5.jar"/>
+	<classpathentry kind="src" path="src/libs"/>
+	<classpathentry kind="lib" path="src/libs/avalon-framework-4.2.0.jar"/>
+	<classpathentry kind="lib" path="src/libs/batik-all-1.7.jar"/>
+	<classpathentry kind="lib" path="src/libs/commons-io-1.3.1.jar"/>
+	<classpathentry kind="lib" path="src/libs/commons-logging-1.0.4.jar"/>
+	<classpathentry kind="lib" path="src/libs/fop.jar"/>
+	<classpathentry kind="lib" path="src/libs/serializer-2.7.0.jar"/>
+	<classpathentry kind="lib" path="src/libs/xalan-2.7.0.jar"/>
+	<classpathentry kind="lib" path="src/libs/xercesImpl-2.7.1.jar"/>
+	<classpathentry kind="lib" path="src/libs/xml-apis-1.3.04.jar"/>
+	<classpathentry kind="lib" path="src/libs/xml-apis-ext-1.3.04.jar"/>
+	<classpathentry kind="lib" path="src/libs/xmlgraphics-commons-1.5.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
Index: v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/META-INF/MANIFEST.MF
===================================================================
--- v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/META-INF/MANIFEST.MF	(revision 81)
+++ v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/META-INF/MANIFEST.MF	(revision 82)
@@ -21,37 +21,17 @@
  org.eclipse.core.resources,
  org.eclipse.core.runtime;version="3.4.0",
- org.eclipse.xtext.xbase.lib 
+ org.eclipse.xtext.xbase.lib
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: de.ugoe.cs.swe.bnftools;uses:="org.eclipse.xtext,org.eclipse.xtext.service,com.google.inject",
  de.ugoe.cs.swe.bnftools.ebnf;uses:="org.eclipse.emf.ecore,org.eclipse.emf.common.util",
- de.ugoe.cs.swe.bnftools.ebnf.impl;
-  uses:="org.eclipse.emf.ecore,
-   de.ugoe.cs.swe.bnftools.ebnf,
-   org.eclipse.emf.common.util,
-   org.eclipse.emf.ecore.impl,
-   org.eclipse.emf.common.notify",
- de.ugoe.cs.swe.bnftools.ebnf.util;
-  uses:="org.eclipse.emf.ecore.util,
-   org.eclipse.emf.ecore,
-   org.eclipse.emf.common.notify.impl,
-   de.ugoe.cs.swe.bnftools.ebnf,
-   org.eclipse.emf.common.notify",
+ de.ugoe.cs.swe.bnftools.ebnf.impl; uses:="org.eclipse.emf.ecore,  de.ugoe.cs.swe.bnftools.ebnf,  org.eclipse.emf.common.util,  org.eclipse.emf.ecore.impl,  org.eclipse.emf.common.notify",
+ de.ugoe.cs.swe.bnftools.ebnf.util; uses:="org.eclipse.emf.ecore.util,  org.eclipse.emf.ecore,  org.eclipse.emf.common.notify.impl,  de.ugoe.cs.swe.bnftools.ebnf,  org.eclipse.emf.common.notify",
  de.ugoe.cs.swe.bnftools.formatting;uses:="org.eclipse.xtext.formatting.impl",
  de.ugoe.cs.swe.bnftools.generator;uses:="org.eclipse.emf.ecore.resource,de.ugoe.cs.swe.bnftools.ebnf,org.eclipse.xtext.generator",
  de.ugoe.cs.swe.bnftools.parser.antlr;uses:="de.ugoe.cs.swe.bnftools.services,org.eclipse.xtext.parser.antlr,de.ugoe.cs.swe.bnftools.parser.antlr.internal",
- de.ugoe.cs.swe.bnftools.parser.antlr.internal;
-  uses:="org.eclipse.emf.ecore,
-   de.ugoe.cs.swe.bnftools.services,
-   org.antlr.runtime,
-   org.eclipse.xtext.parser.antlr",
+ de.ugoe.cs.swe.bnftools.parser.antlr.internal; uses:="org.eclipse.emf.ecore,  de.ugoe.cs.swe.bnftools.services,  org.antlr.runtime,  org.eclipse.xtext.parser.antlr",
  de.ugoe.cs.swe.bnftools.scoping;uses:="org.eclipse.xtext.scoping.impl",
- de.ugoe.cs.swe.bnftools.serializer;
-  uses:="org.eclipse.xtext,
-   org.eclipse.emf.ecore,
-   org.eclipse.xtext.serializer.sequencer,
-   de.ugoe.cs.swe.bnftools.services,
-   de.ugoe.cs.swe.bnftools.ebnf,
-   org.eclipse.xtext.serializer.analysis,
-   org.eclipse.xtext.nodemodel",
+ de.ugoe.cs.swe.bnftools.serializer; uses:="org.eclipse.xtext,  org.eclipse.emf.ecore,  org.eclipse.xtext.serializer.sequencer,  de.ugoe.cs.swe.bnftools.services,  de.ugoe.cs.swe.bnftools.ebnf,  org.eclipse.xtext.serializer.analysis,  org.eclipse.xtext.nodemodel",
  de.ugoe.cs.swe.bnftools.services;uses:="org.eclipse.xtext,org.eclipse.xtext.service",
  de.ugoe.cs.swe.bnftools.validation;uses:="de.ugoe.cs.swe.bnftools.ebnf"
+Bundle-ClassPath: .,src/libs/avalon-framework-4.2.0.jar,src/libs/batik-all-1.7.jar,src/libs/commons-io-1.3.1.jar,src/libs/commons-logging-1.0.4.jar,src/libs/fop.jar,src/libs/serializer-2.7.0.jar,src/libs/xalan-2.7.0.jar,src/libs/xercesImpl-2.7.1.jar,src/libs/xml-apis-1.3.04.jar,src/libs/xml-apis-ext-1.3.04.jar,src/libs/xmlgraphics-commons-1.5.jar
Index: v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/build.properties
===================================================================
--- v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/build.properties	(revision 81)
+++ v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/build.properties	(revision 82)
@@ -1,7 +1,21 @@
+
 source.. = src/,\
            src-gen/,\
            xtend-gen/,\
-           libs/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml
+           src/libs/
+           
+bin.includes = model/,\
+               META-INF/,\
+               plugin.xml,\
+               src/libs/avalon-framework-4.2.0.jar,\
+               src/libs/batik-all-1.7.jar,\
+               src/libs/commons-io-1.3.1.jar,\
+               src/libs/commons-logging-1.0.4.jar,\
+               src/libs/fop.jar,\
+               src/libs/serializer-2.7.0.jar,\
+               src/libs/xalan-2.7.0.jar,\
+               src/libs/xercesImpl-2.7.1.jar,\
+               src/libs/xml-apis-1.3.04.jar,\
+               src/libs/xml-apis-ext-1.3.04.jar,\
+               src/libs/xmlgraphics-commons-1.5.jar
+               
Index: v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/src-gen/de/ugoe/cs/swe/bnftools/serializer/EbnfSyntacticSequencer.java
===================================================================
--- v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/src-gen/de/ugoe/cs/swe/bnftools/serializer/EbnfSyntacticSequencer.java	(revision 81)
+++ v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/src-gen/de/ugoe/cs/swe/bnftools/serializer/EbnfSyntacticSequencer.java	(revision 82)
@@ -76,13 +76,13 @@
 	 * Syntax:
 	 *     (
+	     '|' | 
 	     ']' | 
-	     '|' | 
+	     '[' | 
+	     ')' | 
 	     '(' | 
+	     '+' | 
+	     '{' | 
 	     '*' | 
-	     '+' | 
-	     '}' | 
-	     '{' | 
-	     '[' | 
-	     ')'
+	     '}'
 	 )*
 	 */
Index: v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/src/de/ugoe/cs/swe/bnftools/generator/EbnfGenerator.xtend
===================================================================
--- v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/src/de/ugoe/cs/swe/bnftools/generator/EbnfGenerator.xtend	(revision 81)
+++ v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/src/de/ugoe/cs/swe/bnftools/generator/EbnfGenerator.xtend	(revision 82)
@@ -42,10 +42,10 @@
 				var uri = (fsa as IFileSystemAccessExtension2).getURI(e.name + ".fo");
 				var String fullUri = workspacePath + uri.path.substring(10, uri.path.length);
-				System.out.println(workspacePath + uri.path.substring(10, uri.path.length));
 				var File file = new File(fullUri);
-				System.out.println(file.exists+ "," + fullUri.substring(0, fullUri.length - 3));
 
 				if (file.exists) {
+					
 					foToPdf.createPdfFromFo(fullUri.substring(0, fullUri.length - 3));
+//					fsa.deleteFile(e.name + ".fo");
 				}
 			}
Index: v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/src/de/ugoe/cs/swe/bnftools/generator/foToPdf.java
===================================================================
--- v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/src/de/ugoe/cs/swe/bnftools/generator/foToPdf.java	(revision 81)
+++ v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/src/de/ugoe/cs/swe/bnftools/generator/foToPdf.java	(revision 82)
@@ -40,9 +40,9 @@
 
 		// Step 2: Set up output stream.
-		OutputStream out = new BufferedOutputStream(new FileOutputStream(new File(pdfFileName+".pdf")));
+		OutputStream out = new BufferedOutputStream(new FileOutputStream(new File(pdfFileName+".rtf")));
 
 		try {
 			// Step 3: Construct fop with desired output format
-			Fop fop = fopFactory.newFop(MimeConstants.MIME_PDF, out);
+			Fop fop = fopFactory.newFop(MimeConstants.MIME_RTF, out);
 
 			// Step 4: Setup JAXP using identity transformer