Index: E:/workspace-3.4M7-JBoss/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ElService.java
===================================================================
--- E:/workspace-3.4M7-JBoss/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ElService.java	(revision 9402)
+++ E:/workspace-3.4M7-JBoss/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ElService.java	(working copy)
@@ -14,7 +14,7 @@
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.Assert;
-import org.jboss.tools.jsf.vpe.richfaces.ComponentUtil;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr;
 import org.jboss.tools.vpe.editor.bundle.BundleMap;
 import org.jboss.tools.vpe.editor.context.VpePageContext;
 import org.jboss.tools.vpe.editor.css.ELReferenceList;
@@ -272,7 +272,12 @@
         final String attribuString = attributeNode.getValue();
         String rst  = attribuString;
         
-        rst = ComponentUtil.getBundleValue(pageContext, attributeNode);
+        //rst = ComponentUtil.getBundleValue(pageContext, attributeNode);
+        BundleMap bundle = pageContext.getBundle();
+        String value = attributeNode.getNodeValue();
+        
+		int offset=((IDOMAttr) attributeNode).getValueRegionStartOffset();
+        rst = bundle.getBundleValue(value, offset);
       
         rst = replaceEl(file, rst);
 
Index: E:/workspace-3.4M7-JBoss/plugins/org.jboss.tools.vpe/META-INF/MANIFEST.MF
===================================================================
--- E:/workspace-3.4M7-JBoss/plugins/org.jboss.tools.vpe/META-INF/MANIFEST.MF	(revision 9402)
+++ E:/workspace-3.4M7-JBoss/plugins/org.jboss.tools.vpe/META-INF/MANIFEST.MF	(working copy)
@@ -62,7 +62,6 @@
  org.eclipse.ui.ide,
  org.jboss.tools.vpe.xulrunner,
  org.mozilla.xpcom,
- org.eclipse.draw2d,
- org.jboss.tools.jsf.vpe.richfaces
+ org.eclipse.draw2d
 Bundle-Version: 2.1.0
 