diff options
34 files changed, 466 insertions, 16 deletions
diff --git a/bundles/code/org.eclipse.fx.code.editor.e4/.gitignore b/bundles/code/org.eclipse.fx.code.editor.e4/.gitignore index ae3c17260..09e3bc9b2 100644 --- a/bundles/code/org.eclipse.fx.code.editor.e4/.gitignore +++ b/bundles/code/org.eclipse.fx.code.editor.e4/.gitignore @@ -1 +1,2 @@ /bin/ +/target/ diff --git a/bundles/code/org.eclipse.fx.code.editor.e4/META-INF/MANIFEST.MF b/bundles/code/org.eclipse.fx.code.editor.e4/META-INF/MANIFEST.MF index d87637d3a..175013866 100644 --- a/bundles/code/org.eclipse.fx.code.editor.e4/META-INF/MANIFEST.MF +++ b/bundles/code/org.eclipse.fx.code.editor.e4/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: E4 Bundle-SymbolicName: org.eclipse.fx.code.editor.e4 -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.1.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.e4.core.contexts, org.eclipse.fx.code.editor, diff --git a/bundles/code/org.eclipse.fx.code.editor.e4/pom.xml b/bundles/code/org.eclipse.fx.code.editor.e4/pom.xml new file mode 100644 index 000000000..9952a60c6 --- /dev/null +++ b/bundles/code/org.eclipse.fx.code.editor.e4/pom.xml @@ -0,0 +1,34 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <name>e(fx)clipse - Runtime - Code - Base Editor e4 integration</name> + <groupId>org.eclipse.fx.runtime</groupId> + <artifactId>org.eclipse.fx.code.editor.e4</artifactId> + <packaging>eclipse-plugin</packaging> + + <parent> + <groupId>org.eclipse.fx</groupId> + <artifactId>releng</artifactId> + <relativePath>../../../releng/org.eclipse.fx.releng/pom.xml</relativePath> + <version>2.1.0-SNAPSHOT</version> + </parent> + + <build> + <resources> + <!-- to ensure that the feature lookup of the ui test works --> + <resource> + <directory>.</directory> + <includes> + <include>META-INF/</include> + </includes> + </resource> + </resources> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-source-plugin</artifactId> + </plugin> + </plugins> + </build> + +</project>
\ No newline at end of file diff --git a/bundles/code/org.eclipse.fx.code.editor.fx.e4/.gitignore b/bundles/code/org.eclipse.fx.code.editor.fx.e4/.gitignore index ae3c17260..09e3bc9b2 100644 --- a/bundles/code/org.eclipse.fx.code.editor.fx.e4/.gitignore +++ b/bundles/code/org.eclipse.fx.code.editor.fx.e4/.gitignore @@ -1 +1,2 @@ /bin/ +/target/ diff --git a/bundles/code/org.eclipse.fx.code.editor.fx.e4/META-INF/MANIFEST.MF b/bundles/code/org.eclipse.fx.code.editor.fx.e4/META-INF/MANIFEST.MF index 5a903f142..d37954ee4 100644 --- a/bundles/code/org.eclipse.fx.code.editor.fx.e4/META-INF/MANIFEST.MF +++ b/bundles/code/org.eclipse.fx.code.editor.fx.e4/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: E4 Bundle-SymbolicName: org.eclipse.fx.code.editor.fx.e4 -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.1.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.e4.core.contexts;bundle-version="1.4.0", diff --git a/bundles/code/org.eclipse.fx.code.editor.fx.e4/pom.xml b/bundles/code/org.eclipse.fx.code.editor.fx.e4/pom.xml new file mode 100644 index 000000000..8cd203aab --- /dev/null +++ b/bundles/code/org.eclipse.fx.code.editor.fx.e4/pom.xml @@ -0,0 +1,34 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <name>e(fx)clipse - Runtime - Code - Editor JavaFX e4 integration</name> + <groupId>org.eclipse.fx.runtime</groupId> + <artifactId>org.eclipse.fx.code.editor.fx.e4</artifactId> + <packaging>eclipse-plugin</packaging> + + <parent> + <groupId>org.eclipse.fx</groupId> + <artifactId>releng</artifactId> + <relativePath>../../../releng/org.eclipse.fx.releng/pom.xml</relativePath> + <version>2.1.0-SNAPSHOT</version> + </parent> + + <build> + <resources> + <!-- to ensure that the feature lookup of the ui test works --> + <resource> + <directory>.</directory> + <includes> + <include>META-INF/</include> + </includes> + </resource> + </resources> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-source-plugin</artifactId> + </plugin> + </plugins> + </build> + +</project>
\ No newline at end of file diff --git a/bundles/code/org.eclipse.fx.code.editor.fx/.gitignore b/bundles/code/org.eclipse.fx.code.editor.fx/.gitignore index ae3c17260..09e3bc9b2 100644 --- a/bundles/code/org.eclipse.fx.code.editor.fx/.gitignore +++ b/bundles/code/org.eclipse.fx.code.editor.fx/.gitignore @@ -1 +1,2 @@ /bin/ +/target/ diff --git a/bundles/code/org.eclipse.fx.code.editor.fx/META-INF/MANIFEST.MF b/bundles/code/org.eclipse.fx.code.editor.fx/META-INF/MANIFEST.MF index d255f0d57..bee850f6f 100644 --- a/bundles/code/org.eclipse.fx.code.editor.fx/META-INF/MANIFEST.MF +++ b/bundles/code/org.eclipse.fx.code.editor.fx/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Fx Bundle-SymbolicName: org.eclipse.fx.code.editor.fx -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.1.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: javax.inject, org.osgi.service.component.annotations;version="1.2.0" diff --git a/bundles/code/org.eclipse.fx.code.editor.fx/pom.xml b/bundles/code/org.eclipse.fx.code.editor.fx/pom.xml new file mode 100644 index 000000000..09b28d363 --- /dev/null +++ b/bundles/code/org.eclipse.fx.code.editor.fx/pom.xml @@ -0,0 +1,34 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <name>e(fx)clipse - Runtime - Code - Editor JavaFX</name> + <groupId>org.eclipse.fx.runtime</groupId> + <artifactId>org.eclipse.fx.code.editor.fx</artifactId> + <packaging>eclipse-plugin</packaging> + + <parent> + <groupId>org.eclipse.fx</groupId> + <artifactId>releng</artifactId> + <relativePath>../../../releng/org.eclipse.fx.releng/pom.xml</relativePath> + <version>2.1.0-SNAPSHOT</version> + </parent> + + <build> + <resources> + <!-- to ensure that the feature lookup of the ui test works --> + <resource> + <directory>.</directory> + <includes> + <include>META-INF/</include> + </includes> + </resource> + </resources> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-source-plugin</artifactId> + </plugin> + </plugins> + </build> + +</project>
\ No newline at end of file diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.text.fx/.gitignore b/bundles/code/org.eclipse.fx.code.editor.ldef.text.fx/.gitignore index ae3c17260..09e3bc9b2 100644 --- a/bundles/code/org.eclipse.fx.code.editor.ldef.text.fx/.gitignore +++ b/bundles/code/org.eclipse.fx.code.editor.ldef.text.fx/.gitignore @@ -1 +1,2 @@ /bin/ +/target/ diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.text.fx/META-INF/MANIFEST.MF b/bundles/code/org.eclipse.fx.code.editor.ldef.text.fx/META-INF/MANIFEST.MF index 0cc7966b4..e548c124f 100644 --- a/bundles/code/org.eclipse.fx.code.editor.ldef.text.fx/META-INF/MANIFEST.MF +++ b/bundles/code/org.eclipse.fx.code.editor.ldef.text.fx/META-INF/MANIFEST.MF @@ -2,14 +2,16 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Fx Bundle-SymbolicName: org.eclipse.fx.code.editor.ldef.text.fx -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.1.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy -Import-Package: org.osgi.service.component.annotations +Import-Package: javax.inject, + org.osgi.service.component.annotations Service-Component: OSGI-INF/services/org.eclipse.fx.code.editor.ldef.text.fx.LDefPresentationReconcilerTypeProvider.xml Require-Bundle: org.eclipse.fx.text.ui, org.eclipse.fx.code.editor, org.eclipse.fx.core;bundle-version="2.1.0", org.eclipse.fx.code.editor.ldef, org.eclipse.fx.code.editor.ldef.text, - org.eclipse.fx.code.editor.fx + org.eclipse.fx.code.editor.fx, + org.eclipse.emf.ecore;bundle-version="2.11.0" diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.text.fx/pom.xml b/bundles/code/org.eclipse.fx.code.editor.ldef.text.fx/pom.xml new file mode 100644 index 000000000..df191a3ef --- /dev/null +++ b/bundles/code/org.eclipse.fx.code.editor.ldef.text.fx/pom.xml @@ -0,0 +1,34 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <name>e(fx)clipse - Runtime - Code - LDef JavaFX Text</name> + <groupId>org.eclipse.fx.runtime</groupId> + <artifactId>org.eclipse.fx.code.editor.ldef.text.fx</artifactId> + <packaging>eclipse-plugin</packaging> + + <parent> + <groupId>org.eclipse.fx</groupId> + <artifactId>releng</artifactId> + <relativePath>../../../releng/org.eclipse.fx.releng/pom.xml</relativePath> + <version>2.1.0-SNAPSHOT</version> + </parent> + + <build> + <resources> + <!-- to ensure that the feature lookup of the ui test works --> + <resource> + <directory>.</directory> + <includes> + <include>META-INF/</include> + </includes> + </resource> + </resources> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-source-plugin</artifactId> + </plugin> + </plugins> + </build> + +</project>
\ No newline at end of file diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.text/.gitignore b/bundles/code/org.eclipse.fx.code.editor.ldef.text/.gitignore index ae3c17260..09e3bc9b2 100644 --- a/bundles/code/org.eclipse.fx.code.editor.ldef.text/.gitignore +++ b/bundles/code/org.eclipse.fx.code.editor.ldef.text/.gitignore @@ -1 +1,2 @@ /bin/ +/target/ diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.text/META-INF/MANIFEST.MF b/bundles/code/org.eclipse.fx.code.editor.ldef.text/META-INF/MANIFEST.MF index 164a4512b..92e4c2156 100644 --- a/bundles/code/org.eclipse.fx.code.editor.ldef.text/META-INF/MANIFEST.MF +++ b/bundles/code/org.eclipse.fx.code.editor.ldef.text/META-INF/MANIFEST.MF @@ -2,14 +2,16 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Text Bundle-SymbolicName: org.eclipse.fx.code.editor.ldef.text -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.1.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.fx.text, org.eclipse.fx.code.editor.ldef, org.eclipse.e4.core.contexts, org.eclipse.fx.code.editor, - org.eclipse.fx.core;bundle-version="2.1.0" -Import-Package: org.osgi.service.component.annotations + org.eclipse.fx.core;bundle-version="2.1.0", + org.eclipse.emf.ecore;bundle-version="2.11.0" +Import-Package: javax.inject, + org.osgi.service.component.annotations Service-Component: OSGI-INF/services/org.eclipse.fx.code.editor.ldef.text.internal.LDefModelCF.xml, OSGI-INF/services/org.eclipse.fx.code.editor.ldef.text.internal.LDefDocumentPartitionerProvider.xml Bundle-ActivationPolicy: lazy diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.text/pom.xml b/bundles/code/org.eclipse.fx.code.editor.ldef.text/pom.xml new file mode 100644 index 000000000..7c11f57d3 --- /dev/null +++ b/bundles/code/org.eclipse.fx.code.editor.ldef.text/pom.xml @@ -0,0 +1,34 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <name>e(fx)clipse - Runtime - Code - LDef Text</name> + <groupId>org.eclipse.fx.runtime</groupId> + <artifactId>org.eclipse.fx.code.editor.ldef.text</artifactId> + <packaging>eclipse-plugin</packaging> + + <parent> + <groupId>org.eclipse.fx</groupId> + <artifactId>releng</artifactId> + <relativePath>../../../releng/org.eclipse.fx.releng/pom.xml</relativePath> + <version>2.1.0-SNAPSHOT</version> + </parent> + + <build> + <resources> + <!-- to ensure that the feature lookup of the ui test works --> + <resource> + <directory>.</directory> + <includes> + <include>META-INF/</include> + </includes> + </resource> + </resources> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-source-plugin</artifactId> + </plugin> + </plugins> + </build> + +</project>
\ No newline at end of file diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef/.gitignore b/bundles/code/org.eclipse.fx.code.editor.ldef/.gitignore index ae3c17260..09e3bc9b2 100644 --- a/bundles/code/org.eclipse.fx.code.editor.ldef/.gitignore +++ b/bundles/code/org.eclipse.fx.code.editor.ldef/.gitignore @@ -1 +1,2 @@ /bin/ +/target/ diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef/META-INF/MANIFEST.MF b/bundles/code/org.eclipse.fx.code.editor.ldef/META-INF/MANIFEST.MF index f60f29d96..7819dd84e 100644 --- a/bundles/code/org.eclipse.fx.code.editor.ldef/META-INF/MANIFEST.MF +++ b/bundles/code/org.eclipse.fx.code.editor.ldef/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2
Bundle-Name: org.eclipse.fx.code.editor.ldef
Bundle-Vendor: My Company
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
Bundle-SymbolicName: org.eclipse.fx.code.editor.ldef; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.xtext;visibility:=reexport,
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef/pom.xml b/bundles/code/org.eclipse.fx.code.editor.ldef/pom.xml new file mode 100644 index 000000000..ce32ca207 --- /dev/null +++ b/bundles/code/org.eclipse.fx.code.editor.ldef/pom.xml @@ -0,0 +1,34 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <name>e(fx)clipse - Runtime - Code - LDef Language</name> + <groupId>org.eclipse.fx.runtime</groupId> + <artifactId>org.eclipse.fx.code.editor.ldef</artifactId> + <packaging>eclipse-plugin</packaging> + + <parent> + <groupId>org.eclipse.fx</groupId> + <artifactId>releng</artifactId> + <relativePath>../../../releng/org.eclipse.fx.releng/pom.xml</relativePath> + <version>2.1.0-SNAPSHOT</version> + </parent> + + <build> + <resources> + <!-- to ensure that the feature lookup of the ui test works --> + <resource> + <directory>.</directory> + <includes> + <include>META-INF/</include> + </includes> + </resource> + </resources> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-source-plugin</artifactId> + </plugin> + </plugins> + </build> + +</project>
\ No newline at end of file diff --git a/bundles/code/org.eclipse.fx.code.editor/.gitignore b/bundles/code/org.eclipse.fx.code.editor/.gitignore index ae3c17260..09e3bc9b2 100644 --- a/bundles/code/org.eclipse.fx.code.editor/.gitignore +++ b/bundles/code/org.eclipse.fx.code.editor/.gitignore @@ -1 +1,2 @@ /bin/ +/target/ diff --git a/bundles/code/org.eclipse.fx.code.editor/META-INF/MANIFEST.MF b/bundles/code/org.eclipse.fx.code.editor/META-INF/MANIFEST.MF index bdae2b215..58d360f45 100644 --- a/bundles/code/org.eclipse.fx.code.editor/META-INF/MANIFEST.MF +++ b/bundles/code/org.eclipse.fx.code.editor/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Editor Bundle-SymbolicName: org.eclipse.fx.code.editor -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.1.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: javax.inject, org.eclipse.e4.core.di.annotations, diff --git a/bundles/code/org.eclipse.fx.code.editor/pom.xml b/bundles/code/org.eclipse.fx.code.editor/pom.xml new file mode 100644 index 000000000..6ef585c81 --- /dev/null +++ b/bundles/code/org.eclipse.fx.code.editor/pom.xml @@ -0,0 +1,34 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <name>e(fx)clipse - Runtime - Code - Base Editor</name> + <groupId>org.eclipse.fx.runtime</groupId> + <artifactId>org.eclipse.fx.code.editor</artifactId> + <packaging>eclipse-plugin</packaging> + + <parent> + <groupId>org.eclipse.fx</groupId> + <artifactId>releng</artifactId> + <relativePath>../../../releng/org.eclipse.fx.releng/pom.xml</relativePath> + <version>2.1.0-SNAPSHOT</version> + </parent> + + <build> + <resources> + <!-- to ensure that the feature lookup of the ui test works --> + <resource> + <directory>.</directory> + <includes> + <include>META-INF/</include> + </includes> + </resource> + </resources> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-source-plugin</artifactId> + </plugin> + </plugins> + </build> + +</project>
\ No newline at end of file diff --git a/bundles/code/org.eclipse.fx.code.outline.e4/.gitignore b/bundles/code/org.eclipse.fx.code.outline.e4/.gitignore index ae3c17260..09e3bc9b2 100644 --- a/bundles/code/org.eclipse.fx.code.outline.e4/.gitignore +++ b/bundles/code/org.eclipse.fx.code.outline.e4/.gitignore @@ -1 +1,2 @@ /bin/ +/target/ diff --git a/bundles/code/org.eclipse.fx.code.outline.e4/META-INF/MANIFEST.MF b/bundles/code/org.eclipse.fx.code.outline.e4/META-INF/MANIFEST.MF index e3eb895ef..b3144bd55 100644 --- a/bundles/code/org.eclipse.fx.code.outline.e4/META-INF/MANIFEST.MF +++ b/bundles/code/org.eclipse.fx.code.outline.e4/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: E4 Bundle-SymbolicName: org.eclipse.fx.code.outline.e4 -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.1.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.e4.core.contexts, org.eclipse.fx.code.outline, diff --git a/bundles/code/org.eclipse.fx.code.outline.e4/pom.xml b/bundles/code/org.eclipse.fx.code.outline.e4/pom.xml new file mode 100644 index 000000000..def432039 --- /dev/null +++ b/bundles/code/org.eclipse.fx.code.outline.e4/pom.xml @@ -0,0 +1,34 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <name>e(fx)clipse - Runtime - Code - Base Outline e4 integration</name> + <groupId>org.eclipse.fx.runtime</groupId> + <artifactId>org.eclipse.fx.code.outline.e4</artifactId> + <packaging>eclipse-plugin</packaging> + + <parent> + <groupId>org.eclipse.fx</groupId> + <artifactId>releng</artifactId> + <relativePath>../../../releng/org.eclipse.fx.releng/pom.xml</relativePath> + <version>2.1.0-SNAPSHOT</version> + </parent> + + <build> + <resources> + <!-- to ensure that the feature lookup of the ui test works --> + <resource> + <directory>.</directory> + <includes> + <include>META-INF/</include> + </includes> + </resource> + </resources> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-source-plugin</artifactId> + </plugin> + </plugins> + </build> + +</project>
\ No newline at end of file diff --git a/bundles/code/org.eclipse.fx.code.outline/.gitignore b/bundles/code/org.eclipse.fx.code.outline/.gitignore index ae3c17260..09e3bc9b2 100644 --- a/bundles/code/org.eclipse.fx.code.outline/.gitignore +++ b/bundles/code/org.eclipse.fx.code.outline/.gitignore @@ -1 +1,2 @@ /bin/ +/target/ diff --git a/bundles/code/org.eclipse.fx.code.outline/META-INF/MANIFEST.MF b/bundles/code/org.eclipse.fx.code.outline/META-INF/MANIFEST.MF index dfdbc039e..8e49f5a50 100644 --- a/bundles/code/org.eclipse.fx.code.outline/META-INF/MANIFEST.MF +++ b/bundles/code/org.eclipse.fx.code.outline/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Outline Bundle-SymbolicName: org.eclipse.fx.code.outline -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.1.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: javax.inject, org.eclipse.e4.core.di.annotations diff --git a/bundles/code/org.eclipse.fx.code.outline/pom.xml b/bundles/code/org.eclipse.fx.code.outline/pom.xml new file mode 100644 index 000000000..691fdb3ef --- /dev/null +++ b/bundles/code/org.eclipse.fx.code.outline/pom.xml @@ -0,0 +1,34 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <name>e(fx)clipse - Runtime - Code - Base Outline</name> + <groupId>org.eclipse.fx.runtime</groupId> + <artifactId>org.eclipse.fx.code.outline</artifactId> + <packaging>eclipse-plugin</packaging> + + <parent> + <groupId>org.eclipse.fx</groupId> + <artifactId>releng</artifactId> + <relativePath>../../../releng/org.eclipse.fx.releng/pom.xml</relativePath> + <version>2.1.0-SNAPSHOT</version> + </parent> + + <build> + <resources> + <!-- to ensure that the feature lookup of the ui test works --> + <resource> + <directory>.</directory> + <includes> + <include>META-INF/</include> + </includes> + </resource> + </resources> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-source-plugin</artifactId> + </plugin> + </plugins> + </build> + +</project>
\ No newline at end of file diff --git a/bundles/code/org.eclipse.fx.text.ui/.gitignore b/bundles/code/org.eclipse.fx.text.ui/.gitignore index ae3c17260..09e3bc9b2 100644 --- a/bundles/code/org.eclipse.fx.text.ui/.gitignore +++ b/bundles/code/org.eclipse.fx.text.ui/.gitignore @@ -1 +1,2 @@ /bin/ +/target/ diff --git a/bundles/code/org.eclipse.fx.text.ui/META-INF/MANIFEST.MF b/bundles/code/org.eclipse.fx.text.ui/META-INF/MANIFEST.MF index 02581c0a6..f6d1b19cb 100644 --- a/bundles/code/org.eclipse.fx.text.ui/META-INF/MANIFEST.MF +++ b/bundles/code/org.eclipse.fx.text.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Ui Bundle-SymbolicName: org.eclipse.fx.text.ui -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.1.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.fx.ui.controls;bundle-version="1.0.0", org.eclipse.text;bundle-version="3.5.300", diff --git a/bundles/code/org.eclipse.fx.text.ui/pom.xml b/bundles/code/org.eclipse.fx.text.ui/pom.xml new file mode 100644 index 000000000..be2ad34c0 --- /dev/null +++ b/bundles/code/org.eclipse.fx.text.ui/pom.xml @@ -0,0 +1,34 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <name>e(fx)clipse - Runtime - Code - Eclipse JavaFX Text</name> + <groupId>org.eclipse.fx.runtime</groupId> + <artifactId>org.eclipse.fx.text.ui</artifactId> + <packaging>eclipse-plugin</packaging> + + <parent> + <groupId>org.eclipse.fx</groupId> + <artifactId>releng</artifactId> + <relativePath>../../../releng/org.eclipse.fx.releng/pom.xml</relativePath> + <version>2.1.0-SNAPSHOT</version> + </parent> + + <build> + <resources> + <!-- to ensure that the feature lookup of the ui test works --> + <resource> + <directory>.</directory> + <includes> + <include>META-INF/</include> + </includes> + </resource> + </resources> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-source-plugin</artifactId> + </plugin> + </plugins> + </build> + +</project>
\ No newline at end of file diff --git a/bundles/code/org.eclipse.fx.text/.gitignore b/bundles/code/org.eclipse.fx.text/.gitignore index ae3c17260..09e3bc9b2 100644 --- a/bundles/code/org.eclipse.fx.text/.gitignore +++ b/bundles/code/org.eclipse.fx.text/.gitignore @@ -1 +1,2 @@ /bin/ +/target/ diff --git a/bundles/code/org.eclipse.fx.text/META-INF/MANIFEST.MF b/bundles/code/org.eclipse.fx.text/META-INF/MANIFEST.MF index 3d0ae3d6f..ef19105c9 100644 --- a/bundles/code/org.eclipse.fx.text/META-INF/MANIFEST.MF +++ b/bundles/code/org.eclipse.fx.text/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Text Bundle-SymbolicName: org.eclipse.fx.text -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.1.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.jface.text, org.eclipse.jface.text.rules, diff --git a/bundles/code/org.eclipse.fx.text/pom.xml b/bundles/code/org.eclipse.fx.text/pom.xml new file mode 100644 index 000000000..21964a837 --- /dev/null +++ b/bundles/code/org.eclipse.fx.text/pom.xml @@ -0,0 +1,34 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <name>e(fx)clipse - Runtime - Code - Eclipse Text extensions</name> + <groupId>org.eclipse.fx.runtime</groupId> + <artifactId>org.eclipse.fx.text</artifactId> + <packaging>eclipse-plugin</packaging> + + <parent> + <groupId>org.eclipse.fx</groupId> + <artifactId>releng</artifactId> + <relativePath>../../../releng/org.eclipse.fx.releng/pom.xml</relativePath> + <version>2.1.0-SNAPSHOT</version> + </parent> + + <build> + <resources> + <!-- to ensure that the feature lookup of the ui test works --> + <resource> + <directory>.</directory> + <includes> + <include>META-INF/</include> + </includes> + </resource> + </resources> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-source-plugin</artifactId> + </plugin> + </plugins> + </build> + +</project>
\ No newline at end of file diff --git a/releng/code/org.eclipse.fx.code.target.feature/feature.xml b/releng/code/org.eclipse.fx.code.target.feature/feature.xml index fa60f8231..4de04a1e8 100644 --- a/releng/code/org.eclipse.fx.code.target.feature/feature.xml +++ b/releng/code/org.eclipse.fx.code.target.feature/feature.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <feature id="org.eclipse.fx.code.target.feature" - label="Feature" + label="Code editing target platform" version="2.1.0.qualifier"> <description url="http://www.example.com/description"> @@ -90,4 +90,65 @@ version="0.0.0" unpack="false"/> + <plugin + id="org.eclipse.fx.code.editor" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.fx.code.editor.e4" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.fx.code.editor.fx" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.fx.code.editor.fx.e4" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.fx.code.editor.ldef" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.fx.code.editor.ldef.text" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.eclipse.fx.code.editor.ldef.text.fx" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.eclipse.fx.code.outline" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.fx.code.outline.e4" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + </feature> |