From: Jihoon Song <jihoon80.song@samsung.com>
Date: Tue, 15 Oct 2013 10:40:17 +0000 (+0900)
Subject: Merge branch 'tizen' of public:sdk/ide/common-eplugin into tizen
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2fdb373197ac383209e1b90c2dbaa3e2518cdb95;p=sdk%2Fide%2Fcommon-eplugin.git

Merge branch 'tizen' of public:sdk/ide/common-eplugin into tizen

Conflicts:
	org.tizen.common.externals/META-INF/MANIFEST.MF
	org.tizen.common.externals/about.html
	org.tizen.common.externals/build.properties

Change-Id: I42376f3d7ed59a98bf1040795ed05686c92fa5a5
---

2fdb373197ac383209e1b90c2dbaa3e2518cdb95
diff --cc org.tizen.common.externals/META-INF/MANIFEST.MF
index ba61a42,71a0317..a160dc8
--- a/org.tizen.common.externals/META-INF/MANIFEST.MF
+++ b/org.tizen.common.externals/META-INF/MANIFEST.MF
@@@ -41,37 -42,53 +42,54 @@@ Export-Package: com.tinkerpop.blueprint
   org.mihalis.opal.titledSeparator,
   org.mihalis.opal.transitionComposite,
   org.mihalis.opal.utils,
-  org.tizen.common.externals
++ org.tizen.common.externals,
+  zipeditor,
+  zipeditor.actions,
+  zipeditor.model,
+  zipeditor.operations
 -Bundle-ClassPath: orientdb_lib/antlr-2.7.7.jar,
 - orientdb_lib/asm-3.2.jar,
 - orientdb_lib/blueprints-core-2.5.0-SNAPSHOT.jar,
 - orientdb_lib/blueprints-orient-graph-2.5.0-SNAPSHOT.jar,
 - orientdb_lib/commons-configuration-1.6.jar,
 - orientdb_lib/gremlin-groovy-2.5.0-SNAPSHOT.jar,
 - orientdb_lib/gremlin-java-2.5.0-SNAPSHOT.jar,
 - orientdb_lib/groovy-1.8.9.jar,
 - orientdb_lib/hazelcast-3.0.jar,
 - orientdb_lib/hibernate-jpa-2.0-api-1.0.0.Final.jar,
 - orientdb_lib/jansi-1.5.jar,
 - orientdb_lib/javassist.jar,
 - orientdb_lib/jline-0.9.94.jar,
 - orientdb_lib/jna-3.5.2.jar,
 - orientdb_lib/mail.jar,
 - orientdb_lib/orient-commons-1.5.1.jar,
 - orientdb_lib/orientdb-client-1.5.1.jar,
 - orientdb_lib/orientdb-core-1.5.1.jar,
 - orientdb_lib/orientdb-distributed-1.5.1.jar,
 - orientdb_lib/orientdb-enterprise-1.5.1.jar,
 - orientdb_lib/orientdb-graphdb-1.5.1.jar,
 - orientdb_lib/orientdb-nativeos-1.5.1.jar,
 - orientdb_lib/orientdb-object-1.5.1.jar,
 - orientdb_lib/orientdb-server-1.5.1.jar,
 - orientdb_lib/orientdb-tools-1.5.1.jar,
 - orientdb_lib/pipes-2.5.0-SNAPSHOT.jar,
 - orientdb_lib/platform.jar,
 - orientdb_lib/sesame-model-2.6.10.jar,
 - orientdb_lib/sesame-query-2.6.10.jar,
 - orientdb_lib/sesame-rio-api-2.6.10.jar,
 - orientdb_lib/sesame-sail-api-2.6.10.jar,
 - orientdb_lib/snappy-0.3.jar,
 - .
 +Bundle-ClassPath: .,
 + lib/orientdb/antlr-2.7.7.jar,
 + lib/orientdb/asm-3.2.jar,
 + lib/orientdb/blueprints-core-2.5.0-SNAPSHOT.jar,
 + lib/orientdb/blueprints-orient-graph-2.5.0-SNAPSHOT.jar,
 + lib/orientdb/commons-configuration-1.6.jar,
 + lib/orientdb/gremlin-groovy-2.5.0-SNAPSHOT.jar,
 + lib/orientdb/gremlin-java-2.5.0-SNAPSHOT.jar,
 + lib/orientdb/groovy-1.8.9.jar,
 + lib/orientdb/hazelcast-3.0.jar,
 + lib/orientdb/hibernate-jpa-2.0-api-1.0.0.Final.jar,
 + lib/orientdb/jansi-1.5.jar,
 + lib/orientdb/javassist.jar,
 + lib/orientdb/jline-0.9.94.jar,
 + lib/orientdb/jna-3.5.2.jar,
 + lib/orientdb/mail.jar,
 + lib/orientdb/orient-commons-1.5.1.jar,
 + lib/orientdb/orientdb-client-1.5.1.jar,
 + lib/orientdb/orientdb-core-1.5.1.jar,
 + lib/orientdb/orientdb-distributed-1.5.1.jar,
 + lib/orientdb/orientdb-enterprise-1.5.1.jar,
 + lib/orientdb/orientdb-graphdb-1.5.1.jar,
 + lib/orientdb/orientdb-nativeos-1.5.1.jar,
 + lib/orientdb/orientdb-object-1.5.1.jar,
 + lib/orientdb/orientdb-server-1.5.1.jar,
 + lib/orientdb/orientdb-tools-1.5.1.jar,
 + lib/orientdb/pipes-2.5.0-SNAPSHOT.jar,
 + lib/orientdb/platform.jar,
 + lib/orientdb/sesame-model-2.6.10.jar,
 + lib/orientdb/sesame-query-2.6.10.jar,
 + lib/orientdb/sesame-rio-api-2.6.10.jar,
 + lib/orientdb/sesame-sail-api-2.6.10.jar,
 + lib/orientdb/snappy-0.3.jar
+ Import-Package: org.apache.tools.bzip2,
+  org.apache.tools.tar,
+  org.eclipse.core.filesystem,
+  org.eclipse.core.resources,
+  org.eclipse.ui,
+  org.eclipse.ui.editors.text,
+  org.eclipse.ui.navigator,
+  org.eclipse.ui.texteditor,
+  org.eclipse.ui.views.contentoutline,
+  org.eclipse.ui.views.framelist,
+  org.slf4j,
+  org.tizen.common,
+  org.tizen.common.util
diff --cc org.tizen.common.externals/about.html
index 4c5ec8a,6b888a5..cc199ae
--- a/org.tizen.common.externals/about.html
+++ b/org.tizen.common.externals/about.html
@@@ -37,17 -37,10 +37,22 @@@ A copy of the license is included in <
  </ul>
  </p>
  
 +<h4>OrientDB</h4>
 +<p>
 +This library provide a graph database. This is being used to manage the build dependency. 
 +</p>
 +
 +<p>
 +A copy of the license is included in <a href="about_files/LICENSE-2.0.htm">about_files/LICENSE-2.0.htm</a>. The home page is located at:
 +<ul>
 +<a href="http://www.orientdb.org/">http://www.orientdb.org/</a>
 +</ul>
 +</p>
 +
+ <h4>Zip-Editor</h4>
+ <p>
+ The Zip-Editor is an <a href="http://www.eclipse.org">Eclipse</a> editor that can view and manipulate zip archives.
+ </p>
+ <p>See <a href="about_files/LICENSE.CPLv1">License</a>.</p>
  </body>
 -</html>
 +</html>
diff --cc org.tizen.common.externals/build.properties
index 979a5a3,b69b902..9f6e308
--- a/org.tizen.common.externals/build.properties
+++ b/org.tizen.common.externals/build.properties
@@@ -5,37 -5,9 +5,9 @@@ bin.includes = META-INF/,
                 OSGI-INF/,\
                 resources/,\
                 about.html,\
 -               about_files/,\
 +               about_files/,\
                 images/,\
-                lib/orientdb/antlr-2.7.7.jar,\
-                lib/orientdb/asm-3.2.jar,\
-                lib/orientdb/blueprints-core-2.5.0-SNAPSHOT.jar,\
-                lib/orientdb/blueprints-orient-graph-2.5.0-SNAPSHOT.jar,\
-                lib/orientdb/commons-configuration-1.6.jar,\
-                lib/orientdb/gremlin-groovy-2.5.0-SNAPSHOT.jar,\
-                lib/orientdb/gremlin-java-2.5.0-SNAPSHOT.jar,\
-                lib/orientdb/groovy-1.8.9.jar,\
-                lib/orientdb/hazelcast-3.0.jar,\
-                lib/orientdb/hibernate-jpa-2.0-api-1.0.0.Final.jar,\
-                lib/orientdb/jansi-1.5.jar,\
-                lib/orientdb/javassist.jar,\
-                lib/orientdb/jline-0.9.94.jar,\
-                lib/orientdb/jna-3.5.2.jar,\
-                lib/orientdb/mail.jar,\
-                lib/orientdb/orient-commons-1.5.1.jar,\
-                lib/orientdb/orientdb-client-1.5.1.jar,\
-                lib/orientdb/orientdb-core-1.5.1.jar,\
-                lib/orientdb/orientdb-distributed-1.5.1.jar,\
-                lib/orientdb/orientdb-enterprise-1.5.1.jar,\
-                lib/orientdb/orientdb-graphdb-1.5.1.jar,\
-                lib/orientdb/orientdb-nativeos-1.5.1.jar,\
-                lib/orientdb/orientdb-object-1.5.1.jar,\
-                lib/orientdb/orientdb-server-1.5.1.jar,\
-                lib/orientdb/orientdb-tools-1.5.1.jar,\
-                lib/orientdb/pipes-2.5.0-SNAPSHOT.jar,\
-                lib/orientdb/platform.jar,\
-                lib/orientdb/sesame-model-2.6.10.jar,\
-                lib/orientdb/sesame-query-2.6.10.jar,\
-                lib/orientdb/sesame-rio-api-2.6.10.jar,\
-                lib/orientdb/sesame-sail-api-2.6.10.jar,\
-                lib/orientdb/snappy-0.3.jar
 -               orientdb_lib/,\
++               lib/orientdb/,\
+                plugin.xml,\
+                plugin.properties,\
+                icons/