Merge branch 'tizen' into buildFramework

Conflicts:
	org.tizen.common.ui/plugin.xml
	org.tizen.common/src/org/tizen/common/core/application/tproject/TprojectHandler.java

Change-Id: Ic382629e1b07a8774a573a3f0e99308a1f865d08
Signed-off-by: Taeyoung Son <taeyoung2.son@samsung.com>

4 files changed, 268 insertions, 255 deletions

diff --git a/package/build-common.properties b/package/build-common.properties
index 01d779eab..5bc00fbe7 100644
--- a/package/build-common.properties
+++ b/package/build-common.properties
@@ -1,23 +1,23 @@
-file.buildnum = ${dir.dist}/build.number

-

-encoding.java =UTF-8

-javac.source = 1.6

-javac.target = 1.6

-javac.debug = true

-javac.debuglevel = lines,vars,source

-

-dir.build = build

-dir.src = src

-dir.lib = ../org.tizen.common/lib

-dir.doc = doc

-dir.javadoc =  ${dir.doc}/javadoc

-dir.javadoc.src = ${dir.src}

-dir.dist = dist

-dir.test.src= ../org.tizen.common/test/src

-dir.test.lib = ../org.tizen.common/test/lib

-jenkins.test.lib = ${dir.test.lib}

-dir.test.report = test/report

-

-file.manifest = META-INF/MANIFEST.MF

-file.dist.test = ${dir.dist}/lib/org.tizen.common-test.jar

-

+file.buildnum = ${dir.dist}/build.number
+
+encoding.java =UTF-8
+javac.source = 1.6
+javac.target = 1.6
+javac.debug = true
+javac.debuglevel = lines,vars,source
+
+dir.build = build
+dir.src = src
+dir.lib = ../org.tizen.common/lib
+dir.doc = doc
+dir.javadoc =  ${dir.doc}/javadoc
+dir.javadoc.src = ${dir.src}
+dir.dist = dist
+dir.test.src= ../org.tizen.common/test/src
+dir.test.lib = ../org.tizen.common/test/lib
+jenkins.test.lib = ${dir.test.lib}
+dir.test.report = test/report
+
+file.manifest = META-INF/MANIFEST.MF
+file.dist.test = ${dir.dist}/lib/org.tizen.common-test.jar
+
diff --git a/package/build-common.xml b/package/build-common.xml
index 1a4e480df..448b8609b 100644
--- a/package/build-common.xml
+++ b/package/build-common.xml
@@ -1,231 +1,231 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<project name="common-build" >

-    <property file="build.properties" />

-    <property file="build-common.properties" />

-

-    <!-- 빈 디렉토리를 준비한다 -->

-    <macrodef name="bx-prepare">

-        <attribute name="dir"/>

-        <sequential>

-            <delete dir="@{dir}" quiet="true"/>

-            <mkdir dir="@{dir}" />

-        </sequential>

-    </macrodef>

-

-    <!-- 빌드 작업용 디렉토리를 삭제한다. -->

-    <macrodef name="bx-clean">

-        <attribute name="dir" default="${dir.build}"/>

-        <sequential>

-            <delete dir="@{dir}" quiet="true"/>

-        </sequential>

-    </macrodef>

-

-    <macrodef name="bx-rake-test">

-        <attribute name="src" default="${dir.test.src}" />

-        <attribute name="build" default="${dir.build}" />

-        <sequential>

-            <copy todir="@{build}">

-                <fileset dir="@{src}" />

-            </copy>

-        </sequential>

-    </macrodef>

-    

-    <!-- 빌드 버젼을 생성한다. -->

-    <macrodef name="bx-ver">

-        <sequential>

-            <mkdir dir="${dir.dist}"/>

-                <buildnumber file="${file.buildnum}" />

-            <property name="version" value="${version.major}.${version.minor}.${version.fixxed}-b${build.number}" />

-            <property name="version.suffix" value="-${version}" />

-        </sequential>

-    </macrodef>

-

-    <!--  -->

-    <macrodef name="bx-javac-test">

-        <attribute name="src" default="${dir.build}" />

-        <attribute name="encoding" default="${encoding.java}" />

-        <attribute name="version" default="${javac.target}" />

-        <attribute name="debug" default="${javac.debug}" />

-        <attribute name="debuglevel" default="${javac.debuglevel}" />

-        <sequential>

-            <javac

-				encoding="@{encoding}"

-                srcdir="@{src}"

-                source="@{version}"

-                includes="**/*.java"

-                target="@{version}"

-                debug="@{debug}"

-                debuglevel="@{debuglevel}"

-                includeantruntime="false"

-            >

-                <classpath>

-                    <dirset dir="${dir.common.lib}" includes="org.tizen.common*" />

-                    <fileset dir="${dir.lib}" includes="*.jar" excludes="org.eclipse.equinox.http.jetty*.jar" />

-                    <fileset dir="${dir.test.lib}" includes="*.jar" />

-                    <fileset dir="${dir.common.lib}" includes="*.jar" />

-                    <fileset dir="${dir.eclipse.lib}" includes="*.jar" />

-                    <fileset file="${dir.lib}" excludes="*.jar"/>

-                    <fileset file="${dir.test.lib}" excludes="*.jar" />

-                    <fileset dir="${jenkins.test.lib}" includes="*.jar" />

-                    <fileset file="${jenkins.test.lib}" excludes="*.jar" />

-                    <fileset file="${file.dist}" />

-                </classpath>

-            </javac>

-        </sequential>

-    </macrodef>

-

-    <!--  -->

-    <macrodef name="bx-jar">

-        <attribute name="manifest" default="${file.manifest}" />

-        <attribute name="dest" default="${file.dist}" />

-        <attribute name="base" default="${dir.build}" />

-        <attribute name="version" default="${version}" />

-        <sequential>

-            <jar

-                basedir="@{base}"

-                destfile="@{dest}"

-            />

-        </sequential>

-    </macrodef>

-    

-

-    <macrodef name="bx-rake-lib">

-        <attribute name="base" default="${dir.build}" />

-        <sequential>

-            <copy todir="@{base}/lib">

-                <fileset dir="${dir.lib}">

-                </fileset>

-            </copy>

-        </sequential>

-    </macrodef>

-    <macrodef name="bx-bundle">

-        <attribute name="manifest" default="${file.manifest}" />

-        <attribute name="dest" default="${file.dist}" />

-        <attribute name="base" default="${dir.build}" />

-        <attribute name="version" default="${version}" />

-        <sequential>

-            <dirname property="parent" file="@{dest}"/>

-            <mkdir dir="${parent}" />

-            

-            <mkdir dir="@{base}/META-INF"/>

-            <copy file="@{manifest}" todir="@{base}/META-INF" />

-            <replace file="@{base}/META-INF/MANIFEST.MF" token="qualifier" value="b${build.number}"></replace>

-            <jar

-                basedir="@{base}"

-                destfile="@{dest}"

-                manifest="@{base}/META-INF/MANIFEST.MF"

-            />

-        </sequential>

-    </macrodef>

-    <macrodef name="bx-junit">

-        <attribute name="dest" default="${dir.test.report}" />

-        <attribute name="html" default="${dir.build}" />

-        <attribute name="src" default="${dir.build}" />

-        <attribute name="encoding" default="${encoding.java}" />

-        <sequential>

-            <sleep seconds="3" />

-            <junit haltonfailure="no" showoutput="yes" printsummary="yes" fork="true" >

-                <classpath>

-                    <fileset dir="${dir.lib}" includes="*.jar" excludes="org.eclipse.equinox.http.jetty*.jar" />

-                    <fileset dir="${dir.test.lib}" includes="*.jar" />

-                    <fileset file="${dir.lib}" excludes="*.jar"/>

-                    <fileset file="${dir.test.lib}" excludes="*.jar" />

-                    <fileset dir="${jenkins.test.lib}" includes="*.jar" />

-                    <fileset file="${jenkins.test.lib}" excludes="*.jar" />

-                    <fileset file="${file.dist.test}" />

-                </classpath>

-                <formatter type="xml" />

-                <batchtest todir="@{dest}">

-                    <fileset dir="@{src}">

-                        <include name="**/*Test.java" />

-                    </fileset>

-                </batchtest>

-            </junit>

-            

-            <junitreport todir="@{dest}">

-                <fileset dir="@{dest}">

-                    <include name="TEST-*.xml" />

-                </fileset>

-                <report format="frames" todir="@{dest}" />

-            </junitreport>

-        </sequential>

-    </macrodef>

-    

-    <macrodef name="bx-javadoc">

-        <attribute name="src" default="${dir.javadoc.src}" />

-        <attribute name="dest" default="${dir.javadoc}" />

-        <attribute name="encoding" default="${encoding.java}" />

-        <sequential>

-            <javadoc

-                sourcepath="@{src}"

-                destdir="@{dest}"

-                verbose="true"

-                additionalparam="-J-Djava.ext.dirs=${dir.lib}"

-                >

-                <!--classpath>

-                    <fileset dir="${dir.lib}" />

-                </classpath-->

-                <bottom>Copyright © 2011 Samsung Electronics Co., Ltd. All rights reserved.</bottom>

-            </javadoc>

-        </sequential>

-    </macrodef>

-

-    <macrodef name="bx-dist">

-        <attribute name="build" default="${dir.build}" />

-        <attribute name="dest" default="${dir.dist}" />

-        <attribute name="test.lib" default="${dir.test.lib}" />

-        <sequential>

-            <copy todir="@{dest}/lib">

-                <fileset dir="@{test.lib}" />

-            </copy>

-        </sequential>

-    </macrodef>

-

-    <target name="doc" description="Documentation for java source">

-        <bx-ver />

-        <bx-javadoc />

-        <bx-jar dest="${file.dist.javadoc}" base="${dir.src}"/>

-    </target>

-    

-    <target name="test" description="Test module">

-        <bx-ver />

-		<bx-rake-test />

-		<bx-javac-test />

-		<bx-prepare dir="${dir.dist}/lib" />

-		<bx-jar dest="${file.dist.test}" />

-		<!--

-		<bx-junit />

-        <bx-clean />

-		-->

-		<bx-dist />

-

-    </target>

-

-    <target name="findbugs">

-        <property name="findbugs.home" value="/usr/share/findbugs" />

-        <property name="findbugs.lib" value="${findbugs.home}/lib" />

-        <path id="findbugs.lib">

-            <pathelement location="${findbugs.lib}/bcel.jar" />

-            <pathelement location="${findbugs.lib}/findbugs.jar" />

-            <pathelement location="${findbugs.lib}/findbugs-ant.jar" />

-        </path>

-        <bx-prepare dir="${dir.test.report}"/>

-        <taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" classpathref="findbugs.lib" />

-        <findbugs home="${findbugs.home}"

-            includefilter="include.xml"

-            excludefilter="exclude.xml"

-            output="xml"

-            outputFile="${dir.test.report}/findbugs.xml">

-            <!--auxClasspath>

-                <fileset dir="${dir.lib}" />

-            </auxClasspath-->

-            <sourcePath path="${dir.src}" />

-            <class location="${file.dist}" />

-        </findbugs>

-    </target>

-

-    <target name="deploy" depends="doc,test,findbugs">

-    </target>

-

-</project>

-

+<?xml version="1.0" encoding="UTF-8"?>
+<project name="common-build" >
+    <property file="build.properties" />
+    <property file="build-common.properties" />
+
+    <!-- 빈 디렉토리를 준비한다 -->
+    <macrodef name="bx-prepare">
+        <attribute name="dir"/>
+        <sequential>
+            <delete dir="@{dir}" quiet="true"/>
+            <mkdir dir="@{dir}" />
+        </sequential>
+    </macrodef>
+
+    <!-- 빌드 작업용 디렉토리를 삭제한다. -->
+    <macrodef name="bx-clean">
+        <attribute name="dir" default="${dir.build}"/>
+        <sequential>
+            <delete dir="@{dir}" quiet="true"/>
+        </sequential>
+    </macrodef>
+
+    <macrodef name="bx-rake-test">
+        <attribute name="src" default="${dir.test.src}" />
+        <attribute name="build" default="${dir.build}" />
+        <sequential>
+            <copy todir="@{build}">
+                <fileset dir="@{src}" />
+            </copy>
+        </sequential>
+    </macrodef>
+    
+    <!-- 빌드 버젼을 생성한다. -->
+    <macrodef name="bx-ver">
+        <sequential>
+            <mkdir dir="${dir.dist}"/>
+                <buildnumber file="${file.buildnum}" />
+            <property name="version" value="${version.major}.${version.minor}.${version.fixxed}-b${build.number}" />
+            <property name="version.suffix" value="-${version}" />
+        </sequential>
+    </macrodef>
+
+    <!--  -->
+    <macrodef name="bx-javac-test">
+        <attribute name="src" default="${dir.build}" />
+        <attribute name="encoding" default="${encoding.java}" />
+        <attribute name="version" default="${javac.target}" />
+        <attribute name="debug" default="${javac.debug}" />
+        <attribute name="debuglevel" default="${javac.debuglevel}" />
+        <sequential>
+            <javac
+				encoding="@{encoding}"
+                srcdir="@{src}"
+                source="@{version}"
+                includes="**/*.java"
+                target="@{version}"
+                debug="@{debug}"
+                debuglevel="@{debuglevel}"
+                includeantruntime="false"
+            >
+                <classpath>
+                    <dirset dir="${dir.common.lib}" includes="org.tizen.common*" />
+                    <fileset dir="${dir.lib}" includes="*.jar" excludes="org.eclipse.equinox.http.jetty*.jar" />
+                    <fileset dir="${dir.test.lib}" includes="*.jar" />
+                    <fileset dir="${dir.common.lib}" includes="*.jar" />
+                    <fileset dir="${dir.eclipse.lib}" includes="*.jar" />
+                    <fileset file="${dir.lib}" excludes="*.jar"/>
+                    <fileset file="${dir.test.lib}" excludes="*.jar" />
+                    <fileset dir="${jenkins.test.lib}" includes="*.jar" />
+                    <fileset file="${jenkins.test.lib}" excludes="*.jar" />
+                    <fileset file="${file.dist}" />
+                </classpath>
+            </javac>
+        </sequential>
+    </macrodef>
+
+    <!--  -->
+    <macrodef name="bx-jar">
+        <attribute name="manifest" default="${file.manifest}" />
+        <attribute name="dest" default="${file.dist}" />
+        <attribute name="base" default="${dir.build}" />
+        <attribute name="version" default="${version}" />
+        <sequential>
+            <jar
+                basedir="@{base}"
+                destfile="@{dest}"
+            />
+        </sequential>
+    </macrodef>
+    
+
+    <macrodef name="bx-rake-lib">
+        <attribute name="base" default="${dir.build}" />
+        <sequential>
+            <copy todir="@{base}/lib">
+                <fileset dir="${dir.lib}">
+                </fileset>
+            </copy>
+        </sequential>
+    </macrodef>
+    <macrodef name="bx-bundle">
+        <attribute name="manifest" default="${file.manifest}" />
+        <attribute name="dest" default="${file.dist}" />
+        <attribute name="base" default="${dir.build}" />
+        <attribute name="version" default="${version}" />
+        <sequential>
+            <dirname property="parent" file="@{dest}"/>
+            <mkdir dir="${parent}" />
+            
+            <mkdir dir="@{base}/META-INF"/>
+            <copy file="@{manifest}" todir="@{base}/META-INF" />
+            <replace file="@{base}/META-INF/MANIFEST.MF" token="qualifier" value="b${build.number}"></replace>
+            <jar
+                basedir="@{base}"
+                destfile="@{dest}"
+                manifest="@{base}/META-INF/MANIFEST.MF"
+            />
+        </sequential>
+    </macrodef>
+    <macrodef name="bx-junit">
+        <attribute name="dest" default="${dir.test.report}" />
+        <attribute name="html" default="${dir.build}" />
+        <attribute name="src" default="${dir.build}" />
+        <attribute name="encoding" default="${encoding.java}" />
+        <sequential>
+            <sleep seconds="3" />
+            <junit haltonfailure="no" showoutput="yes" printsummary="yes" fork="true" >
+                <classpath>
+                    <fileset dir="${dir.lib}" includes="*.jar" excludes="org.eclipse.equinox.http.jetty*.jar" />
+                    <fileset dir="${dir.test.lib}" includes="*.jar" />
+                    <fileset file="${dir.lib}" excludes="*.jar"/>
+                    <fileset file="${dir.test.lib}" excludes="*.jar" />
+                    <fileset dir="${jenkins.test.lib}" includes="*.jar" />
+                    <fileset file="${jenkins.test.lib}" excludes="*.jar" />
+                    <fileset file="${file.dist.test}" />
+                </classpath>
+                <formatter type="xml" />
+                <batchtest todir="@{dest}">
+                    <fileset dir="@{src}">
+                        <include name="**/*Test.java" />
+                    </fileset>
+                </batchtest>
+            </junit>
+            
+            <junitreport todir="@{dest}">
+                <fileset dir="@{dest}">
+                    <include name="TEST-*.xml" />
+                </fileset>
+                <report format="frames" todir="@{dest}" />
+            </junitreport>
+        </sequential>
+    </macrodef>
+    
+    <macrodef name="bx-javadoc">
+        <attribute name="src" default="${dir.javadoc.src}" />
+        <attribute name="dest" default="${dir.javadoc}" />
+        <attribute name="encoding" default="${encoding.java}" />
+        <sequential>
+            <javadoc
+                sourcepath="@{src}"
+                destdir="@{dest}"
+                verbose="true"
+                additionalparam="-J-Djava.ext.dirs=${dir.lib}"
+                >
+                <!--classpath>
+                    <fileset dir="${dir.lib}" />
+                </classpath-->
+                <bottom>Copyright © 2011 Samsung Electronics Co., Ltd. All rights reserved.</bottom>
+            </javadoc>
+        </sequential>
+    </macrodef>
+
+    <macrodef name="bx-dist">
+        <attribute name="build" default="${dir.build}" />
+        <attribute name="dest" default="${dir.dist}" />
+        <attribute name="test.lib" default="${dir.test.lib}" />
+        <sequential>
+            <copy todir="@{dest}/lib">
+                <fileset dir="@{test.lib}" />
+            </copy>
+        </sequential>
+    </macrodef>
+
+    <target name="doc" description="Documentation for java source">
+        <bx-ver />
+        <bx-javadoc />
+        <bx-jar dest="${file.dist.javadoc}" base="${dir.src}"/>
+    </target>
+    
+    <target name="test" description="Test module">
+        <bx-ver />
+		<bx-rake-test />
+		<bx-javac-test />
+		<bx-prepare dir="${dir.dist}/lib" />
+		<bx-jar dest="${file.dist.test}" />
+		<!--
+		<bx-junit />
+        <bx-clean />
+		-->
+		<bx-dist />
+
+    </target>
+
+    <target name="findbugs">
+        <property name="findbugs.home" value="/usr/share/findbugs" />
+        <property name="findbugs.lib" value="${findbugs.home}/lib" />
+        <path id="findbugs.lib">
+            <pathelement location="${findbugs.lib}/bcel.jar" />
+            <pathelement location="${findbugs.lib}/findbugs.jar" />
+            <pathelement location="${findbugs.lib}/findbugs-ant.jar" />
+        </path>
+        <bx-prepare dir="${dir.test.report}"/>
+        <taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" classpathref="findbugs.lib" />
+        <findbugs home="${findbugs.home}"
+            includefilter="include.xml"
+            excludefilter="exclude.xml"
+            output="xml"
+            outputFile="${dir.test.report}/findbugs.xml">
+            <!--auxClasspath>
+                <fileset dir="${dir.lib}" />
+            </auxClasspath-->
+            <sourcePath path="${dir.src}" />
+            <class location="${file.dist}" />
+        </findbugs>
+    </target>
+
+    <target name="deploy" depends="doc,test,findbugs">
+    </target>
+
+</project>
+
diff --git a/package/changelog b/package/changelog
index 58b83e90b..49ba90166 100644
--- a/package/changelog
+++ b/package/changelog
@@ -1,3 +1,16 @@
+* 2.1.195
+- Added a decorator for project info
+== jihoon80.song <jihoon80.song@samsung.com> 2014-05-16
+* 2.1.194
+- Added a first platform unmarshaller in TprojectHandler
+== jihoon80.song <jihoon80.song@samsung.com> 2014-05-15
+* 2.1.193
+- Added tproject getter with specified path.
+== jihoon80.song <jihoon80.song@samsung.com> 2014-05-13
+* 2.1.192
+- Added files from fragment
+- Changed the way to determine the device type
+== yoonki.park <yoonki.park@samsung.com> 2014-04-28
 * 2.1.191
 - Cleanup for fragment
 == changhyun1.lee <changhyun1.lee@samsung.com> 2014-04-29
diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index cccc7923f..dc1f3a109 100644
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,4 +1,4 @@
-Version:2.1.191
+Version:2.1.195
 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>