Tycho build.

Features dependencies fixed.
build.properties fixed

Former-commit-id: fae7e460

features/org.jkiss.dbeaver.ext.db2.feature/feature.xml

@@ -19,7 +19,7 @@
    </license>
 
    <requires>
-      <import feature="org.jkiss.dbeaver.core" version="1.0.0"/>
+      <import feature="org.jkiss.dbeaver.core.feature" version="1.0.0"/>
    </requires>
 
    <plugin

features/org.jkiss.dbeaver.ext.generic.feature/feature.xml

@@ -19,7 +19,7 @@
     </license>
 
     <requires>
-        <import feature="org.jkiss.dbeaver.core" version="1.0.0"/>
+        <import feature="org.jkiss.dbeaver.core.feature" version="1.0.0"/>
     </requires>
 
     <plugin

features/org.jkiss.dbeaver.ext.mysql.feature/feature.xml

@@ -19,7 +19,7 @@
    </license>
 
    <requires>
-      <import feature="org.jkiss.dbeaver.core" version="1.0.0"/>
+      <import feature="org.jkiss.dbeaver.core.feature" version="1.0.0"/>
    </requires>
 
    <plugin

features/org.jkiss.dbeaver.ext.oracle.feature/feature.xml

@@ -19,7 +19,7 @@
    </license>
 
    <requires>
-      <import feature="org.jkiss.dbeaver.core" version="1.0.0"/>
+      <import feature="org.jkiss.dbeaver.core.feature" version="1.0.0"/>
    </requires>
 
    <plugin

features/org.jkiss.dbeaver.ext.wmi.feature/feature.xml

@@ -19,7 +19,7 @@
    </license>
 
    <requires>
-      <import feature="org.jkiss.dbeaver.core" version="1.0.0"/>
+      <import feature="org.jkiss.dbeaver.core.feature" version="1.0.0"/>
    </requires>
 
    <plugin

features/org.jkiss.dbeaver.rcp.feature/feature.xml

@@ -484,7 +484,7 @@
             version="0.0.0"
             unpack="false"/>
 
-    <plugin
+    <!--plugin
             id="org.eclipse.swt.cocoa.macosx"
             os="macosx"
             ws="cocoa"
@@ -492,7 +492,7 @@
             install-size="0"
             version="0.0.0"
             fragment="true"
-            unpack="false"/>
+            unpack="false"/-->
 
     <plugin
             id="org.eclipse.swt.cocoa.macosx.x86_64"
@@ -773,7 +773,6 @@
 
     <!-- Eclipse Mars additions -->
 
-<!--
     <plugin
             id="org.eclipse.e4.core.di.annotations"
             download-size="0"
@@ -794,7 +793,6 @@
             install-size="0"
             version="0.0.0"
             unpack="false"/>
--->
 
 
 </feature>

features/org.jkiss.dbeaver.runtime.feature/feature.xml

@@ -19,7 +19,7 @@
     </license>
 
     <includes
-            id="org.jkiss.dbeaver.core"
+            id="org.jkiss.dbeaver.core.feature"
             version="0.0.0"/>
 
     <requires>

features/org.jkiss.dbeaver.standalone.feature/feature.xml

@@ -23,31 +23,31 @@
     </url>
 
     <includes
-            id="org.jkiss.dbeaver.rcp"
+            id="org.jkiss.dbeaver.rcp.feature"
             version="0.0.0"/>
 
     <includes
-            id="org.jkiss.dbeaver.core"
+            id="org.jkiss.dbeaver.core.feature"
             version="0.0.0"/>
 
     <includes
-            id="org.jkiss.dbeaver.ext.generic"
+            id="org.jkiss.dbeaver.ext.generic.feature"
             version="0.0.0"/>
 
     <includes
-            id="org.jkiss.dbeaver.ext.mysql"
+            id="org.jkiss.dbeaver.ext.mysql.feature"
             version="0.0.0"/>
 
     <includes
-            id="org.jkiss.dbeaver.ext.oracle"
+            id="org.jkiss.dbeaver.ext.oracle.feature"
             version="0.0.0"/>
 
     <includes
-            id="org.jkiss.dbeaver.ext.wmi"
+            id="org.jkiss.dbeaver.ext.wmi.feature"
             version="0.0.0"/>
 
     <includes
-            id="org.jkiss.dbeaver.ext.db2"
+            id="org.jkiss.dbeaver.ext.db2.feature"
             version="0.0.0"/>
 
     <requires>

plugins/org.jkiss.dbeaver.core.application/build.properties

@@ -10,5 +10,4 @@ bin.includes = META-INF/,\
                plugin_zh.properties,\
                plugin_customization.ini,\
                plugin.xml,\
-               plugin.properties,\
-               css/
+               plugin.properties

plugins/org.jkiss.dbeaver.ext.db2/build.properties

@@ -6,7 +6,4 @@ bin.includes = plugin.xml,\
                icons/,\
                LICENSE.txt,\
                plugin.properties,\
-               plugin_ru.properties,\
-               plugin_zh.properties,\
-               plugin_it.properties,\
                templates/

plugins/org.jkiss.dbeaver.model/META-INF/MANIFEST.MF

@@ -57,7 +57,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.expressions,
  org.jkiss.utils;visibility:=reexport,
  com.jcraft.jsch,
- net.sf.jsqlparser;visibility:=reexport,
+ com.github.jsqlparser;visibility:=reexport,
  org.apache.commons.logging,
  org.apache.commons.jexl,
  org.eclipse.core.commands

pom.xml

@@ -8,13 +8,18 @@
 	<packaging>pom</packaging>
 	
 	<properties>
+		<dbeaver-version>3.5.0</dbeaver-version>
 		<tycho-version>0.23.1</tycho-version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<!--eclipse-repository-url>http://download.eclipse.org/eclipse/updates/3.6</eclipse-repository-url-->
 		<eclipse-p2-repo.url>http://download.eclipse.org/releases/mars/</eclipse-p2-repo.url>
+		<local-p2-repo.url>http://localhost:8080/site</local-p2-repo.url>
 	</properties>
 
 	<modules>
+		<!--<module>contrib/plugins/net.sf.jsqlparser</module>-->
+		<!--<module>contrib/plugins/org.apache.commons.jexl</module>-->
+
 		<module>modules/org.jkiss.utils</module>
 		<module>modules/org.jkiss.wmi</module>
 
@@ -39,6 +44,7 @@
 
 		<module>contrib/drivers/plugins/com.ibm.db2.jdbc</module>
 		<module>contrib/drivers/plugins/com.oracle.jdbc</module>
+		<module>contrib/drivers/plugins/com.mysql.jdbc</module>
 		<module>contrib/drivers/plugins/org.jkiss.dbeaver.resources.cache</module>
 		<module>contrib/drivers/plugins/org.jkiss.dbeaver.resources.csvjdbc</module>
 		<module>contrib/drivers/plugins/org.jkiss.dbeaver.resources.db2</module>
@@ -79,15 +85,17 @@
 			<url>${eclipse-p2-repo.url}</url>
 			<layout>p2</layout>
 		</repository>
-		<!--repository>
+		<repository>
 			<id>local-contrib</id>
-			<url>contrib/plugins</url>
+			<url>${local-p2-repo.url}</url>
 			<layout>p2</layout>
-		</repository-->
+		</repository>
 	</repositories>
 
 	<build>
 		<plugins>
+
+			<!-- Tycho build -->
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>target-platform-configuration</artifactId>

product/build.xml

@@ -417,7 +417,7 @@
             version="${productVersion}"
             todir="${distCE}"
             section="devel"
-            depends="java7-runtime"
+            depends="openjdk-7-jre-headless | java-runtime-headless"
             homepage="http://dbeaver.jkiss.org"
             suggests="dbeaver"
             architecture="${arch.deb}">

product/localRepository/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.jkiss.dbeaver</groupId>
+	<artifactId>contrib</artifactId>
+	<version>1.0.0</version>
+	<packaging>pom</packaging>
+
+	<properties>
+		<tycho-version>0.23.1</tycho-version>
+	</properties>
+
+	<pluginRepositories>
+		<pluginRepository>
+			<id>reficio</id>
+			<url>http://repo.reficio.org/maven/</url>
+		</pluginRepository>
+	</pluginRepositories>
+
+	<build>
+		<plugins>
+
+			<!-- Maven -> OSGI repository -->
+			<plugin>
+				<groupId>org.reficio</groupId>
+				<artifactId>p2-maven-plugin</artifactId>
+				<version>1.2.0-SNAPSHOT</version>
+				<executions>
+					<execution>
+						<id>default-cli</id>
+						<configuration>
+							<artifacts>
+								<!-- specify your depencies here -->
+								<!-- groupId:artifactId:version -->
+								<artifact><id>com.github.jsqlparser:jsqlparser:0.9.3</id></artifact>
+								<artifact><id>org.apache.commons:commons-jexl:2.1.1</id></artifact>
+							</artifacts>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+                <plugin>
+                    <groupId>org.mortbay.jetty</groupId>
+                    <artifactId>jetty-maven-plugin</artifactId>
+                    <version>8.1.5.v20120716</version>
+                    <configuration>
+                        <scanIntervalSeconds>10</scanIntervalSeconds>
+                        <webAppSourceDirectory>${basedir}/target/repository/</webAppSourceDirectory>
+                        <webApp>
+                            <contextPath>/site</contextPath>
+                        </webApp>
+                   </configuration>
+                </plugin>
+
+
+		</plugins>
+	</build>
+</project>

product/localRepository/startRepository.cmd

+call mvn p2:site
+start mvn jetty:start
\ No newline at end of file