[Title] update pkginfo

[Desc.]
[Issue]

diff --git a/org.tizen.common.verrari.realm/src/org/tizen/common/verrari/realm/StandardRealm.java b/org.tizen.common.verrari.realm/src/org/tizen/common/verrari/realm/StandardRealm.java
index 7c544fd..4c5290d 100755 (executable)
--- a/org.tizen.common.verrari.realm/src/org/tizen/common/verrari/realm/StandardRealm.java
+++ b/org.tizen.common.verrari.realm/src/org/tizen/common/verrari/realm/StandardRealm.java
@@ -154,6 +154,7 @@ implements Realm, AttributeConfiguable
     {\r
         final Query templateQuery = getTemplateQuery();\r
         final Map<?, ?> modelMap = MapUtil.asMap( new Object[][] { new Object[] { "id", id } } );\r
+        logger.trace( "Map :{}", modelMap );\r
         final String query = templateQuery.query( (Map<String, Object>) modelMap );\r
         \r
         logger.trace( "Query :{}", query );\r

diff --git a/org.tizen.common.verrari.realm/src/org/tizen/common/verrari/template/StandardTemplate.java b/org.tizen.common.verrari.realm/src/org/tizen/common/verrari/template/StandardTemplate.java
index 9dc6849..3c157ef 100755 (executable)
--- a/org.tizen.common.verrari.realm/src/org/tizen/common/verrari/template/StandardTemplate.java
+++ b/org.tizen.common.verrari.realm/src/org/tizen/common/verrari/template/StandardTemplate.java
@@ -402,6 +402,7 @@ implements Template
                 try\r
                 {\r
                     engine.generate( name, models, out );\r
+                    ExecutionContext.getCurrentContext().getPrompter().notify( target + " created" );\r
                 }\r
                 finally\r
                 {\r

diff --git a/org.tizen.common.verrari.realm/src/org/tizen/common/verrari/util/QueryFactory.java b/org.tizen.common.verrari.realm/src/org/tizen/common/verrari/util/QueryFactory.java
index a028b5f..99f6b54 100755 (executable)
--- a/org.tizen.common.verrari.realm/src/org/tizen/common/verrari/util/QueryFactory.java
+++ b/org.tizen.common.verrari.realm/src/org/tizen/common/verrari/util/QueryFactory.java
@@ -105,11 +105,11 @@ QueryFactory
             final Map<String, Object> args\r
         )\r
         {\r
-            \r
             try\r
             {\r
                 final ModelManager manager = new ModelManager( args );\r
                 final ByteArrayOutputStream byteOut = new ByteArrayOutputStream();\r
+                logger.debug( "Model :{}, Model Manager :{}", args, manager );\r
                 engine.generate( STARTING_POINT, manager, byteOut );\r
                 final String ret = new String( byteOut.toByteArray(), "utf-8" );\r
                 logger.info( "Query result :{}", ret );\r

diff --git a/org.tizen.common.verrari.realm/test/src/org/tizen/common/verrari/util/QueryFactoryTest.java b/org.tizen.common.verrari.realm/test/src/org/tizen/common/verrari/util/QueryFactoryTest.java
new file mode 100755 (executable)
index 0000000..9825cc1
--- /dev/null
+++ b/org.tizen.common.verrari.realm/test/src/org/tizen/common/verrari/util/QueryFactoryTest.java
@@ -0,0 +1,30 @@
+package org.tizen.common.verrari.util;\r
+\r
+import static org.mockito.Mockito.mock;\r
+import static org.mockito.Mockito.when;\r
+\r
+import java.util.HashMap;\r
+\r
+import org.junit.Test;\r
+import org.tizen.common.verrari.Realm;\r
+import org.tizen.common.verrari.realm.Query;\r
+import org.tizen.common.verrari.realm.RealmConstants;\r
+\r
+public class QueryFactoryTest\r
+{\r
+\r
+    @Test\r
+    public void test_PatternQuery()\r
+    {\r
+        Realm realm = mock( Realm.class );\r
+        when( realm.getAttribute( RealmConstants.ATTR_TEMPLATE_URL ) )\r
+        .thenReturn( "file://$${CLI_HOME}/realm/template/$${id}.jar" );\r
+        Query q = QueryFactory.getInstance().createTemplateQuery( realm );\r
+        HashMap<String, Object> models = new HashMap<String, Object>();\r
+        models.put( "CLI_HOME", "aaa" );\r
+        models.put( "id", "fjdkjfdk" );\r
+        final String result = q.query( models );\r
+        System.out.println( result );\r
+    }\r
+\r
+}\r

diff --git a/org.tizen.common.verrari/src/org/tizen/common/verrari/engine/freemarker/FreemarkerModelManager.java b/org.tizen.common.verrari/src/org/tizen/common/verrari/engine/freemarker/FreemarkerModelManager.java
index 75ebf79..a721d75 100755 (executable)
--- a/org.tizen.common.verrari/src/org/tizen/common/verrari/engine/freemarker/FreemarkerModelManager.java
+++ b/org.tizen.common.verrari/src/org/tizen/common/verrari/engine/freemarker/FreemarkerModelManager.java
@@ -74,6 +74,7 @@ implements IModelManager
         {
             return ret;
         }
+        logger.info( "Delegate to {}", modelProvider );
         return this.modelProvider.getModel( key );
     }
 

diff --git a/org.tizen.common.verrari/src/org/tizen/common/verrari/model/ModelProvider.java b/org.tizen.common.verrari/src/org/tizen/common/verrari/model/ModelProvider.java
index 15dde08..225b176 100755 (executable)
--- a/org.tizen.common.verrari/src/org/tizen/common/verrari/model/ModelProvider.java
+++ b/org.tizen.common.verrari/src/org/tizen/common/verrari/model/ModelProvider.java
@@ -32,6 +32,8 @@ import java.util.Collections;
 import java.util.HashMap;\r
 import java.util.Map;\r
 \r
+import org.slf4j.Logger;\r
+import org.slf4j.LoggerFactory;\r
 import org.tizen.common.config.Preference;\r
 import org.tizen.common.verrari.IModelProvider;\r
 import org.tizen.common.verrari.TemplateContext;\r
@@ -47,6 +49,7 @@ public class
 ModelProvider\r
 implements IModelProvider\r
 {\r
+    protected final Logger logger = LoggerFactory.getLogger( getClass() );\r
     /**\r
      * model container\r
      */\r
@@ -88,6 +91,7 @@ implements IModelProvider
         {\r
             return models.get( key );\r
         }\r
+        logger.debug( "Model doesn't exist for {} :{}", key, models );\r
         \r
         if ( this != TemplateContext.getInstance().getModelProvider() ) \r
         {\r

diff --git a/package/changelog b/package/changelog
index e5f7a03..f0d6b03 100644 (file)
--- a/package/changelog
+++ b/package/changelog
@@ -1,4 +1,4 @@
-* 1.0.102
+* 1.0.103
 - Template samples added
 == bylee <bonyong.lee@samsung.com> 2012-11-25 15:37
 * 1.0.98

diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index 748fb29..82ed558 100644 (file)
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,4 +1,4 @@
-Version:1.0.102
+Version:1.0.103
 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>