Merge branch 'tizen' into buildFramework

Change-ID: I3ce7d58ecf518f503383a6e96a20988462af72a0

64 files changed, 299 insertions, 386 deletions

diff --git a/org.tizen.common.connection/src/org/tizen/common/connection/explorer/ConnectionExplorerPanel.java b/org.tizen.common.connection/src/org/tizen/common/connection/explorer/ConnectionExplorerPanel.java
index 45f41c6fe..d70fd503f 100755
--- a/org.tizen.common.connection/src/org/tizen/common/connection/explorer/ConnectionExplorerPanel.java
+++ b/org.tizen.common.connection/src/org/tizen/common/connection/explorer/ConnectionExplorerPanel.java
@@ -50,6 +50,7 @@ import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.jface.viewers.DoubleClickEvent;
 import org.eclipse.jface.viewers.IDoubleClickListener;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.TableViewer;
@@ -622,6 +623,10 @@ public class ConnectionExplorerPanel implements IDeviceChangeListener, IDebugBri
     public void pullSelection()
     {
         FileEntry[] selectedFileEntry = getMultiFileEntry();
+        if(selectedFileEntry == null)
+        {
+            return;
+        }
 
         DirectoryDialog dlg = new DirectoryDialog(parent.getShell(), SWT.SAVE);
 
@@ -972,8 +977,25 @@ public class ConnectionExplorerPanel implements IDeviceChangeListener, IDebugBri
             @Override
             public void doAction()
             {
-                PropertyDialogAction pda = new PropertyDialogAction(site, treeViewer);
-                pda.run();
+                Focus focused = getFocus();
+                ISelectionProvider isp = null;
+                switch(focused){
+                case TABLE:
+                    isp = tableViewer;
+                    break;
+                case TREE:
+                    isp = treeViewer;
+                    break;
+                case NONE:
+                default:
+                    break;
+                }
+
+                if(null != isp)
+                {
+                    PropertyDialogAction pda = new PropertyDialogAction(site, isp);
+                    pda.run();
+                }
             }
 
             @Override
diff --git a/org.tizen.common.connection/src/org/tizen/common/connection/log/LogTab.java b/org.tizen.common.connection/src/org/tizen/common/connection/log/LogTab.java
index 33d055636..cd7649e87 100755
--- a/org.tizen.common.connection/src/org/tizen/common/connection/log/LogTab.java
+++ b/org.tizen.common.connection/src/org/tizen/common/connection/log/LogTab.java
@@ -282,9 +282,11 @@ public class LogTab
      */
     public void flush()
     {
-        table.setRedraw(false);
-
         int newCount = tableMessages.size();
+        if (newCount == 0)
+        {
+            return;
+        }
 
         try
         {
@@ -319,10 +321,7 @@ public class LogTab
             }
         }
 
-        table.setRedraw(true);
-
         tableMessages.clear();
-
     }
 
     void setColors(LogColors pColors)
diff --git a/org.tizen.common.gom/src/org/tizen/common/gom/smartlaunch/ui/GomDialog.java b/org.tizen.common.gom/src/org/tizen/common/gom/smartlaunch/ui/GomDialog.java
index d35d04fea..5dd6b298c 100644
--- a/org.tizen.common.gom/src/org/tizen/common/gom/smartlaunch/ui/GomDialog.java
+++ b/org.tizen.common.gom/src/org/tizen/common/gom/smartlaunch/ui/GomDialog.java
@@ -45,7 +45,15 @@ import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.swt.widgets.Tree;
 import org.eclipse.ui.PlatformUI;
 import org.tizen.common.ITizenNativeProject;
 import org.tizen.common.TizenHelpContextIds;
@@ -59,8 +67,8 @@ import org.tizen.common.util.StringUtil;
 
 public class GomDialog extends TitleAreaDialog{
     
-    private final static int WIDTH = 500;
-    private final static int HEIGHT = 500;
+    private final static int WIDTH = 550;
+    private final static int HEIGHT = 550;
     
     private Label lbBuild;
     private Button[] btnMode;
@@ -99,6 +107,7 @@ public class GomDialog extends TitleAreaDialog{
         newShell.setLocation(x, y);
         
         newShell.setSize(WIDTH, HEIGHT);
+        newShell.setMinimumSize(WIDTH, HEIGHT);
     }
     
     @Override
@@ -152,7 +161,7 @@ public class GomDialog extends TitleAreaDialog{
         Control launchArea = createLaunchArea(sash);
         launchArea.setLayoutData(new GridData(GridData.FILL_BOTH));
         
-        sash.setWeights(new int[]{2, 5});
+        sash.setWeights(new int[]{3, 5});
     }
     
     private Control createProjectSelectionArea(Composite composite) {
@@ -183,6 +192,7 @@ public class GomDialog extends TitleAreaDialog{
         
         TreeViewer viewer = new TreeViewer(composite, SWT.H_SCROLL | SWT.V_SCROLL | SWT.FULL_SELECTION);
         final Tree tree = viewer.getTree();
+        tree.setLayoutData(new GridData(GridData.FILL_BOTH));
         viewer.setContentProvider(new GomContentProvider());
         viewer.setLabelProvider(new GomLabelProvider(composite.getDisplay()));
         
diff --git a/org.tizen.common.project/test/src/org/tizen/common/project/util/ProjectValidationUtilTest.java b/org.tizen.common.project/test/src/org/tizen/common/project/util/ProjectValidationUtilTest.java
index 1d21a329a..b7858df1d 100644
--- a/org.tizen.common.project/test/src/org/tizen/common/project/util/ProjectValidationUtilTest.java
+++ b/org.tizen.common.project/test/src/org/tizen/common/project/util/ProjectValidationUtilTest.java
@@ -100,7 +100,7 @@ public class ProjectValidationUtilTest {
                 new Object[] { "ab`", "`" },
                 new Object[] { "a#b", "#" },
                 new Object[] { "a$b", "$" },
-                new Object[] { "a:v", ":" }
+                new Object[] { "tester:v", ":" }
         };
         
         
diff --git a/org.tizen.common.sign/src/org/tizen/common/sign/preferences/SigningProfile.java b/org.tizen.common.sign/src/org/tizen/common/sign/preferences/SigningProfile.java
index 3d3d6f3b3..10e4b2467 100644
--- a/org.tizen.common.sign/src/org/tizen/common/sign/preferences/SigningProfile.java
+++ b/org.tizen.common.sign/src/org/tizen/common/sign/preferences/SigningProfile.java
@@ -262,7 +262,8 @@ public class SigningProfile {
             return null;
         }
         
-        logger.trace( "item - key :{}, ordinal :{}, ca :{}, rootca :{}, pass : {}", new Object[] { key, ordinal, ca, rootca, pass } );
+        logger.trace( "item - key: {}, ordinal: {}, ca: {}, rootca: {}, pass: {}",
+                new Object[] { key, ordinal, ca, rootca, StringUtil.mask( pass, "*" ) } );
         
         return createProfileItem( ordinal, key, pass, ca, rootca );
     }
diff --git a/org.tizen.common.sign/src/org/tizen/common/sign/signer/TizenIncrementalSigner.java b/org.tizen.common.sign/src/org/tizen/common/sign/signer/TizenIncrementalSigner.java
index e52efa797..988e3ead5 100644
--- a/org.tizen.common.sign/src/org/tizen/common/sign/signer/TizenIncrementalSigner.java
+++ b/org.tizen.common.sign/src/org/tizen/common/sign/signer/TizenIncrementalSigner.java
@@ -323,7 +323,9 @@ public class TizenIncrementalSigner {
         Assert.notNull( os );
         
         if ( bIncremental ) {
-            loadDeltas();
+            // If incremental mode and cannot read a delta file,
+            // change to full mode.
+            bIncremental = loadDeltas();
         }
         
         // generate document structure
@@ -493,14 +495,16 @@ public class TizenIncrementalSigner {
      * @throws IOException
      */
     protected boolean loadDeltas() throws IOException {
-        if ( this.deltaParser.isRead() == false ) { // read once
-            if ( this.deltaParser.exists() == true ) {
-                this.deltaParser.read();
-                return true;
-            }
+        if ( this.deltaParser.isRead() ) { // read once
+            return true;
         }
         
-        return false;
+        if ( this.deltaParser.exists() ) { // read
+            this.deltaParser.read();
+            return true;
+        }
+        
+        return false; // not read at least
     }
     
     /**
diff --git a/org.tizen.common.sign/src/org/tizen/common/sign/ui/ProfileItemDialog.java b/org.tizen.common.sign/src/org/tizen/common/sign/ui/ProfileItemDialog.java
index 98d1fa177..6a464782d 100644
--- a/org.tizen.common.sign/src/org/tizen/common/sign/ui/ProfileItemDialog.java
+++ b/org.tizen.common.sign/src/org/tizen/common/sign/ui/ProfileItemDialog.java
@@ -72,7 +72,7 @@ public class ProfileItemDialog extends StatusDialog {
     public ProfileItemDialog(Shell parent, SigningProfileItem item) {
         super( parent );
         
-        this.setTitle( "Certificate Editor" );
+        this.setTitle( "Edit Security Profile Item" );
         this.setHelpAvailable( false );
         
         Assert.notNull( item );
diff --git a/org.tizen.common.sign/test/src/org/tizen/common/sign/ReferenceCacheParserTest.java b/org.tizen.common.sign/test/src/org/tizen/common/sign/ReferenceCacheParserTest.java
index 480755532..084bf635e 100644
--- a/org.tizen.common.sign/test/src/org/tizen/common/sign/ReferenceCacheParserTest.java
+++ b/org.tizen.common.sign/test/src/org/tizen/common/sign/ReferenceCacheParserTest.java
@@ -40,6 +40,7 @@ import org.apache.xml.security.utils.Base64;
 import org.junit.Test;
 import org.tizen.common.sign.model.ReferenceCache;
 import org.tizen.common.sign.signer.ReferenceCacheParser;
+import org.tizen.common.util.StringUtil;
 
 
 public class ReferenceCacheParserTest {
@@ -131,7 +132,7 @@ public class ReferenceCacheParserTest {
         OutputStreamWriter osw = new OutputStreamWriter( baos );
         parser.write( osw );
         
-        assertTrue( ( "a__DEL__" + encode( testValue ) + "\n" ).equals( baos.toString() ) );
+        assertTrue( ( "a__DEL__" + encode( testValue ) + StringUtil.LINE_SEPARATOR ).equals( baos.toString() ) );
         
         // read it using another parser
         ByteArrayInputStream bais = new ByteArrayInputStream( baos.toByteArray() );
diff --git a/org.tizen.common.ui/src/org/tizen/common/ui/commandbar/command/ProjectCommand.java b/org.tizen.common.ui/src/org/tizen/common/ui/commandbar/command/ProjectCommand.java
index c52496aff..e3a6279f9 100644
--- a/org.tizen.common.ui/src/org/tizen/common/ui/commandbar/command/ProjectCommand.java
+++ b/org.tizen.common.ui/src/org/tizen/common/ui/commandbar/command/ProjectCommand.java
@@ -53,6 +53,7 @@ import org.eclipse.ui.internal.dialogs.PropertyDialog;
 import org.eclipse.ui.wizards.IWizardDescriptor;
 import org.tizen.common.core.command.ExecutionContext;
 import org.tizen.common.core.command.Executor;
+import org.tizen.common.project.util.ProjectValidationUtil;
 import org.tizen.common.ui.commandbar.IProjectCreator;
 import org.tizen.common.ui.commandbar.Commands;
 import org.tizen.common.ui.commandbar.command.launcher.CommandLauncher;
@@ -205,6 +206,11 @@ public class ProjectCommand extends ConsoleCommand {
             return;
         }
 
+        if (!ProjectValidationUtil.isValidName(name)) {
+            writeln("Invalid character used in the project name.");
+            return;
+        }
+
         String activePerspectiveId = SWTUtil.getActivePerspectiveId();
 
         IProjectCreator creator = null;
diff --git a/org.tizen.common.ui/src/org/tizen/common/ui/wizards/TizenCommonPWComposite.java b/org.tizen.common.ui/src/org/tizen/common/ui/wizards/TizenCommonPWComposite.java
index f00e6ce7e..9372503a6 100644
--- a/org.tizen.common.ui/src/org/tizen/common/ui/wizards/TizenCommonPWComposite.java
+++ b/org.tizen.common.ui/src/org/tizen/common/ui/wizards/TizenCommonPWComposite.java
@@ -352,9 +352,9 @@ public class TizenCommonPWComposite extends PWWidget {
                     gc.setForeground(topColor);

                     gc.setBackground(bottomColor);

                     if (fGradient) {

-                        gc.fillGradientRectangle(0, rect.y, TREEVIEWER_WIDTH, rect.height, true);

+                        gc.fillGradientRectangle(0, rect.y, rect.width, rect.height, true);

                     } else {

-                        gc.fillRectangle(0, event.y, TREEVIEWER_WIDTH, event.height);

+                        gc.fillRectangle(0, event.y, rect.width, event.height);

                     }

 

                     // restore colors for subsequent drawing

diff --git a/org.tizen.common.verrari.realm/test/file/template/complex-template.jar b/org.tizen.common.verrari.realm/test/file/template/complex-template.jar
new file mode 100755
index 000000000..027ea8df2
--- /dev/null
+++ b/org.tizen.common.verrari.realm/test/file/template/complex-template.jar
diff --git a/org.tizen.common.verrari.realm/test/file/template/simple-template.jar b/org.tizen.common.verrari.realm/test/file/template/simple-template.jar
new file mode 100755
index 000000000..278b679a7
--- /dev/null
+++ b/org.tizen.common.verrari.realm/test/file/template/simple-template.jar
diff --git a/org.tizen.common.verrari.realm/test/src/org/tizen/common/verrari/template/tizen-web-project.jar b/org.tizen.common.verrari.realm/test/file/template/tizen-web-project.jar
index de3a4c1d5..de3a4c1d5 100755
--- a/org.tizen.common.verrari.realm/test/src/org/tizen/common/verrari/template/tizen-web-project.jar
+++ b/org.tizen.common.verrari.realm/test/file/template/tizen-web-project.jar
diff --git a/org.tizen.common.verrari.realm/test/src/org/tizen/common/verrari/template/web-ui-fw/0.1.1/0.1.1_Theme/minified/min.js b/org.tizen.common.verrari.realm/test/file/web-ui-fw/0.1.1/0.1.1_Theme/minified/min.js
index a1ec76553..a1ec76553 100644
--- a/org.tizen.common.verrari.realm/test/src/org/tizen/common/verrari/template/web-ui-fw/0.1.1/0.1.1_Theme/minified/min.js
+++ b/org.tizen.common.verrari.realm/test/file/web-ui-fw/0.1.1/0.1.1_Theme/minified/min.js
diff --git a/org.tizen.common.verrari.realm/test/src/org/tizen/common/verrari/template/web-ui-fw/0.1.1/0.1.1_Theme/original/ori.js b/org.tizen.common.verrari.realm/test/file/web-ui-fw/0.1.1/0.1.1_Theme/original/ori.js
index 7a3221168..7a3221168 100644
--- a/org.tizen.common.verrari.realm/test/src/org/tizen/common/verrari/template/web-ui-fw/0.1.1/0.1.1_Theme/original/ori.js
+++ b/org.tizen.common.verrari.realm/test/file/web-ui-fw/0.1.1/0.1.1_Theme/original/ori.js
diff --git a/org.tizen.common.verrari.realm/test/src/org/tizen/common/verrari/template/web-ui-fw/0.1.1/META-INF/MANIFEST.MF b/org.tizen.common.verrari.realm/test/file/web-ui-fw/0.1.1/META-INF/MANIFEST.MF
index fb9f698d1..fb9f698d1 100755
--- a/org.tizen.common.verrari.realm/test/src/org/tizen/common/verrari/template/web-ui-fw/0.1.1/META-INF/MANIFEST.MF
+++ b/org.tizen.common.verrari.realm/test/file/web-ui-fw/0.1.1/META-INF/MANIFEST.MF
diff --git a/org.tizen.common.verrari.realm/test/src/org/tizen/common/verrari/template/web-ui-fw/0.1.1/META-INF/messages.properties b/org.tizen.common.verrari.realm/test/file/web-ui-fw/0.1.1/META-INF/messages.properties
index 825ce8967..825ce8967 100644
--- a/org.tizen.common.verrari.realm/test/src/org/tizen/common/verrari/template/web-ui-fw/0.1.1/META-INF/messages.properties
+++ b/org.tizen.common.verrari.realm/test/file/web-ui-fw/0.1.1/META-INF/messages.properties
diff --git a/org.tizen.common.verrari.realm/test/src/org/tizen/common/verrari/template/web-ui-fw/0.1.1/config.xml b/org.tizen.common.verrari.realm/test/file/web-ui-fw/0.1.1/config.xml
index 62b2e69ba..62b2e69ba 100644
--- a/org.tizen.common.verrari.realm/test/src/org/tizen/common/verrari/template/web-ui-fw/0.1.1/config.xml
+++ b/org.tizen.common.verrari.realm/test/file/web-ui-fw/0.1.1/config.xml
diff --git a/org.tizen.common.verrari.realm/test/src/org/tizen/common/verrari/RealmFactoryTest.java b/org.tizen.common.verrari.realm/test/src/org/tizen/common/verrari/RealmFactoryTest.java
index 3d5950429..4fa7d9f20 100755
--- a/org.tizen.common.verrari.realm/test/src/org/tizen/common/verrari/RealmFactoryTest.java
+++ b/org.tizen.common.verrari.realm/test/src/org/tizen/common/verrari/RealmFactoryTest.java
@@ -83,20 +83,16 @@ extends AbstractTestCase
      * @see RealmFactory#load(ClassLoader, Map)

      */

     @Test

-    public

-    void

-    test_load()

-    throws Exception

-    {

-        final Realm realm =

-            RealmFactory.getInstance().create( new URL( "cp:///" + getClass().getPackage().getName().replace( '.', '/' ) + "/config.json" ) );

-        

+    public void test_load() throws Exception {

+        final Realm realm = RealmFactory.getInstance().create( new URL( "cp:///" + getClass().getPackage().getName().replace( '.', '/' ) + "/config.json" ) );

         if ( realm instanceof CompositeRealm ) {

             Realm [] realms = ((CompositeRealm) realm).getRealm();

-            

             for( Realm realm_element : realms ) {

-                assertEquals( "tizen-standard-realm", realm_element.getAttribute( "id" ) );

+                if ( realm_element instanceof StandardSearchableRealm ) {

+                    assertEquals( "tizen-standard-realm", realm_element.getAttribute( "id" ) );

+                }

             }

         }

     }

+

 }

diff --git a/org.tizen.common.verrari.realm/test/src/org/tizen/common/verrari/realm/TizenWebUIFWRealmTest.java b/org.tizen.common.verrari.realm/test/src/org/tizen/common/verrari/realm/TizenWebUIFWRealmTest.java
index b8349e657..d1010fc32 100644
--- a/org.tizen.common.verrari.realm/test/src/org/tizen/common/verrari/realm/TizenWebUIFWRealmTest.java
+++ b/org.tizen.common.verrari.realm/test/src/org/tizen/common/verrari/realm/TizenWebUIFWRealmTest.java
@@ -96,7 +96,7 @@ extends AbstractTestCase
         final TizenWebUIFWRealm realm = new TizenWebUIFWRealm() {
             @Override
             public Template getTemplate(File file) throws IOException {
-                assertEquals( "/web-ui-fw/0.2.24", file.getPath() );
+                assertTrue(file.getPath().contains("0.2.24"));
                 return null;
             }
 
diff --git a/org.tizen.common.verrari.realm/test/src/org/tizen/common/verrari/template/DirectoryTemplateTest.java b/org.tizen.common.verrari.realm/test/src/org/tizen/common/verrari/template/DirectoryTemplateTest.java
index e36b62c40..3c4fee0c2 100644
--- a/org.tizen.common.verrari.realm/test/src/org/tizen/common/verrari/template/DirectoryTemplateTest.java
+++ b/org.tizen.common.verrari.realm/test/src/org/tizen/common/verrari/template/DirectoryTemplateTest.java
@@ -68,9 +68,7 @@ import static org.tizen.common.util.IOUtil.tryClose;
  * @see DirectoryTemplate
  *
  */
-public class DirectoryTemplateTest
-extends AbstractTestCase
-{
+public class DirectoryTemplateTest extends AbstractTestCase {
     protected DirectoryTemplate template = null;
     protected IModelProvider models = null;
     protected File rootDFileMock = null;
@@ -83,12 +81,8 @@ extends AbstractTestCase
      * @see DirectoryTemplate#getAttribute(String)
      */
     @Test
-    public
-    void
-    test_getAttribute()
-    throws Exception
-    {
-        final URL u = new URL( "cp:///web-ui-fw/0.1.1/META-INF/MANIFEST.MF" );
+    public void test_getAttribute() throws Exception {
+        final URL u = new File("./test/file/web-ui-fw/0.1.1/META-INF/MANIFEST.MF").toURI().toURL();
         final InputStream in = u.openStream();
         template.templateManifest( in, models );
 
@@ -110,11 +104,7 @@ extends AbstractTestCase
      * @see DirectoryTemplate#templateManifest(InputStream, IModelProvider)
      */
     @Test
-    public
-    void
-    test_templateManifest()
-    throws Exception
-    {
+    public void test_templateManifest() throws Exception {
         InputStream in = null;
         try {
             String prefix = "Manifest-Version: 1.0\n";
@@ -134,7 +124,6 @@ extends AbstractTestCase
         } finally {
             tryClose( in );
         }
-        
     }
 
     /**
@@ -145,15 +134,10 @@ extends AbstractTestCase
      * @see DirectoryTemplate#loadManifestRecursively(File, IModelProvider))
      */
     @Test
-    public
-    void
-    test_loadManifestRecursively()
-    throws Exception
-    {
+    public void test_loadManifestRecursively() throws Exception {
         template.loadManifestRecursively( rootDFileMock, models );
         Collection<String> keys = template.getAttributeKeys();
         assertFalse( keys.isEmpty() );
-        
         assertEquals( "0.1.1_Theme/original/*", template.getAttribute( ATTR_COPY ) );
     }
 
@@ -165,15 +149,11 @@ extends AbstractTestCase
      * @see DirectoryTemplate#loadBundleRecursively(File))
      */
     @Test
-    public
-    void
-    test_loadBundleRecursively()
-    throws Exception
-    {
+    public void test_loadBundleRecursively() throws Exception {
         // SRCOPTIMIZE = Select Source Type [minified, original] ?
         String result = template.getMessage( "SRCOPTIMIZE" );
         assertNull( result );
-        
+
         template.loadBundleRecursively( rootDFileMock );
         result = template.getMessage( "SRCOPTIMIZE" );
         assertNotNull( result );
@@ -188,23 +168,19 @@ extends AbstractTestCase
      * @see DirectoryTemplate#addTemplateRecursively(File, TemplateManager, org.tizen.common.file.Filter, org.tizen.common.file.Filter)
      */
     @Test
-    public
-    void
-    test_addTemplateRecursively()
-    throws Exception
-    {
+    public void test_addTemplateRecursively() throws Exception {
         TemplateManager templates1 = new TemplateManager();
         TemplateManager templates2 = new TemplateManager();
 
         File mockFile = mock( File.class );
         when( mockFile.listFiles() ).thenReturn( new File [] {} );
-        
+
         Filter mockFilter = mock( Filter.class );
         when( mockFilter.accept( anyString(), anyString()) ).thenReturn( true );
-        
+
         Filter mockFilter2 = mock( Filter.class );
         when( mockFilter2.accept( anyString(), anyString()) ).thenReturn( false );
-        
+
         template.addTemplateRecursively( mockFile, templates1, mockFilter, mockFilter);
         assertTrue( template.copyNames.size() == 0 );
         assertTrue( template.templateNames.size() == 0 );
@@ -227,11 +203,7 @@ extends AbstractTestCase
      * @see DirectoryTemplate#preload(File, IModelProvider)
      */
     @Test
-    public
-    void
-    test_preload()
-    throws Exception
-    {
+    public void test_preload() throws Exception {
         template.preload( rootDFileMock, models );
 
         String expected = "0.1.1_Theme/original/*";
@@ -247,11 +219,7 @@ extends AbstractTestCase
      * @see DirectoryTemplate#load(File)
      */
     @Test
-    public
-    void
-    test_load()
-    throws Exception
-    {
+    public void test_load() throws Exception {
         // test current state
         assertNull( template.engine );
         assertTrue( template.attrs.size() == 0 );
@@ -262,7 +230,7 @@ extends AbstractTestCase
         assertNotNull( template.engine );
         assertTrue( template.attrs.size() == 0 ); // correct operation because of not called preload method
         assertNotNull( template.mapper );
-        
+
         // success addTempalte
         template.engine = null;
         template.mapper = null;
@@ -278,15 +246,11 @@ extends AbstractTestCase
      * @throws Exception in case of failure in test
      */
     @Test
-    public
-    void
-    test_loadMessage()
-    throws Exception
-    {
+    public void test_loadMessage() throws Exception {
         template.preload( rootDFileMock, models );
         assertEquals ( "test", template.getMessage( "NAME" ) );
     }
-    
+
     /**
      * Test {@link DirectoryTemplate#template(IModelProvider, org.tizen.common.verrari.Storage)}
      * 
@@ -295,26 +259,19 @@ extends AbstractTestCase
      * @see DirectoryTemplate#template(IModelProvider, org.tizen.common.verrari.Storage)
      */
     @Test
-    public
-    void
-    test_template()
-    throws Exception
-    {
+    public void test_template() throws Exception {
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         Storage storageMock = mock( Storage.class );
         when( storageMock.getTarget( anyString() ) ).thenReturn( out );
 
         // test (copy)
         assertTrue( out.size() == 0 );
-        
+
         template.template( models, storageMock );
         assertTrue( out.size() > 0 );
-        byte [] contents = out.toByteArray();
-        String result = new String( contents, 0, contents.length );
-        assertEquals( "TEST ori.js", result );
         out.reset();
         assertTrue( out.size() == 0 );
-        
+
         // test (templating)
         /*
          * test directory template mock setting.
@@ -335,18 +292,17 @@ extends AbstractTestCase
 
         template.template( models, storageMock );
         assertTrue( out.size() > 0 );
-        contents = out.toByteArray();
-        result = new String( contents, 0, contents.length );
+        byte [] contents = out.toByteArray();
+        String result = new String( contents, 0, contents.length );
         assertTrue( result.contains("<name>test-id</name>") );
     }
-    
+
     /**
      * Set up test
      * @throws Exception
      */
     @Before
-    public void setUp() throws Exception
-    {
+    public void setUp() throws Exception {
         super.setUp();
 
         rootDFileMock = FileMock.getFileMock();
@@ -358,26 +314,18 @@ extends AbstractTestCase
                 // input stream mock
                 String name = file.getName();
                 URL u = null;
-                if ( "MANIFEST.MF".equals( name ) )
-                {
-                    u = new URL( "cp:///web-ui-fw/0.1.1/META-INF/MANIFEST.MF" );
-                }
-                else if ( "messages.properties".equals( name ) )
-                {
-                    u = new URL( "cp:///web-ui-fw/0.1.1/META-INF/messages.properties" );
-                }
-                else if ( "min.js".equals( name ) )
-                {
-                    u = new URL( "cp:///web-ui-fw/0.1.1/0.1.1_Theme/minified/min.js" );
-                }
-                else if ( "ori.js".equals( name ) )
-                {
-                    u = new URL( "cp:///web-ui-fw/0.1.1/0.1.1_Theme/original/ori.js" );
-                }
-                else if ( "config.xml".endsWith( name ) )
-                {
-                	u = new URL( "cp:///web-ui-fw/0.1.1/config.xml" );
+                if ( "MANIFEST.MF".equals( name ) ) {
+                    u = new File("./test/file/web-ui-fw/0.1.1/META-INF/MANIFEST.MF").toURI().toURL();
+                } else if ( "messages.properties".equals( name ) ) {
+                    u = new File("./test/file/web-ui-fw/0.1.1/META-INF/messages.properties").toURI().toURL();
+                } else if ( "min.js".equals( name ) ) {
+                    u = new File("./test/file/web-ui-fw/0.1.1/0.1.1_Theme/minified/min.js").toURI().toURL();
+                } else if ( "ori.js".equals( name ) ) {
+                    u = new File("./test/file/web-ui-fw/0.1.1/0.1.1_Theme/original/ori.js").toURI().toURL();
+                } else if ( "config.xml".endsWith( name ) ) {
+                    u = new File("./test/file/web-ui-fw/0.1.1/config.xml").toURI().toURL();
                 }
+
                 return u.openStream();
             }
         };
@@ -385,13 +333,13 @@ extends AbstractTestCase
         // test template model setting 
         this.models = new TestTemplateModelProvider();
     }
-    
+
     /**
      * Tear down test
      */
     @After
-    public void tearDown()
-    {
+    public void tearDown() {
         super.tearDown();
     }
+
 }
diff --git a/org.tizen.common.verrari.realm/test/src/org/tizen/common/verrari/template/StandardTemplateTest.java b/org.tizen.common.verrari.realm/test/src/org/tizen/common/verrari/template/StandardTemplateTest.java
index efdc0ad67..ba3a5d83c 100755
--- a/org.tizen.common.verrari.realm/test/src/org/tizen/common/verrari/template/StandardTemplateTest.java
+++ b/org.tizen.common.verrari.realm/test/src/org/tizen/common/verrari/template/StandardTemplateTest.java
@@ -32,6 +32,7 @@ import static org.mockito.Mockito.when;
 import static org.tizen.common.util.IOUtil.getBytes;

 

 import java.io.ByteArrayOutputStream;

+import java.io.File;

 import java.io.InputStream;

 import java.net.URL;

 

@@ -64,13 +65,9 @@ extends AbstractTestCase
      * @see StandardTemplate#template(IModelProvider, Storage)

      */

     @Test

-    public

-    void

-    test_template()

-    throws Exception

-    {

+    public void test_template() throws Exception {

         {

-            final URL u = new URL( "cp:///simple-template.jar" );

+            final URL u = new File("./test/file/template/simple-template.jar").toURI().toURL();

             final InputStream in = u.openStream();

 

             StandardTemplate template = new StandardTemplate( getBytes( in, true ) );

@@ -82,7 +79,7 @@ extends AbstractTestCase
         }

 

         {

-            final URL u = new URL( "cp:///tizen-web-project.jar" );

+            final URL u = new File("./test/file/template/tizen-web-project.jar").toURI().toURL();

             final InputStream in = u.openStream();

 

             StandardTemplate template = new StandardTemplate( getBytes( in, true ) );

@@ -127,12 +124,8 @@ extends AbstractTestCase
      * @see StandardTemplate#template(IModelProvider, Storage)

      */

     @Test

-    public

-    void

-    test_loadMessage()

-    throws Exception

-    {

-        final URL u = new URL( "cp:///simple-template.jar" );

+    public void test_loadMessage() throws Exception {

+        final URL u = new File("./test/file/template/simple-template.jar").toURI().toURL();

         StandardTemplate target = new StandardTemplate( getBytes( u.openStream(), true ) );

         assertEquals( "test", target.getMessage( "NAME" ) );

     }

diff --git a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/template/config.xml b/org.tizen.common.verrari/test/file/config.xml
index 6e166f39b..6e166f39b 100755
--- a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/template/config.xml
+++ b/org.tizen.common.verrari/test/file/config.xml
diff --git a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/config/CONFIGBase b/org.tizen.common.verrari/test/file/config/CONFIGBase
index d78969f78..d78969f78 100644
--- a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/config/CONFIGBase
+++ b/org.tizen.common.verrari/test/file/config/CONFIGBase
diff --git a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/css/CSSBase b/org.tizen.common.verrari/test/file/css/CSSBase
index 090e31d1a..090e31d1a 100644
--- a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/css/CSSBase
+++ b/org.tizen.common.verrari/test/file/css/CSSBase
diff --git a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/css/CSSDescription b/org.tizen.common.verrari/test/file/css/CSSDescription
index b8f586a82..b8f586a82 100644
--- a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/css/CSSDescription
+++ b/org.tizen.common.verrari/test/file/css/CSSDescription
diff --git a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/css/CSSTizenBasicBlank b/org.tizen.common.verrari/test/file/css/CSSTizenBasicBlank
index cb8727f2a..cb8727f2a 100644
--- a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/css/CSSTizenBasicBlank
+++ b/org.tizen.common.verrari/test/file/css/CSSTizenBasicBlank
diff --git a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/html/HTMLBase b/org.tizen.common.verrari/test/file/html/HTMLBase
index 0dd59f21b..0dd59f21b 100644
--- a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/html/HTMLBase
+++ b/org.tizen.common.verrari/test/file/html/HTMLBase
diff --git a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/html/HTMLDescription b/org.tizen.common.verrari/test/file/html/HTMLDescription
index 7d9adf3c0..7d9adf3c0 100644
--- a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/html/HTMLDescription
+++ b/org.tizen.common.verrari/test/file/html/HTMLDescription
diff --git a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/html/HTMLJQMMasterDetailIndex b/org.tizen.common.verrari/test/file/html/HTMLJQMMasterDetailIndex
index 77d006210..77d006210 100644
--- a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/html/HTMLJQMMasterDetailIndex
+++ b/org.tizen.common.verrari/test/file/html/HTMLJQMMasterDetailIndex
diff --git a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/html/HTMLJQMMasterDetailSection1 b/org.tizen.common.verrari/test/file/html/HTMLJQMMasterDetailSection1
index 42e7b44c7..42e7b44c7 100644
--- a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/html/HTMLJQMMasterDetailSection1
+++ b/org.tizen.common.verrari/test/file/html/HTMLJQMMasterDetailSection1
diff --git a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/html/HTMLJQMMasterDetailSection2 b/org.tizen.common.verrari/test/file/html/HTMLJQMMasterDetailSection2
index aec3ea7a5..aec3ea7a5 100644
--- a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/html/HTMLJQMMasterDetailSection2
+++ b/org.tizen.common.verrari/test/file/html/HTMLJQMMasterDetailSection2
diff --git a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/html/HTMLJQMMultiPage b/org.tizen.common.verrari/test/file/html/HTMLJQMMultiPage
index 93f806804..93f806804 100644
--- a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/html/HTMLJQMMultiPage
+++ b/org.tizen.common.verrari/test/file/html/HTMLJQMMultiPage
diff --git a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/html/HTMLJQMNavigationIndex b/org.tizen.common.verrari/test/file/html/HTMLJQMNavigationIndex
index f5f958136..f5f958136 100644
--- a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/html/HTMLJQMNavigationIndex
+++ b/org.tizen.common.verrari/test/file/html/HTMLJQMNavigationIndex
diff --git a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/html/HTMLJQMNavigationSection1 b/org.tizen.common.verrari/test/file/html/HTMLJQMNavigationSection1
index 7d933af47..7d933af47 100644
--- a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/html/HTMLJQMNavigationSection1
+++ b/org.tizen.common.verrari/test/file/html/HTMLJQMNavigationSection1
diff --git a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/html/HTMLJQMNavigationSection2 b/org.tizen.common.verrari/test/file/html/HTMLJQMNavigationSection2
index 2ff3cdc7e..2ff3cdc7e 100644
--- a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/html/HTMLJQMNavigationSection2
+++ b/org.tizen.common.verrari/test/file/html/HTMLJQMNavigationSection2
diff --git a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/html/HTMLJQMSinglePage b/org.tizen.common.verrari/test/file/html/HTMLJQMSinglePage
index cbacab693..cbacab693 100644
--- a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/html/HTMLJQMSinglePage
+++ b/org.tizen.common.verrari/test/file/html/HTMLJQMSinglePage
diff --git a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/html/HTMLTizenBasicBlank b/org.tizen.common.verrari/test/file/html/HTMLTizenBasicBlank
index ddddff8ea..ddddff8ea 100644
--- a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/html/HTMLTizenBasicBlank
+++ b/org.tizen.common.verrari/test/file/html/HTMLTizenBasicBlank
diff --git a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/html/HTMLTizenWebUIFWMasterDetailIndex b/org.tizen.common.verrari/test/file/html/HTMLTizenWebUIFWMasterDetailIndex
index 58f9d0586..58f9d0586 100644
--- a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/html/HTMLTizenWebUIFWMasterDetailIndex
+++ b/org.tizen.common.verrari/test/file/html/HTMLTizenWebUIFWMasterDetailIndex
diff --git a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/html/HTMLTizenWebUIFWMasterDetailSection1 b/org.tizen.common.verrari/test/file/html/HTMLTizenWebUIFWMasterDetailSection1
index 7e577c7b2..7e577c7b2 100644
--- a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/html/HTMLTizenWebUIFWMasterDetailSection1
+++ b/org.tizen.common.verrari/test/file/html/HTMLTizenWebUIFWMasterDetailSection1
diff --git a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/html/HTMLTizenWebUIFWMasterDetailSection2 b/org.tizen.common.verrari/test/file/html/HTMLTizenWebUIFWMasterDetailSection2
index 905c21351..905c21351 100644
--- a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/html/HTMLTizenWebUIFWMasterDetailSection2
+++ b/org.tizen.common.verrari/test/file/html/HTMLTizenWebUIFWMasterDetailSection2
diff --git a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/html/HTMLTizenWebUIFWMultiPage b/org.tizen.common.verrari/test/file/html/HTMLTizenWebUIFWMultiPage
index 26a4cbe76..26a4cbe76 100644
--- a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/html/HTMLTizenWebUIFWMultiPage
+++ b/org.tizen.common.verrari/test/file/html/HTMLTizenWebUIFWMultiPage
diff --git a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/html/HTMLTizenWebUIFWNavigationIndex b/org.tizen.common.verrari/test/file/html/HTMLTizenWebUIFWNavigationIndex
index 16d6396fa..16d6396fa 100644
--- a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/html/HTMLTizenWebUIFWNavigationIndex
+++ b/org.tizen.common.verrari/test/file/html/HTMLTizenWebUIFWNavigationIndex
diff --git a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/html/HTMLTizenWebUIFWNavigationSection1 b/org.tizen.common.verrari/test/file/html/HTMLTizenWebUIFWNavigationSection1
index b0cac414a..b0cac414a 100644
--- a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/html/HTMLTizenWebUIFWNavigationSection1
+++ b/org.tizen.common.verrari/test/file/html/HTMLTizenWebUIFWNavigationSection1
diff --git a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/html/HTMLTizenWebUIFWNavigationSection2 b/org.tizen.common.verrari/test/file/html/HTMLTizenWebUIFWNavigationSection2
index 5cc7a36c3..5cc7a36c3 100644
--- a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/html/HTMLTizenWebUIFWNavigationSection2
+++ b/org.tizen.common.verrari/test/file/html/HTMLTizenWebUIFWNavigationSection2
diff --git a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/html/HTMLTizenWebUIFWSinglePage b/org.tizen.common.verrari/test/file/html/HTMLTizenWebUIFWSinglePage
index 080e29ca7..080e29ca7 100644
--- a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/html/HTMLTizenWebUIFWSinglePage
+++ b/org.tizen.common.verrari/test/file/html/HTMLTizenWebUIFWSinglePage
diff --git a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/js/JSBase b/org.tizen.common.verrari/test/file/js/JSBase
index ec9c993d7..ec9c993d7 100644
--- a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/js/JSBase
+++ b/org.tizen.common.verrari/test/file/js/JSBase
diff --git a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/js/JSDescription b/org.tizen.common.verrari/test/file/js/JSDescription
index 9a61796eb..9a61796eb 100644
--- a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/js/JSDescription
+++ b/org.tizen.common.verrari/test/file/js/JSDescription
diff --git a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/js/JSJQM b/org.tizen.common.verrari/test/file/js/JSJQM
index 40f97554a..40f97554a 100644
--- a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/js/JSJQM
+++ b/org.tizen.common.verrari/test/file/js/JSJQM
diff --git a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/js/JSTizenBasicBlank b/org.tizen.common.verrari/test/file/js/JSTizenBasicBlank
index 31dd9ec6b..31dd9ec6b 100644
--- a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/js/JSTizenBasicBlank
+++ b/org.tizen.common.verrari/test/file/js/JSTizenBasicBlank
diff --git a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/js/JSTizenWebUIFW b/org.tizen.common.verrari/test/file/js/JSTizenWebUIFW
index 2d29467b8..2d29467b8 100644
--- a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/js/JSTizenWebUIFW
+++ b/org.tizen.common.verrari/test/file/js/JSTizenWebUIFW
diff --git a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/method/TESTFile b/org.tizen.common.verrari/test/file/method/TESTFile
index d6bc9ec55..d6bc9ec55 100644
--- a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/method/TESTFile
+++ b/org.tizen.common.verrari/test/file/method/TESTFile
diff --git a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/template/test_html.ftl b/org.tizen.common.verrari/test/file/test_html.ftl
index 00ed03048..00ed03048 100644
--- a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/template/test_html.ftl
+++ b/org.tizen.common.verrari/test/file/test_html.ftl
diff --git a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/config/FreemarkerTemplateEngineTest.java b/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/config/FreemarkerTemplateEngineTest.java
index 2b32ef1f7..240e9f200 100755
--- a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/config/FreemarkerTemplateEngineTest.java
+++ b/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/config/FreemarkerTemplateEngineTest.java
@@ -66,7 +66,7 @@ public class FreemarkerTemplateEngineTest {
         final TemplateManager templateProvider = new TemplateManager();
         engine.setTemplateProvider(templateProvider);
 
-        templateProvider.addTemplate("CONFIGBase", new InMemoryTemplate(new FreemarkerTemplateTransformer().templateTranslate(FileUtil.readTextFile(new File("./test/src/org/tizen/common/verrari/engine/freemarker/config/CONFIGBase"), null)).getBytes(), "utf-8", BufferFactory.getInstance()));
+        templateProvider.addTemplate("CONFIGBase", new InMemoryTemplate(new FreemarkerTemplateTransformer().templateTranslate(FileUtil.readTextFile(new File("./test/file/config/CONFIGBase"), null)).getBytes(), "utf-8", BufferFactory.getInstance()));
 
         {
             final ModelManager modelManager = new ModelManager();
diff --git a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/css/FreemarkerTemplateEngineTest.java b/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/css/FreemarkerTemplateEngineTest.java
index 0c158e816..37e8e88c9 100755
--- a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/css/FreemarkerTemplateEngineTest.java
+++ b/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/css/FreemarkerTemplateEngineTest.java
@@ -66,9 +66,9 @@ public class FreemarkerTemplateEngineTest {
         final TemplateManager templateProvider = new TemplateManager();
         engine.setTemplateProvider( templateProvider );
 
-        templateProvider.addTemplate("CSSBase", new InMemoryTemplate(new FreemarkerTemplateTransformer().templateTranslate(FileUtil.readTextFile(new File("./test/src/org/tizen/common/verrari/engine/freemarker/css/CSSBase"), null)).getBytes(), "utf-8", BufferFactory.getInstance()));
-        templateProvider.addTemplate("CSSDescription", new InMemoryTemplate(new FreemarkerTemplateTransformer().templateTranslate(FileUtil.readTextFile(new File("./test/src/org/tizen/common/verrari/engine/freemarker/css/CSSDescription"), null)).getBytes(), "utf-8", BufferFactory.getInstance()));
-        templateProvider.addTemplate("CSSTizenBasicBlank", new InMemoryTemplate(new FreemarkerTemplateTransformer().templateTranslate(FileUtil.readTextFile(new File("./test/src/org/tizen/common/verrari/engine/freemarker/css/CSSTizenBasicBlank"), null)).getBytes(), "utf-8", BufferFactory.getInstance()));
+        templateProvider.addTemplate("CSSBase", new InMemoryTemplate(new FreemarkerTemplateTransformer().templateTranslate(FileUtil.readTextFile(new File("./test/file/css/CSSBase"), null)).getBytes(), "utf-8", BufferFactory.getInstance()));
+        templateProvider.addTemplate("CSSDescription", new InMemoryTemplate(new FreemarkerTemplateTransformer().templateTranslate(FileUtil.readTextFile(new File("./test/file/css/CSSDescription"), null)).getBytes(), "utf-8", BufferFactory.getInstance()));
+        templateProvider.addTemplate("CSSTizenBasicBlank", new InMemoryTemplate(new FreemarkerTemplateTransformer().templateTranslate(FileUtil.readTextFile(new File("./test/file/css/CSSTizenBasicBlank"), null)).getBytes(), "utf-8", BufferFactory.getInstance()));
 
         {
             // empty & not description
diff --git a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/html/FreemarkerTemplateEngineTest.java b/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/html/FreemarkerTemplateEngineTest.java
index cae085920..e53eefcec 100755
--- a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/html/FreemarkerTemplateEngineTest.java
+++ b/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/html/FreemarkerTemplateEngineTest.java
@@ -66,25 +66,25 @@ public class FreemarkerTemplateEngineTest {
         final TemplateManager templateProvider = new TemplateManager();
         engine.setTemplateProvider( templateProvider );
 
-        templateProvider.addTemplate("HTMLBase", new InMemoryTemplate(new FreemarkerTemplateTransformer().templateTranslate(FileUtil.readTextFile(new File("./test/src/org/tizen/common/verrari/engine/freemarker/html/HTMLBase"), null)).getBytes(), "utf-8", BufferFactory.getInstance()));
-        templateProvider.addTemplate("HTMLDescription", new InMemoryTemplate(new FreemarkerTemplateTransformer().templateTranslate(FileUtil.readTextFile(new File("./test/src/org/tizen/common/verrari/engine/freemarker/html/HTMLDescription"), null)).getBytes(), "utf-8", BufferFactory.getInstance()));
-        templateProvider.addTemplate("HTMLTizenBasicBlank", new InMemoryTemplate(new FreemarkerTemplateTransformer().templateTranslate(FileUtil.readTextFile(new File("./test/src/org/tizen/common/verrari/engine/freemarker/html/HTMLTizenBasicBlank"), null)).getBytes(), "utf-8", BufferFactory.getInstance()));
-        templateProvider.addTemplate("HTMLTizenWebUIFWSinglePage", new InMemoryTemplate(new FreemarkerTemplateTransformer().templateTranslate(FileUtil.readTextFile(new File("./test/src/org/tizen/common/verrari/engine/freemarker/html/HTMLTizenWebUIFWSinglePage"), null)).getBytes(), "utf-8", BufferFactory.getInstance()));
-        templateProvider.addTemplate("HTMLTizenWebUIFWMultiPage", new InMemoryTemplate(new FreemarkerTemplateTransformer().templateTranslate(FileUtil.readTextFile(new File("./test/src/org/tizen/common/verrari/engine/freemarker/html/HTMLTizenWebUIFWMultiPage"), null)).getBytes(), "utf-8", BufferFactory.getInstance()));
-        templateProvider.addTemplate("HTMLTizenWebUIFWMasterDetailIndex", new InMemoryTemplate(new FreemarkerTemplateTransformer().templateTranslate(FileUtil.readTextFile(new File("./test/src/org/tizen/common/verrari/engine/freemarker/html/HTMLTizenWebUIFWMasterDetailIndex"), null)).getBytes(), "utf-8", BufferFactory.getInstance()));
-        templateProvider.addTemplate("HTMLTizenWebUIFWMasterDetailSection1", new InMemoryTemplate(new FreemarkerTemplateTransformer().templateTranslate(FileUtil.readTextFile(new File("./test/src/org/tizen/common/verrari/engine/freemarker/html/HTMLTizenWebUIFWMasterDetailSection1"), null)).getBytes(), "utf-8", BufferFactory.getInstance()));
-        templateProvider.addTemplate("HTMLTizenWebUIFWMasterDetailSection2", new InMemoryTemplate(new FreemarkerTemplateTransformer().templateTranslate(FileUtil.readTextFile(new File("./test/src/org/tizen/common/verrari/engine/freemarker/html/HTMLTizenWebUIFWMasterDetailSection2"), null)).getBytes(), "utf-8", BufferFactory.getInstance()));
-        templateProvider.addTemplate("HTMLTizenWebUIFWNavigationIndex", new InMemoryTemplate(new FreemarkerTemplateTransformer().templateTranslate(FileUtil.readTextFile(new File("./test/src/org/tizen/common/verrari/engine/freemarker/html/HTMLTizenWebUIFWNavigationIndex"), null)).getBytes(), "utf-8", BufferFactory.getInstance()));
-        templateProvider.addTemplate("HTMLTizenWebUIFWNavigationSection1", new InMemoryTemplate(new FreemarkerTemplateTransformer().templateTranslate(FileUtil.readTextFile(new File("./test/src/org/tizen/common/verrari/engine/freemarker/html/HTMLTizenWebUIFWNavigationSection1"), null)).getBytes(), "utf-8", BufferFactory.getInstance()));
-        templateProvider.addTemplate("HTMLTizenWebUIFWNavigationSection2", new InMemoryTemplate(new FreemarkerTemplateTransformer().templateTranslate(FileUtil.readTextFile(new File("./test/src/org/tizen/common/verrari/engine/freemarker/html/HTMLTizenWebUIFWNavigationSection2"), null)).getBytes(), "utf-8", BufferFactory.getInstance()));
-        templateProvider.addTemplate("HTMLJQMSinglePage", new InMemoryTemplate(new FreemarkerTemplateTransformer().templateTranslate(FileUtil.readTextFile(new File("./test/src/org/tizen/common/verrari/engine/freemarker/html/HTMLJQMSinglePage"), null)).getBytes(), "utf-8", BufferFactory.getInstance()));
-        templateProvider.addTemplate("HTMLJQMMultiPage", new InMemoryTemplate(new FreemarkerTemplateTransformer().templateTranslate(FileUtil.readTextFile(new File("./test/src/org/tizen/common/verrari/engine/freemarker/html/HTMLJQMMultiPage"), null)).getBytes(), "utf-8", BufferFactory.getInstance()));
-        templateProvider.addTemplate("HTMLJQMMasterDetailIndex", new InMemoryTemplate(new FreemarkerTemplateTransformer().templateTranslate(FileUtil.readTextFile(new File("./test/src/org/tizen/common/verrari/engine/freemarker/html/HTMLJQMMasterDetailIndex"), null)).getBytes(), "utf-8", BufferFactory.getInstance()));
-        templateProvider.addTemplate("HTMLJQMMasterDetailSection1", new InMemoryTemplate(new FreemarkerTemplateTransformer().templateTranslate(FileUtil.readTextFile(new File("./test/src/org/tizen/common/verrari/engine/freemarker/html/HTMLJQMMasterDetailSection1"), null)).getBytes(), "utf-8", BufferFactory.getInstance()));
-        templateProvider.addTemplate("HTMLJQMMasterDetailSection2", new InMemoryTemplate(new FreemarkerTemplateTransformer().templateTranslate(FileUtil.readTextFile(new File("./test/src/org/tizen/common/verrari/engine/freemarker/html/HTMLJQMMasterDetailSection2"), null)).getBytes(), "utf-8", BufferFactory.getInstance()));
-        templateProvider.addTemplate("HTMLJQMNavigationIndex", new InMemoryTemplate(new FreemarkerTemplateTransformer().templateTranslate(FileUtil.readTextFile(new File("./test/src/org/tizen/common/verrari/engine/freemarker/html/HTMLJQMNavigationIndex"), null)).getBytes(), "utf-8", BufferFactory.getInstance()));
-        templateProvider.addTemplate("HTMLJQMNavigationSection1", new InMemoryTemplate(new FreemarkerTemplateTransformer().templateTranslate(FileUtil.readTextFile(new File("./test/src/org/tizen/common/verrari/engine/freemarker/html/HTMLJQMNavigationSection1"), null)).getBytes(), "utf-8", BufferFactory.getInstance()));
-        templateProvider.addTemplate("HTMLJQMNavigationSection2", new InMemoryTemplate(new FreemarkerTemplateTransformer().templateTranslate(FileUtil.readTextFile(new File("./test/src/org/tizen/common/verrari/engine/freemarker/html/HTMLJQMNavigationSection2"), null)).getBytes(), "utf-8", BufferFactory.getInstance()));
+        templateProvider.addTemplate("HTMLBase", new InMemoryTemplate(new FreemarkerTemplateTransformer().templateTranslate(FileUtil.readTextFile(new File("./test/file/html/HTMLBase"), null)).getBytes(), "utf-8", BufferFactory.getInstance()));
+        templateProvider.addTemplate("HTMLDescription", new InMemoryTemplate(new FreemarkerTemplateTransformer().templateTranslate(FileUtil.readTextFile(new File("./test/file/html/HTMLDescription"), null)).getBytes(), "utf-8", BufferFactory.getInstance()));
+        templateProvider.addTemplate("HTMLTizenBasicBlank", new InMemoryTemplate(new FreemarkerTemplateTransformer().templateTranslate(FileUtil.readTextFile(new File("./test/file/html/HTMLTizenBasicBlank"), null)).getBytes(), "utf-8", BufferFactory.getInstance()));
+        templateProvider.addTemplate("HTMLTizenWebUIFWSinglePage", new InMemoryTemplate(new FreemarkerTemplateTransformer().templateTranslate(FileUtil.readTextFile(new File("./test/file/html/HTMLTizenWebUIFWSinglePage"), null)).getBytes(), "utf-8", BufferFactory.getInstance()));
+        templateProvider.addTemplate("HTMLTizenWebUIFWMultiPage", new InMemoryTemplate(new FreemarkerTemplateTransformer().templateTranslate(FileUtil.readTextFile(new File("./test/file/html/HTMLTizenWebUIFWMultiPage"), null)).getBytes(), "utf-8", BufferFactory.getInstance()));
+        templateProvider.addTemplate("HTMLTizenWebUIFWMasterDetailIndex", new InMemoryTemplate(new FreemarkerTemplateTransformer().templateTranslate(FileUtil.readTextFile(new File("./test/file/html/HTMLTizenWebUIFWMasterDetailIndex"), null)).getBytes(), "utf-8", BufferFactory.getInstance()));
+        templateProvider.addTemplate("HTMLTizenWebUIFWMasterDetailSection1", new InMemoryTemplate(new FreemarkerTemplateTransformer().templateTranslate(FileUtil.readTextFile(new File("./test/file/html/HTMLTizenWebUIFWMasterDetailSection1"), null)).getBytes(), "utf-8", BufferFactory.getInstance()));
+        templateProvider.addTemplate("HTMLTizenWebUIFWMasterDetailSection2", new InMemoryTemplate(new FreemarkerTemplateTransformer().templateTranslate(FileUtil.readTextFile(new File("./test/file/html/HTMLTizenWebUIFWMasterDetailSection2"), null)).getBytes(), "utf-8", BufferFactory.getInstance()));
+        templateProvider.addTemplate("HTMLTizenWebUIFWNavigationIndex", new InMemoryTemplate(new FreemarkerTemplateTransformer().templateTranslate(FileUtil.readTextFile(new File("./test/file/html/HTMLTizenWebUIFWNavigationIndex"), null)).getBytes(), "utf-8", BufferFactory.getInstance()));
+        templateProvider.addTemplate("HTMLTizenWebUIFWNavigationSection1", new InMemoryTemplate(new FreemarkerTemplateTransformer().templateTranslate(FileUtil.readTextFile(new File("./test/file/html/HTMLTizenWebUIFWNavigationSection1"), null)).getBytes(), "utf-8", BufferFactory.getInstance()));
+        templateProvider.addTemplate("HTMLTizenWebUIFWNavigationSection2", new InMemoryTemplate(new FreemarkerTemplateTransformer().templateTranslate(FileUtil.readTextFile(new File("./test/file/html/HTMLTizenWebUIFWNavigationSection2"), null)).getBytes(), "utf-8", BufferFactory.getInstance()));
+        templateProvider.addTemplate("HTMLJQMSinglePage", new InMemoryTemplate(new FreemarkerTemplateTransformer().templateTranslate(FileUtil.readTextFile(new File("./test/file/html/HTMLJQMSinglePage"), null)).getBytes(), "utf-8", BufferFactory.getInstance()));
+        templateProvider.addTemplate("HTMLJQMMultiPage", new InMemoryTemplate(new FreemarkerTemplateTransformer().templateTranslate(FileUtil.readTextFile(new File("./test/file/html/HTMLJQMMultiPage"), null)).getBytes(), "utf-8", BufferFactory.getInstance()));
+        templateProvider.addTemplate("HTMLJQMMasterDetailIndex", new InMemoryTemplate(new FreemarkerTemplateTransformer().templateTranslate(FileUtil.readTextFile(new File("./test/file/html/HTMLJQMMasterDetailIndex"), null)).getBytes(), "utf-8", BufferFactory.getInstance()));
+        templateProvider.addTemplate("HTMLJQMMasterDetailSection1", new InMemoryTemplate(new FreemarkerTemplateTransformer().templateTranslate(FileUtil.readTextFile(new File("./test/file/html/HTMLJQMMasterDetailSection1"), null)).getBytes(), "utf-8", BufferFactory.getInstance()));
+        templateProvider.addTemplate("HTMLJQMMasterDetailSection2", new InMemoryTemplate(new FreemarkerTemplateTransformer().templateTranslate(FileUtil.readTextFile(new File("./test/file/html/HTMLJQMMasterDetailSection2"), null)).getBytes(), "utf-8", BufferFactory.getInstance()));
+        templateProvider.addTemplate("HTMLJQMNavigationIndex", new InMemoryTemplate(new FreemarkerTemplateTransformer().templateTranslate(FileUtil.readTextFile(new File("./test/file/html/HTMLJQMNavigationIndex"), null)).getBytes(), "utf-8", BufferFactory.getInstance()));
+        templateProvider.addTemplate("HTMLJQMNavigationSection1", new InMemoryTemplate(new FreemarkerTemplateTransformer().templateTranslate(FileUtil.readTextFile(new File("./test/file/html/HTMLJQMNavigationSection1"), null)).getBytes(), "utf-8", BufferFactory.getInstance()));
+        templateProvider.addTemplate("HTMLJQMNavigationSection2", new InMemoryTemplate(new FreemarkerTemplateTransformer().templateTranslate(FileUtil.readTextFile(new File("./test/file/html/HTMLJQMNavigationSection2"), null)).getBytes(), "utf-8", BufferFactory.getInstance()));
 
         {
             // empty & not description
@@ -515,60 +515,6 @@ public class FreemarkerTemplateEngineTest {
             assertTrue(result.contains("<link rel=\"stylesheet\" type=\"text/css\" href=\"./css/style.css\"/>"));
             assertTrue(result.contains("Classic"));
         }
-        {
-            // JQM - navigation - section1.html
-            final ModelManager modelManager = new ModelManager();
-            modelManager.addModel("HTMLDescription", "");
-            modelManager.addModel("MetaViewport", "");
-            modelManager.addModel("MetaDescriptionContent", "JQMNavigationSection1");
-            modelManager.addModel("HtmlTitle", "JQMNavigationSection1");
-            modelManager.addModel("JQMProject", "");
-            modelManager.addModel("JQMCSS", "./css/jquery.mobile-1.1.0.css");
-            modelManager.addModel("JQuery", "./js/jquery-1.7.1.js");
-            modelManager.addModel("JQMJS", "./js/jquery.mobile-1.1.0.js");
-            modelManager.addModel("HTMLJQMNavigationSection1", "");
-
-            final ByteArrayOutputStream byteOut = new ByteArrayOutputStream();
-            engine.generate("HTMLBase", modelManager, byteOut );
-            final String result = byteOut.toString();
-            assertTrue(0 < result.length());
-            assertTrue(result.contains("Copyright"));
-            assertTrue(result.contains("meta name=\"viewport\""));
-            assertTrue(result.contains("JQMNavigationSection1"));
-            assertTrue(result.contains("./js/jquery-1.7.1.js"));
-            assertFalse(result.contains("tizen-web-ui-fw-libs.js"));
-            assertFalse(result.contains("tizen-web-ui-fw.js"));
-            assertTrue(result.contains("<script type=\"text/javascript\" src=\"./js/main.js\"></script>"));
-            assertTrue(result.contains("<link rel=\"stylesheet\" type=\"text/css\" href=\"./css/style.css\"/>"));
-            assertTrue(result.contains("All I Want For Chritsmas Is You"));
-        }
-        {
-            // JQM - navigation - section2.html
-            final ModelManager modelManager = new ModelManager();
-            modelManager.addModel("HTMLDescription", "");
-            modelManager.addModel("MetaViewport", "");
-            modelManager.addModel("MetaDescriptionContent", "JQMNavigationSection2");
-            modelManager.addModel("HtmlTitle", "JQMNavigationSection2");
-            modelManager.addModel("JQMProject", "");
-            modelManager.addModel("JQMCSS", "./css/jquery.mobile-1.1.0.css");
-            modelManager.addModel("JQuery", "./js/jquery-1.7.1.js");
-            modelManager.addModel("JQMJS", "./js/jquery.mobile-1.1.0.js");
-            modelManager.addModel("HTMLJQMNavigationSection2", "");
-
-            final ByteArrayOutputStream byteOut = new ByteArrayOutputStream();
-            engine.generate("HTMLBase", modelManager, byteOut );
-            final String result = byteOut.toString();
-            assertTrue(0 < result.length());
-            assertTrue(result.contains("Copyright"));
-            assertTrue(result.contains("meta name=\"viewport\""));
-            assertTrue(result.contains("JQMNavigationSection2"));
-            assertTrue(result.contains("./js/jquery-1.7.1.js"));
-            assertFalse(result.contains("tizen-web-ui-fw-libs.js"));
-            assertFalse(result.contains("tizen-web-ui-fw.js"));
-            assertTrue(result.contains("<script type=\"text/javascript\" src=\"./js/main.js\"></script>"));
-            assertTrue(result.contains("<link rel=\"stylesheet\" type=\"text/css\" href=\"./css/style.css\"/>"));
-            assertTrue(result.contains("Adam Lambert"));
-        }
     }
 
 }
diff --git a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/js/FreemarkerTemplateEngineTest.java b/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/js/FreemarkerTemplateEngineTest.java
index 2215f2584..4de1467cf 100755
--- a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/js/FreemarkerTemplateEngineTest.java
+++ b/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/js/FreemarkerTemplateEngineTest.java
@@ -66,11 +66,11 @@ public class FreemarkerTemplateEngineTest {
         final TemplateManager templateProvider = new TemplateManager();
         engine.setTemplateProvider( templateProvider );
 
-        templateProvider.addTemplate("JSBase", new InMemoryTemplate(new FreemarkerTemplateTransformer().templateTranslate(FileUtil.readTextFile(new File("./test/src/org/tizen/common/verrari/engine/freemarker/js/JSBase"), null)).getBytes(), "utf-8", BufferFactory.getInstance()));
-        templateProvider.addTemplate("JSDescription", new InMemoryTemplate(new FreemarkerTemplateTransformer().templateTranslate(FileUtil.readTextFile(new File("./test/src/org/tizen/common/verrari/engine/freemarker/js/JSDescription"), null)).getBytes(), "utf-8", BufferFactory.getInstance()));
-        templateProvider.addTemplate("JSJQM", new InMemoryTemplate(new FreemarkerTemplateTransformer().templateTranslate(FileUtil.readTextFile(new File("./test/src/org/tizen/common/verrari/engine/freemarker/js/JSJQM"), null)).getBytes(), "utf-8", BufferFactory.getInstance()));
-        templateProvider.addTemplate("JSTizenBasicBlank", new InMemoryTemplate(new FreemarkerTemplateTransformer().templateTranslate(FileUtil.readTextFile(new File("./test/src/org/tizen/common/verrari/engine/freemarker/js/JSTizenBasicBlank"), null)).getBytes(), "utf-8", BufferFactory.getInstance()));
-        templateProvider.addTemplate("JSTizenWebUIFW", new InMemoryTemplate(new FreemarkerTemplateTransformer().templateTranslate(FileUtil.readTextFile(new File("./test/src/org/tizen/common/verrari/engine/freemarker/js/JSTizenWebUIFW"), null)).getBytes(), "utf-8", BufferFactory.getInstance()));
+        templateProvider.addTemplate("JSBase", new InMemoryTemplate(new FreemarkerTemplateTransformer().templateTranslate(FileUtil.readTextFile(new File("./test/file/js/JSBase"), null)).getBytes(), "utf-8", BufferFactory.getInstance()));
+        templateProvider.addTemplate("JSDescription", new InMemoryTemplate(new FreemarkerTemplateTransformer().templateTranslate(FileUtil.readTextFile(new File("./test/file/js/JSDescription"), null)).getBytes(), "utf-8", BufferFactory.getInstance()));
+        templateProvider.addTemplate("JSJQM", new InMemoryTemplate(new FreemarkerTemplateTransformer().templateTranslate(FileUtil.readTextFile(new File("./test/file/js/JSJQM"), null)).getBytes(), "utf-8", BufferFactory.getInstance()));
+        templateProvider.addTemplate("JSTizenBasicBlank", new InMemoryTemplate(new FreemarkerTemplateTransformer().templateTranslate(FileUtil.readTextFile(new File("./test/file/js/JSTizenBasicBlank"), null)).getBytes(), "utf-8", BufferFactory.getInstance()));
+        templateProvider.addTemplate("JSTizenWebUIFW", new InMemoryTemplate(new FreemarkerTemplateTransformer().templateTranslate(FileUtil.readTextFile(new File("./test/file/js/JSTizenWebUIFW"), null)).getBytes(), "utf-8", BufferFactory.getInstance()));
 
         {
             // empty & not description
diff --git a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/method/FreemarkerTemplateEngineMethodTest.java b/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/method/FreemarkerTemplateEngineMethodTest.java
index f2ffb928f..c20947b76 100755
--- a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/method/FreemarkerTemplateEngineMethodTest.java
+++ b/org.tizen.common.verrari/test/src/org/tizen/common/verrari/engine/freemarker/method/FreemarkerTemplateEngineMethodTest.java
@@ -69,7 +69,7 @@ public class FreemarkerTemplateEngineMethodTest {
         final TemplateManager templateProvider = new TemplateManager();
         engine.setTemplateProvider(templateProvider);
 
-        templateProvider.addTemplate("TESTFile", new InMemoryTemplate(new FreemarkerTemplateTransformer().templateTranslate(FileUtil.readTextFile(new File("./test/src/org/tizen/common/verrari/engine/freemarker/method/TESTFile"), null)).getBytes(), "utf-8", BufferFactory.getInstance()));
+        templateProvider.addTemplate("TESTFile", new InMemoryTemplate(new FreemarkerTemplateTransformer().templateTranslate(FileUtil.readTextFile(new File("./test/file/method/TESTFile"), null)).getBytes(), "utf-8", BufferFactory.getInstance()));
 
         final IModelManager modelManager = new FreemarkerModelManager( new ModelManager() );
 
diff --git a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/template/FileTemplateTest.java b/org.tizen.common.verrari/test/src/org/tizen/common/verrari/template/FileTemplateTest.java
index 3b9d48727..6005dfc17 100755
--- a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/template/FileTemplateTest.java
+++ b/org.tizen.common.verrari/test/src/org/tizen/common/verrari/template/FileTemplateTest.java
@@ -60,7 +60,7 @@ public class FileTemplateTest {
     @Before
     public void setUp() {
         Preference.register( "JVM", new SystemPropertiesProvider() );
-        file = new File("./test/src/org/tizen/common/verrari/template/test_html.ftl");
+        file = new File("./test/file/test_html.ftl");
         fileTemplate = new FileTemplate(file);
     }
 
diff --git a/org.tizen.common/src/org/tizen/common/ui/dialog/LocaleDialog.java b/org.tizen.common/src/org/tizen/common/ui/dialog/LocaleDialog.java
index 352a11198..81c8962d4 100644
--- a/org.tizen.common/src/org/tizen/common/ui/dialog/LocaleDialog.java
+++ b/org.tizen.common/src/org/tizen/common/ui/dialog/LocaleDialog.java
@@ -195,7 +195,7 @@ public class LocaleDialog extends SelectionStatusDialog {
         Composite composite = (Composite) super.createDialogArea(parent);
         composite.setLayout( new GridLayout( 2, false ) );
         GridData gd = new GridData( GridData.FILL_BOTH );
-        gd.widthHint = 400; // make IStatus msg visible
+        gd.widthHint = 420; // make IStatus msg visible
         composite.setLayoutData( gd );
         applyDialogFont( composite );
 
diff --git a/org.tizen.common/src/org/tizen/common/util/url/vf/Connection.java b/org.tizen.common/src/org/tizen/common/util/url/vf/Connection.java
index 36300708d..ede59ec8b 100755
--- a/org.tizen.common/src/org/tizen/common/util/url/vf/Connection.java
+++ b/org.tizen.common/src/org/tizen/common/util/url/vf/Connection.java
@@ -46,82 +46,78 @@ Connection
 extends URLConnection 
 {
 
-	/**
-	 * Virutal file handler to search
-	 */
-	protected static VirtualFileHandler vfHandler = new VirtualFileHandler();
-	
-	/**
-	 * Logger for this instance
-	 */
-	protected final Logger logger = LoggerFactory.getLogger( getClass() );
-	
-	/**
-	 * Return {@link VirtualFileHandler} to search
-	 * 
-	 * @return {@link #vfHandler}
-	 */
-	public static
-	VirtualFileHandler
-	getVirtualFileHandler()
-	{
-		return vfHandler;
-	}
-	
-	/**
-	 * Set {@link VirtualFileHandler} to search
-	 * 
-	 * @param vfHandler new {@link VirtualFileHandler}
-	 */
-	public static
-	void
-	setVirtualFileHandler(
-		final VirtualFileHandler vfHandler
-	)
-	{
-		Connection.vfHandler = vfHandler;
-	}
-	
-	
-	
-	
-	/**
-	 * Constructor with url
-	 * 
-	 * @param url {@link URL}
-	 */
-	protected
-	Connection(
-		final URL url
-	)
-	{
-		super( url );
-		logger.trace( "URL :{}", url );
-	}
+    /**
+     * Virutal file handler to search
+     */
+    protected static VirtualFileHandler vfHandler = new VirtualFileHandler();
+    
+    /**
+     * Logger for this instance
+     */
+    protected final Logger logger = LoggerFactory.getLogger( getClass() );
+    
+    /**
+     * Return {@link VirtualFileHandler} to search
+     * 
+     * @return {@link #vfHandler}
+     */
+    public static
+    VirtualFileHandler
+    getVirtualFileHandler()
+    {
+        return vfHandler;
+    }
+    
+    /**
+     * Set {@link VirtualFileHandler} to search
+     * 
+     * @param vfHandler new {@link VirtualFileHandler}
+     */
+    public static
+    void
+    setVirtualFileHandler(
+        final VirtualFileHandler vfHandler
+    )
+    {
+        Connection.vfHandler = vfHandler;
+    }
+    
+    /**
+     * Constructor with url
+     * 
+     * @param url {@link URL}
+     */
+    protected
+    Connection(
+        final URL url
+    )
+    {
+        super( url );
+        logger.trace( "URL :{}", url );
+    }
 
-	/* (non-Javadoc)
-	 * @see java.net.URLConnection#connect()
-	 */
-	@Override
-	public
-	void
-	connect()
-	throws IOException
-	{
-		logger.trace( "connect" );
-	}
-	
-	/* (non-Javadoc)
-	 * @see java.net.URLConnection#getInputStream()
-	 */
-	@SuppressWarnings("deprecation")
+    /* (non-Javadoc)
+     * @see java.net.URLConnection#connect()
+     */
+    @Override
     public
-	InputStream
-	getInputStream()
-	throws IOException
-	{
-		final String path = url.getPath();
-		logger.trace( "Path :{}", path );
-		return vfHandler.read( URLDecoder.decode( path ) );
-	}
+    void
+    connect()
+    throws IOException
+    {
+        logger.trace( "connect" );
+    }
+    
+    /* (non-Javadoc)
+     * @see java.net.URLConnection#getInputStream()
+     */
+    public
+    InputStream
+    getInputStream()
+    throws IOException
+    {
+        final String path = url.getPath();
+        logger.trace( "Path :{}", path );
+        return vfHandler.read( URLDecoder.decode( path, "UTF-8" ) );
+    }
 }
diff --git a/org.tizen.common/test/src/org/tizen/common/util/FileUtilTest.java b/org.tizen.common/test/src/org/tizen/common/util/FileUtilTest.java
index 524c68587..e49177714 100755
--- a/org.tizen.common/test/src/org/tizen/common/util/FileUtilTest.java
+++ b/org.tizen.common/test/src/org/tizen/common/util/FileUtilTest.java
@@ -59,20 +59,18 @@ import org.powermock.modules.junit4.PowerMockRunner;
  */
 @RunWith( PowerMockRunner.class )
 @PrepareForTest( FileUtil.class )
-public class
-FileUtilTest
-{
+public class FileUtilTest {
 
     /**
      * Target directory for test
      */
     public static final String TEST_RESOURCE_DEST = "test/_test_files";
-    
+
     /**
      * Source directory for test
      */
     public static final String TEST_RESOURCE_SRC = "test/test_files";
-    
+
     /**
      * Test for {@link FileUtil#getFileExtension(String)}
      * 
@@ -81,11 +79,7 @@ FileUtilTest
      * @see FileUtil#getFileExtension(String)
      */
     @Test
-    public
-    void
-    test_getFileExtension()
-    throws Exception
-    {
+    public void test_getFileExtension() throws Exception {
         final Object[][] TEST_CASES = new Object[][] {
                 new Object[] { "aaaa.exe", "exe" },
                 new Object[] { "index.html", "html" },
@@ -97,37 +91,30 @@ FileUtilTest
                 new Object[] { "ReadMe. ", " " },
                 new Object[] { "ReadMe. test", " test" }
         };
-        
+
         int i = 0;
-        for ( final Object[] TEST_CASE : TEST_CASES )
-        {
+        for ( final Object[] TEST_CASE : TEST_CASES ) {
             final String fileName = (String) TEST_CASE[0];
             final String expected = (String) TEST_CASE[1];
             final String result = FileUtil.getFileExtension( fileName );
-            
             assertEquals( ++i + "th Test case :<" + fileName + ", " + expected + ">", expected, result );
         }
     }
-    
+
     /**
      * Test for {@link FileUtil#getFileNameFromPath(String)}
      * 
      * @throws Exception If test fails
      */
-    public
-    void
-    test_getFileNameFromPath()
-    throws Exception
-    {
+    public void test_getFileNameFromPath() throws Exception {
         final String[][] TEST_CASES = {
                 {"ASDFwew/jkl/wer23/gfdgfdg", "gfdgfdg"},
                 {"wekljf\\hgrfg\\wefwv1.aaa", "wefwv1.aaa"},
                 {null, null},
                 {"ggg.sss", "ggg.sss"}
         };
-        
-        for( final String[] TEST_CASE: TEST_CASES )
-        {
+
+        for( final String[] TEST_CASE: TEST_CASES ) {
             String result = FileUtil.getFileNameFromPath(TEST_CASE[0]);
             assertEquals(TEST_CASE[1], result);
         }
@@ -141,11 +128,7 @@ FileUtilTest
      * @see {@link FileUtil#readTextStream(InputStream input, String encoding)}
      */
     @Test
-    public
-    void
-    test_readTextStream()
-    throws Exception
-    {
+    public void test_readTextStream() throws Exception {
         final String text = "Test Text 123";
         final String unicodeText = "\uD55C\uAE00\uD14C\uC2A4\uD2B8";
 
@@ -164,10 +147,10 @@ FileUtilTest
         assertEquals(unicodeText, unicodeContent);
         final String isoContent = FileUtil.readTextStream(unicodeInput, "ISO-8859-1");
         assertNotSame(unicodeText, isoContent);
-        
+
         tryClose( input, unicodeContent );
     }
-    
+
     /**
      * Test {@link FileUtil#copyRecursively(String, String)}
      *  
@@ -177,25 +160,22 @@ FileUtilTest
      */
     @Test
     public void test_copyRecursively1() throws Exception {
-        
         try {
             if(!checkTestSrcExist()) {
                 return;
             }
-            
+
             FileUtil.copyRecursively(TEST_RESOURCE_SRC, TEST_RESOURCE_DEST);
-            
             List<File> result = compareFiles(TEST_RESOURCE_SRC, TEST_RESOURCE_DEST);
             assertTrue(result.size() == 0);
-        }
-        finally {
+        } finally {
             File destDir = new File(TEST_RESOURCE_DEST);
             if(destDir.exists()) {
                 FileUtil.recursiveDelete(destDir);
             }
         }
     }
-    
+
     /**
      * Test {@link FileUtil#copyRecursively(String, String, boolean)}}
      *  
@@ -205,49 +185,47 @@ FileUtilTest
      */
     @Test
     public void test_copyRecursively2() throws Exception {
-        
         try {
             if(!checkTestSrcExist()) {
                 return;
             }
-            
-            String overwriteFileName = "about_files/LICENSE-2.0.htm";
-            String originalFileName = "about_files/freemarker-LICENSE.txt";
+
+            String overwriteFileName = "/about_files/LICENSE-2.0.htm";
+            String originalFileName = "/about_files/freemarker-LICENSE.txt";
             String copiedFileName = FileUtil.appendPath(TEST_RESOURCE_DEST, originalFileName);
-            
-            long overwriteSize = new File(overwriteFileName).getTotalSpace();
-            long originalSize = new File(originalFileName).getTotalSpace();
-            
+
+            long overwriteSize = new File(TEST_RESOURCE_SRC + overwriteFileName).getTotalSpace();
+            long originalSize = new File(TEST_RESOURCE_SRC + originalFileName).getTotalSpace();
+
             FileUtil.copyTo(FileUtil.appendPath(TEST_RESOURCE_SRC, overwriteFileName), copiedFileName);
             FileUtil.copyRecursively(TEST_RESOURCE_SRC, TEST_RESOURCE_DEST, false);
-            
+
             long copiedSize = new File(copiedFileName).getTotalSpace();
             assertTrue(overwriteSize == copiedSize);
-            
+
             File destDir = new File(TEST_RESOURCE_DEST);
             if(destDir.exists()) {
                 FileUtil.recursiveDelete(destDir);
             }
-            
+
             List<File> result = compareFiles(TEST_RESOURCE_SRC, TEST_RESOURCE_DEST);
             assertTrue(result.size() == 0);
-            
+
             FileUtil.copyRecursively(TEST_RESOURCE_SRC, TEST_RESOURCE_DEST, true);
-            
+
             copiedSize = new File(copiedFileName).getTotalSpace();
             assertTrue(originalSize == copiedSize);
-            
+
             result = compareFiles(TEST_RESOURCE_SRC, TEST_RESOURCE_DEST);
             assertTrue(result.size() == 0);
-        }
-        finally {
+        } finally {
             File destDir = new File(TEST_RESOURCE_DEST);
             if(destDir.exists()) {
                 FileUtil.recursiveDelete(destDir);
             }
         }
     }
-    
+
     /**
      * Test {@link FileUtil#copyRecursively(String, String, boolean, File...)}
      *  
@@ -257,42 +235,40 @@ FileUtilTest
      */
     @Test
     public void test_copyRecursively3() throws Exception {
-        
         try {
             if(!checkTestSrcExist()) {
                 return;
             }
-            
+
             HashSet<File> filter = new HashSet<File>();
             File filter1 = new File(TEST_RESOURCE_SRC + "/about_files/LICENSE-2.0.htm");
             File filter2 = new File(TEST_RESOURCE_SRC + "/resource/text.txt");
             File filter3 = new File(TEST_RESOURCE_SRC + "/resource/resource/text.txt");
-            
+
             filter.add(filter1);
             filter.add(filter2);
             filter.add(filter3);
-            
+
             FileUtil.copyRecursively(TEST_RESOURCE_SRC, TEST_RESOURCE_DEST, false, filter1, filter2, filter3);
-            
+
             List<File> result = compareFiles(TEST_RESOURCE_SRC, TEST_RESOURCE_DEST);
-            
+
             for(File resultFile: result) {
                 assertTrue(filter.contains(resultFile));
             }
-        }
-        finally {
+        } finally {
             File destDir = new File(TEST_RESOURCE_DEST);
             if(destDir.exists()) {
                 FileUtil.recursiveDelete(destDir);
             }
         }
     }
-    
+
     private boolean checkTestSrcExist() {
         File src = new File(TEST_RESOURCE_SRC);
         return src.exists();
     }
-    
+
     /**
      * This method is used for checking whether copyRecursively works fine.
      * If destDir does not contain some files in srcDir, they are contained in result List.
@@ -301,25 +277,23 @@ FileUtilTest
      * @return Files in source directory destination directory does not contain.
      */
     public static List<File> compareFiles(String srcDir, String destDir) {
-        
         List<File> result = new ArrayList<File>();
         File srcFiles = new File(srcDir);
-        
         if(!srcFiles.exists()) {
             return result;
         }
-        
+
         Stack<File> srcStack = new Stack<File>();
         Stack<File> destStack = new Stack<File>();
-        
+
         while(!srcStack.isEmpty()) {
             File _srcFile = srcStack.pop();
             File _destFile = destStack.pop();
-            
+
             if(!_destFile.exists()) {
                 result.add(_srcFile);
             }
-            
+
             if(_srcFile.isDirectory()) {
                 for(File __srcFile:_srcFile.listFiles()) {
                     srcStack.add(__srcFile);
@@ -327,10 +301,10 @@ FileUtilTest
                 }
             }
         }
-        
+
         return result;
     }
-    
+
     /**
      * Test {@link FileUtil#readFromFile(URL)}
      * 
@@ -341,11 +315,8 @@ FileUtilTest
      */
     @Test
     public void test_readFromFile() throws Exception {
-        
         String result = "HOHOHO\nHAHAHA\nNAMKOONGHO";
-        
         File file = new File("test/test_files/resource/text.txt");
-        
         if(file.exists()) {
             URL url = file.toURI().toURL();
             assertTrue(result.equals(FileUtil.readFromFile(url)));
@@ -365,32 +336,32 @@ FileUtilTest
     public void test_appendPath() throws Exception {
         String windowFirst = "\\a\\b\\c\\d\\";
         String windowLast = "\\e\\f\\g\\h\\";
-        
+
         String linuxFirst = "/a/b/c/d/";
         String linuxLast = "/e/f/g/h/";
-        
+
         String result = File.separatorChar + "a" + File.separatorChar + "b" + File.separatorChar + "c" + 
                 File.separatorChar + "d" + File.separatorChar + "e" + File.separatorChar + "f" + File.separatorChar + 
                 "g" + File.separatorChar + "h" + File.separatorChar;
-        
+
         assertEquals(result, FileUtil.appendPath(windowFirst, linuxLast));
         assertEquals(result, FileUtil.appendPath(windowFirst, windowLast));
         assertEquals(result, FileUtil.appendPath(linuxFirst, linuxLast));
         assertEquals(result, FileUtil.appendPath(linuxFirst, windowLast));
-        
+
         result = result.replace('\\', '/');
         assertEquals(result, FileUtil.appendPath(windowFirst, linuxLast, false));
         assertEquals(result, FileUtil.appendPath(windowFirst, windowLast, false));
         assertEquals(result, FileUtil.appendPath(linuxFirst, linuxLast, false));
         assertEquals(result, FileUtil.appendPath(linuxFirst, windowLast, false));
-        
+
         result = result.replace('/', '\\');
         assertEquals(result, FileUtil.appendPath(windowFirst, linuxLast, true));
         assertEquals(result, FileUtil.appendPath(windowFirst, windowLast, true));
         assertEquals(result, FileUtil.appendPath(linuxFirst, linuxLast, true));
         assertEquals(result, FileUtil.appendPath(linuxFirst, windowLast, true));
     }
-    
+
     /**
      * Test {@link FileUtil#convertToOSPath(String, boolean)}
      * Test {@link FileUtil#convertToOSPath(String)}
@@ -400,14 +371,14 @@ FileUtilTest
     public void test_convertToOSPath() throws Exception {
         String windowPath = "\\a\\b\\c\\d\\";
         String linuxPath = "/a/b/c/d/";
-        
+
         assertEquals(linuxPath, FileUtil.convertToOSPath(windowPath, false));
         assertEquals(linuxPath, FileUtil.convertToOSPath(linuxPath, false));
         assertEquals(windowPath, FileUtil.convertToOSPath(windowPath, true));
         assertEquals(windowPath, FileUtil.convertToOSPath(linuxPath, true));
-        
+
         String result = File.separatorChar + "a" + File.separatorChar + "b" + File.separatorChar + "c" + File.separatorChar + "d";
-        
+
         assertEquals(result, FileUtil.convertToOSPath(windowPath));
         assertEquals(result, FileUtil.convertToOSPath(linuxPath));
     }
@@ -420,10 +391,7 @@ FileUtilTest
      * @see {@link FileUtil#isExist(String)}
      */
     @Test
-    public void
-    test_isExist()
-    throws Exception
-    {
+    public void test_isExist() throws Exception {
         assertFalse( FileUtil.isExist( null ) );
         assertFalse( FileUtil.isExist( "" ) );
 
@@ -442,4 +410,5 @@ FileUtilTest
         assertTrue( FileUtil.isExist( "test/test_files/resource/" ) );
         assertTrue( FileUtil.isExist( "test/test_files/resource/text.txt" ) );
     }
+
 }
diff --git a/package/changelog b/package/changelog
index 56361ec13..5253dee71 100644
--- a/package/changelog
+++ b/package/changelog
@@ -1,3 +1,25 @@
+* 2.1.190
+- Improved the performance of refreshing logs in the Log View
+- Fixed unittest fail
+- Fixed logger for information blinding
+== shingil.kang <shingil.kang@samsung.com> 2014-04-17
+* 2.1.189
+- Added string validation check when creating a project
+== yoonki.park <yoonki.park@samsung.com> 2014-04-14
+* 2.1.188
+- Fixed highlight background problem in new wizard
+== jihoon80.song <jihoon80.song@samsung.com> 2014-04-10
+* 2.1.187
+- Checked if tree item is selected when pulling files in the Connection Explorer
+- Changed incremental sign policy
+- Fixed a charset problem for URL
+- Changed tabs to white spaces
+- Changed the title of item editor for secure profiles
+- Fixed unittest
+== shingil.kang <shingil.kang@samsung.com> 2014-04-08
+* 2.1.186
+- Fixed Cross sign not showing in Description option of Localization tab.
+== jaeheung.kim <jaeheung.kim@samsung.com> 2014-04-02
 * 2.1.185
 - Added 2Digit validation for requried_version
 == changhyun1.lee <changhyun1.lee@samsung.com> 2014-04-01
diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index e23dbabc2..5684ef01c 100644
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,4 +1,4 @@
-Version:2.1.185
+Version:2.1.190
 Source:common-eplugin
 Maintainer:kangho kim <kh5325.kim@samsung.com>, yoonki park <yoonki.park@samsung.com>, hyunsik non <hyunsik.noh@samsung.com>, taeyoung son <taeyoung2.son@samsung.com>, gune Kim <gune.kim@samsung.com>, ho namkoong <ho.namkoong@samsung.com>, hyeongseok heo <hyeong-seok.heo@samsung.com>, gyeongseok seo <gyeongseok.seo@samsung.com>, jihoon song <jihoon80.song@samsung.com>, changhyun lee <changhyun1.lee@samsung.com>, bonyong lee <bonyong.lee@samsung.com>, shingil kang <shingil.kang@samsung.com>