diff options
87 files changed, 363 insertions, 523 deletions
diff --git a/org.eclipse.vex.core.tests/.classpath b/org.eclipse.vex.core.tests/.classpath index 2d1a4302..a9558867 100644 --- a/org.eclipse.vex.core.tests/.classpath +++ b/org.eclipse.vex.core.tests/.classpath @@ -2,6 +2,6 @@ <classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="src" path="src/"/>
+ <classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/org.eclipse.vex.core.tests/.gitignore b/org.eclipse.vex.core.tests/.gitignore index fe07c278..193255b0 100644 --- a/org.eclipse.vex.core.tests/.gitignore +++ b/org.eclipse.vex.core.tests/.gitignore @@ -1,2 +1,2 @@ bin
-/target +target diff --git a/org.eclipse.vex.core.tests/.project b/org.eclipse.vex.core.tests/.project index 91dc4f9c..6720abee 100644 --- a/org.eclipse.vex.core.tests/.project +++ b/org.eclipse.vex.core.tests/.project @@ -20,8 +20,14 @@ <arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
diff --git a/org.eclipse.vex.core.tests/.settings/org.eclipse.core.resources.prefs b/org.eclipse.vex.core.tests/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 00000000..3d916f29 --- /dev/null +++ b/org.eclipse.vex.core.tests/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1
+encoding/<project>=Cp1252
diff --git a/org.eclipse.vex.core.tests/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.vex.core.tests/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 00000000..14b697b7 --- /dev/null +++ b/org.eclipse.vex.core.tests/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.vex.core.tests/pom.xml b/org.eclipse.vex.core.tests/pom.xml index 0de55c24..c19ceff1 100644 --- a/org.eclipse.vex.core.tests/pom.xml +++ b/org.eclipse.vex.core.tests/pom.xml @@ -4,7 +4,6 @@ <modelVersion>4.0.0</modelVersion> <artifactId>org.eclipse.vex.core.tests</artifactId> <packaging>eclipse-test-plugin</packaging> - <version>1.1.0-SNAPSHOT</version> <name>Vex Core Tests</name> <parent> @@ -14,41 +13,4 @@ <relativePath>../org.eclipse.vex.releng/pom.xml</relativePath> </parent> - <build> - <plugins> - <plugin> - <groupId>org.sonatype.tycho</groupId> - <artifactId>maven-osgi-test-plugin</artifactId> - <version>${tycho-version}</version> - <configuration> - <useUIHarness>true</useUIHarness> - <testSuite>org.eclipse.vex.core.tests</testSuite> - <testClass>org.eclipse.vex.core.tests.VEXCoreTestSuite</testClass> - <dependencies> - <dependency> - <type>p2-installable-unit</type> - <artifactId>org.eclipse.sdk.ide</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>p2-installable-unit</type> - <artifactId>org.eclipse.wst.xml.ui</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>p2-installable-unit</type> - <artifactId>org.eclipse.wst.xsd.ui</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>p2-installable-unit</type> - <artifactId>org.eclipse.wst.dtd.ui</artifactId> - <version>0.0.0</version> - </dependency> - </dependencies> - </configuration> - </plugin> - </plugins> - </build> - </project> diff --git a/org.eclipse.vex.core/.classpath b/org.eclipse.vex.core/.classpath index 2d1a4302..a9558867 100644 --- a/org.eclipse.vex.core/.classpath +++ b/org.eclipse.vex.core/.classpath @@ -2,6 +2,6 @@ <classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="src" path="src/"/>
+ <classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/org.eclipse.vex.core/.gitignore b/org.eclipse.vex.core/.gitignore index fe07c278..193255b0 100644 --- a/org.eclipse.vex.core/.gitignore +++ b/org.eclipse.vex.core/.gitignore @@ -1,2 +1,2 @@ bin
-/target +target diff --git a/org.eclipse.vex.core/.project b/org.eclipse.vex.core/.project index a841134d..60a39a31 100644 --- a/org.eclipse.vex.core/.project +++ b/org.eclipse.vex.core/.project @@ -20,8 +20,14 @@ <arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
diff --git a/org.eclipse.vex.core/.settings/org.eclipse.core.resources.prefs b/org.eclipse.vex.core/.settings/org.eclipse.core.resources.prefs index 3a4d5b4f..3d916f29 100644 --- a/org.eclipse.vex.core/.settings/org.eclipse.core.resources.prefs +++ b/org.eclipse.vex.core/.settings/org.eclipse.core.resources.prefs @@ -1,3 +1,2 @@ -#Fri Feb 25 19:52:05 CET 2011
eclipse.preferences.version=1
-encoding/<project>=UTF-8
+encoding/<project>=Cp1252
diff --git a/org.eclipse.vex.core/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.vex.core/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 00000000..14b697b7 --- /dev/null +++ b/org.eclipse.vex.core/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.vex.core/build.properties b/org.eclipse.vex.core/build.properties index e84a2f74..c9b94a1d 100644 --- a/org.eclipse.vex.core/build.properties +++ b/org.eclipse.vex.core/build.properties @@ -1,10 +1,5 @@ -bin.includes = plugin.properties,\ - META-INF/,\ - .,\ - lib/ -src.includes = lib/ source.. = src/ -der = . -bin.excludes = lib/.cvsignore -src.excludes = lib/.cvsignore output.. = bin/ +bin.includes = plugin.properties,\ + META-INF/,\ + . diff --git a/org.eclipse.vex.core/pom.xml b/org.eclipse.vex.core/pom.xml index d341ff20..95b671c0 100644 --- a/org.eclipse.vex.core/pom.xml +++ b/org.eclipse.vex.core/pom.xml @@ -4,7 +4,6 @@ <modelVersion>4.0.0</modelVersion> <artifactId>org.eclipse.vex.core</artifactId> <packaging>eclipse-plugin</packaging> - <version>1.1.0-SNAPSHOT</version> <name>Vex Core</name> <parent> @@ -14,43 +13,4 @@ <relativePath>../org.eclipse.vex.releng/pom.xml</relativePath> </parent> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> - <version>2.3.2</version> - <configuration> - <findbugsXmlOutput>true</findbugsXmlOutput> - <failOnError>false</failOnError> - </configuration> - <executions> - <execution> - <goals> - <goal>check</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - <configuration> - <sourceEncoding>utf-8</sourceEncoding> - <minimumTokens>100</minimumTokens> - <targetJdk>1.5</targetJdk> - <format>xml</format> - <failOnViolation>false</failOnViolation> - </configuration> - <executions> - <execution> - <goals> - <goal>cpd-check</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </project> diff --git a/org.eclipse.vex.dita/.classpath b/org.eclipse.vex.dita/.classpath index c8350676..71459895 100644 --- a/org.eclipse.vex.dita/.classpath +++ b/org.eclipse.vex.dita/.classpath @@ -1,6 +1,7 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="output" path="bin"/> -</classpath> +<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src_does_not_exist/"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/org.eclipse.vex.dita/.gitignore b/org.eclipse.vex.dita/.gitignore index ea8c4bf7..6dff79ce 100644 --- a/org.eclipse.vex.dita/.gitignore +++ b/org.eclipse.vex.dita/.gitignore @@ -1 +1,3 @@ -/target +target +
+src_does_not_exist diff --git a/org.eclipse.vex.dita/.project b/org.eclipse.vex.dita/.project index 970918c2..b5fb9213 100644 --- a/org.eclipse.vex.dita/.project +++ b/org.eclipse.vex.dita/.project @@ -6,6 +6,11 @@ </projects>
<buildSpec>
<buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
@@ -15,8 +20,15 @@ <arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
diff --git a/org.eclipse.vex.dita/.settings/org.eclipse.core.resources.prefs b/org.eclipse.vex.dita/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 00000000..3d916f29 --- /dev/null +++ b/org.eclipse.vex.dita/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1
+encoding/<project>=Cp1252
diff --git a/org.eclipse.vex.dita/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.vex.dita/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 00000000..14b697b7 --- /dev/null +++ b/org.eclipse.vex.dita/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.vex.dita/build.properties b/org.eclipse.vex.dita/build.properties index e6870c09..8fc433c5 100644 --- a/org.eclipse.vex.dita/build.properties +++ b/org.eclipse.vex.dita/build.properties @@ -1,7 +1,7 @@ +source.. = src_does_not_exist/ bin.includes = plugin.xml,\ dita11/,\ plugin.properties,\ META-INF/,\ css/,\ dita11/ -source.. = src_does_not_exist/ diff --git a/org.eclipse.vex.dita/pom.xml b/org.eclipse.vex.dita/pom.xml index 6c3904f6..fc88c451 100644 --- a/org.eclipse.vex.dita/pom.xml +++ b/org.eclipse.vex.dita/pom.xml @@ -4,7 +4,6 @@ <modelVersion>4.0.0</modelVersion> <artifactId>org.eclipse.vex.dita</artifactId> <packaging>eclipse-plugin</packaging> - <version>1.1.0-SNAPSHOT</version> <name>Vex DITA Support</name> <parent> @@ -14,43 +13,4 @@ <relativePath>../org.eclipse.vex.releng/pom.xml</relativePath> </parent> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> - <version>2.3.2</version> - <configuration> - <findbugsXmlOutput>true</findbugsXmlOutput> - <failOnError>false</failOnError> - </configuration> - <executions> - <execution> - <goals> - <goal>check</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - <configuration> - <sourceEncoding>utf-8</sourceEncoding> - <minimumTokens>100</minimumTokens> - <targetJdk>1.5</targetJdk> - <format>xml</format> - <failOnViolation>false</failOnViolation> - </configuration> - <executions> - <execution> - <goals> - <goal>cpd-check</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </project> diff --git a/org.eclipse.vex.docbook/.classpath b/org.eclipse.vex.docbook/.classpath index 472ee29b..a9558867 100644 --- a/org.eclipse.vex.docbook/.classpath +++ b/org.eclipse.vex.docbook/.classpath @@ -1,7 +1,7 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="src"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> - <classpathentry kind="output" path="bin"/> -</classpath> +<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src/"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/org.eclipse.vex.docbook/.gitignore b/org.eclipse.vex.docbook/.gitignore index fe07c278..193255b0 100644 --- a/org.eclipse.vex.docbook/.gitignore +++ b/org.eclipse.vex.docbook/.gitignore @@ -1,2 +1,2 @@ bin
-/target +target diff --git a/org.eclipse.vex.docbook/.project b/org.eclipse.vex.docbook/.project index e95555b6..eb3e72d7 100644 --- a/org.eclipse.vex.docbook/.project +++ b/org.eclipse.vex.docbook/.project @@ -20,8 +20,14 @@ <arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
diff --git a/org.eclipse.vex.docbook/.settings/org.eclipse.core.resources.prefs b/org.eclipse.vex.docbook/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 00000000..3d916f29 --- /dev/null +++ b/org.eclipse.vex.docbook/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1
+encoding/<project>=Cp1252
diff --git a/org.eclipse.vex.docbook/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.vex.docbook/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 00000000..14b697b7 --- /dev/null +++ b/org.eclipse.vex.docbook/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.vex.docbook/build.properties b/org.eclipse.vex.docbook/build.properties index 17df7382..25654737 100644 --- a/org.eclipse.vex.docbook/build.properties +++ b/org.eclipse.vex.docbook/build.properties @@ -5,9 +5,9 @@ bin.includes = plugin.xml,\ META-INF/,\ 4.5/,\ 5.0/ - src.includes = styles/,\ - 4.5/ + 4.5/,\ + 5.0/ source.. = src/ jars.compile.order = . diff --git a/org.eclipse.vex.docbook/pom.xml b/org.eclipse.vex.docbook/pom.xml index 5f67c7ae..adf15b5d 100644 --- a/org.eclipse.vex.docbook/pom.xml +++ b/org.eclipse.vex.docbook/pom.xml @@ -4,7 +4,6 @@ <modelVersion>4.0.0</modelVersion> <artifactId>org.eclipse.vex.docbook</artifactId> <packaging>eclipse-plugin</packaging> - <version>1.1.0-SNAPSHOT</version> <name>Vex DocBook Support</name> <parent> @@ -14,43 +13,4 @@ <relativePath>../org.eclipse.vex.releng/pom.xml</relativePath> </parent> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> - <version>2.3.2</version> - <configuration> - <findbugsXmlOutput>true</findbugsXmlOutput> - <failOnError>false</failOnError> - </configuration> - <executions> - <execution> - <goals> - <goal>check</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - <configuration> - <sourceEncoding>utf-8</sourceEncoding> - <minimumTokens>100</minimumTokens> - <targetJdk>1.5</targetJdk> - <format>xml</format> - <failOnViolation>false</failOnViolation> - </configuration> - <executions> - <execution> - <goals> - <goal>cpd-check</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </project> diff --git a/org.eclipse.vex.documentation/.classpath b/org.eclipse.vex.documentation/.classpath new file mode 100644 index 00000000..d51d2790 --- /dev/null +++ b/org.eclipse.vex.documentation/.classpath @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src_does_not_exist/"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/org.eclipse.vex.documentation/.gitignore b/org.eclipse.vex.documentation/.gitignore index 9095d63e..66b0fca9 100644 --- a/org.eclipse.vex.documentation/.gitignore +++ b/org.eclipse.vex.documentation/.gitignore @@ -1,2 +1,4 @@ -/help -/target +help +
+target +/src_does_not_exist diff --git a/org.eclipse.vex.documentation/.project b/org.eclipse.vex.documentation/.project index 14b1280d..143cf7fd 100644 --- a/org.eclipse.vex.documentation/.project +++ b/org.eclipse.vex.documentation/.project @@ -6,6 +6,11 @@ </projects>
<buildSpec>
<buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
@@ -15,8 +20,15 @@ <arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
diff --git a/org.eclipse.vex.documentation/.settings/org.eclipse.core.resources.prefs b/org.eclipse.vex.documentation/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 00000000..3d916f29 --- /dev/null +++ b/org.eclipse.vex.documentation/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1
+encoding/<project>=Cp1252
diff --git a/org.eclipse.vex.documentation/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.vex.documentation/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 00000000..14b697b7 --- /dev/null +++ b/org.eclipse.vex.documentation/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.vex.documentation/pom.xml b/org.eclipse.vex.documentation/pom.xml index 08981b04..d841fccc 100644 --- a/org.eclipse.vex.documentation/pom.xml +++ b/org.eclipse.vex.documentation/pom.xml @@ -4,7 +4,6 @@ <modelVersion>4.0.0</modelVersion> <artifactId>org.eclipse.vex.documentation</artifactId> <packaging>eclipse-plugin</packaging> - <version>1.1.0-SNAPSHOT</version> <name>Vex Documentation</name> <parent> @@ -15,32 +14,23 @@ </parent> <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <version>1.4</version> - </plugin> - </plugins> - </pluginManagement> - <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> + <version>1.7</version> <executions> <execution> <id>mylyn-wiki-text</id> <phase>generate-sources</phase> - <goals> - <goal>run</goal> - </goals> <configuration> <tasks> <ant antfile="buildHelp.xml" inheritRefs="true" /> </tasks> </configuration> + <goals> + <goal>run</goal> + </goals> </execution> </executions> </plugin> diff --git a/org.eclipse.vex.feature/.gitignore b/org.eclipse.vex.feature/.gitignore index ea8c4bf7..eb5a316c 100644 --- a/org.eclipse.vex.feature/.gitignore +++ b/org.eclipse.vex.feature/.gitignore @@ -1 +1 @@ -/target +target diff --git a/org.eclipse.vex.feature/.project b/org.eclipse.vex.feature/.project index d5d8948d..54a4e01e 100644 --- a/org.eclipse.vex.feature/.project +++ b/org.eclipse.vex.feature/.project @@ -10,8 +10,14 @@ <arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.FeatureNature</nature>
</natures>
</projectDescription>
diff --git a/org.eclipse.vex.feature/.settings/org.eclipse.core.resources.prefs b/org.eclipse.vex.feature/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 00000000..3d916f29 --- /dev/null +++ b/org.eclipse.vex.feature/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1
+encoding/<project>=Cp1252
diff --git a/org.eclipse.vex.feature/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.vex.feature/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 00000000..14b697b7 --- /dev/null +++ b/org.eclipse.vex.feature/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.vex.feature/build.properties b/org.eclipse.vex.feature/build.properties index c47d205c..7faaac83 100644 --- a/org.eclipse.vex.feature/build.properties +++ b/org.eclipse.vex.feature/build.properties @@ -1,11 +1,8 @@ bin.includes = feature.xml,\ - lgpl.txt,\ feature.properties,\ - feature_fr.properties,\ license.html,\ epl-v10.html -src.includes = lgpl.txt,\ - feature.xml,\ +src.includes = feature.xml,\ feature.properties,\ epl-v10.html,\ license.html diff --git a/org.eclipse.vex.feature/pom.xml b/org.eclipse.vex.feature/pom.xml index c83fb74a..2df6f6d2 100644 --- a/org.eclipse.vex.feature/pom.xml +++ b/org.eclipse.vex.feature/pom.xml @@ -4,7 +4,6 @@ <modelVersion>4.0.0</modelVersion> <artifactId>org.eclipse.vex.feature</artifactId> <packaging>eclipse-feature</packaging> - <version>1.1.0-SNAPSHOT</version> <name>Vex Feature</name> <parent> diff --git a/org.eclipse.vex.projectplan/.classpath b/org.eclipse.vex.projectplan/.classpath new file mode 100644 index 00000000..a9558867 --- /dev/null +++ b/org.eclipse.vex.projectplan/.classpath @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src/"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/org.eclipse.vex.projectplan/.project b/org.eclipse.vex.projectplan/.project index 0fd3034f..fa707da9 100644 --- a/org.eclipse.vex.projectplan/.project +++ b/org.eclipse.vex.projectplan/.project @@ -6,6 +6,11 @@ </projects>
<buildSpec>
<buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
@@ -15,8 +20,15 @@ <arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
diff --git a/org.eclipse.vex.projectplan/.settings/org.eclipse.core.resources.prefs b/org.eclipse.vex.projectplan/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 00000000..3d916f29 --- /dev/null +++ b/org.eclipse.vex.projectplan/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1
+encoding/<project>=Cp1252
diff --git a/org.eclipse.vex.projectplan/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.vex.projectplan/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..44217f8c --- /dev/null +++ b/org.eclipse.vex.projectplan/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/org.eclipse.vex.projectplan/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.vex.projectplan/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 00000000..14b697b7 --- /dev/null +++ b/org.eclipse.vex.projectplan/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.vex.projectplan/pom.xml b/org.eclipse.vex.projectplan/pom.xml index 1c4ea8ba..b55d5f61 100644 --- a/org.eclipse.vex.projectplan/pom.xml +++ b/org.eclipse.vex.projectplan/pom.xml @@ -4,7 +4,6 @@ <modelVersion>4.0.0</modelVersion> <artifactId>org.eclipse.vex.projectplan</artifactId> <packaging>eclipse-plugin</packaging> - <version>1.1.0-SNAPSHOT</version> <name>The Eclipse Project Plan Plug-in</name> <parent> @@ -14,43 +13,4 @@ <relativePath>../org.eclipse.vex.releng/pom.xml</relativePath> </parent> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> - <version>2.3.2</version> - <configuration> - <findbugsXmlOutput>true</findbugsXmlOutput> - <failOnError>false</failOnError> - </configuration> - <executions> - <execution> - <goals> - <goal>check</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - <configuration> - <sourceEncoding>utf-8</sourceEncoding> - <minimumTokens>100</minimumTokens> - <targetJdk>1.5</targetJdk> - <format>xml</format> - <failOnViolation>false</failOnViolation> - </configuration> - <executions> - <execution> - <goals> - <goal>cpd-check</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </project> diff --git a/org.eclipse.vex.releng/.project b/org.eclipse.vex.releng/.project index c83f1c0d..2d6bc85c 100644 --- a/org.eclipse.vex.releng/.project +++ b/org.eclipse.vex.releng/.project @@ -5,7 +5,13 @@ <projects>
</projects>
<buildSpec>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
</projectDescription>
diff --git a/org.eclipse.vex.releng/.settings/org.eclipse.core.resources.prefs b/org.eclipse.vex.releng/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 00000000..3d916f29 --- /dev/null +++ b/org.eclipse.vex.releng/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1
+encoding/<project>=Cp1252
diff --git a/org.eclipse.vex.releng/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.vex.releng/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 00000000..14b697b7 --- /dev/null +++ b/org.eclipse.vex.releng/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.vex.releng/pom.xml b/org.eclipse.vex.releng/pom.xml index 2576ae82..c264ced1 100644 --- a/org.eclipse.vex.releng/pom.xml +++ b/org.eclipse.vex.releng/pom.xml @@ -8,119 +8,99 @@ <version>1.1.0-SNAPSHOT</version> <packaging>pom</packaging> - <parent> - <artifactId>org.eclipse.vex-parent</artifactId> - <groupId>org.eclipse.vex</groupId> - <version>1.1.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <pluginRepositories> - <pluginRepository> - <id>snapshots</id> - <url>http://snapshots.repository.codehaus.org/</url> - <releases><enabled>false</enabled></releases> - </pluginRepository> - </pluginRepositories> - <properties> - <tycho-version>0.10.0</tycho-version> + <tycho-version>0.16.0</tycho-version> + <project.build.sourceEncoding>Cp1252</project.build.sourceEncoding> </properties> - <modules> - <module>../org.eclipse.vex</module> - <module>../org.eclipse.vex.core</module> - <module>../org.eclipse.vex.ui</module> - <module>../org.eclipse.vex.dita</module> - <module>../org.eclipse.vex.docbook</module> - <module>../org.eclipse.vex.xhtml</module> - <module>../org.eclipse.vex.projectplan</module> - <module>../org.eclipse.vex.documentation</module> - <module>../org.eclipse.vex.feature</module> - <module>../org.eclipse.vex.sdk.feature</module> - <module>../org.eclipse.vex.repository</module> - <module>../org.eclipse.vex.core.tests</module> - <module>../org.eclipse.vex.ui.tests</module> - </modules> - + <repositories> + <repository> + <id>indigo</id> + <url>http://download.eclipse.org/releases/indigo/</url> + <layout>p2</layout> + </repository> + <repository> + <id>orbit</id> + <url>http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository</url> + <layout>p2</layout> + </repository> + <!-- + <repository> + <snapshots> + <enabled>true</enabled> + </snapshots> + <id>vex-milestones</id> + <url>http://download.eclipse.org/vex/milestones</url> + <layout>default</layout> + </repository> + <repository> + <id>vex-releases</id> + <url>http://download.eclipse.org/vex/releases</url> + <layout>default</layout> + </repository> + --> + </repositories> + <build> <plugins> <plugin> - <groupId>org.sonatype.tycho</groupId> + <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-maven-plugin</artifactId> <version>${tycho-version}</version> <extensions>true</extensions> </plugin> <plugin> - <groupId>org.sonatype.tycho</groupId> + <groupId>org.eclipse.tycho</groupId> <artifactId>target-platform-configuration</artifactId> <version>${tycho-version}</version> <configuration> - <resolver>p2</resolver> + <environments> + <environment> + <os>win32</os> + <ws>win32</ws> + <arch>x86</arch> + </environment> + </environments> </configuration> </plugin> <plugin> - <groupId>org.sonatype.tycho</groupId> - <artifactId>maven-osgi-source-plugin</artifactId> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-versions-plugin</artifactId> <version>${tycho-version}</version> - <configuration> - <encoding>UTF-8</encoding> - </configuration> - <executions> - <execution> - <id>attach-source</id> - <goals> - <goal>plugin-source</goal> - </goals> - </execution> - </executions> </plugin> </plugins> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.sonatype.tycho</groupId> - <artifactId>maven-osgi-compiler-plugin</artifactId> - <version>${tycho-version}</version> - <configuration> - <encoding>UTF-8</encoding> - </configuration> - </plugin> - <plugin> - <groupId>org.sonatype.tycho</groupId> - <artifactId>maven-osgi-packaging-plugin</artifactId> - <version>${tycho-version}</version> - <configuration> - <archiveSite>true</archiveSite> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-resources-plugin</artifactId> - <version>2.4.1</version> - <configuration> - <encoding>UTF-8</encoding> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - <version>2.5</version> - </plugin> - </plugins> - </pluginManagement> </build> - <repositories> - <repository> - <id>indigo</id> - <url>http://download.eclipse.org/releases/indigo/</url> - <layout>p2</layout> - </repository> - <repository> - <id>orbit</id> - <url>http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository</url> - <layout>p2</layout> - </repository> - </repositories> + + <modules> + <module>../org.eclipse.vex</module> + <module>../org.eclipse.vex.core</module> + <module>../org.eclipse.vex.ui</module> + <module>../org.eclipse.vex.dita</module> + <module>../org.eclipse.vex.docbook</module> + <module>../org.eclipse.vex.xhtml</module> + <module>../org.eclipse.vex.projectplan</module> + <module>../org.eclipse.vex.documentation</module> + <module>../org.eclipse.vex.feature</module> + <module>../org.eclipse.vex.sdk.feature</module> + <module>../org.eclipse.vex.repository</module> + <module>../org.eclipse.vex.core.tests</module> + <module>../org.eclipse.vex.ui.tests</module> + </modules> + + <mailingLists> + <mailingList> + <name>Vex Mailing List</name> + <post>mylyn-vex-dev@eclipse.org</post> + <subscribe>https://dev.eclipse.org/mailman/listinfo/mylyn-vex-dev</subscribe> + <unsubscribe>https://dev.eclipse.org/mailman/listinfo/mylyn-vex-dev</unsubscribe> + <archive>http://dev.eclipse.org/mhonarc/lists/mylyn-vex-dev</archive> + </mailingList> + </mailingLists> + <issueManagement> + <url>https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced;classification=Mylyn;product=Mylyn%20Docs%20Vex</url> + <system>Bugzilla</system> + </issueManagement> + + <name>Vex Releng</name> </project> diff --git a/org.eclipse.vex.repository/.gitignore b/org.eclipse.vex.repository/.gitignore index ea8c4bf7..eb5a316c 100644 --- a/org.eclipse.vex.repository/.gitignore +++ b/org.eclipse.vex.repository/.gitignore @@ -1 +1 @@ -/target +target diff --git a/org.eclipse.vex.repository/.project b/org.eclipse.vex.repository/.project index 342cecb7..d1f2188d 100644 --- a/org.eclipse.vex.repository/.project +++ b/org.eclipse.vex.repository/.project @@ -10,8 +10,14 @@ <arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.UpdateSiteNature</nature>
</natures>
</projectDescription>
diff --git a/org.eclipse.vex.repository/.settings/org.eclipse.core.resources.prefs b/org.eclipse.vex.repository/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 00000000..3d916f29 --- /dev/null +++ b/org.eclipse.vex.repository/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1
+encoding/<project>=Cp1252
diff --git a/org.eclipse.vex.repository/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.vex.repository/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 00000000..14b697b7 --- /dev/null +++ b/org.eclipse.vex.repository/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.vex.repository/site.xml b/org.eclipse.vex.repository/category.xml index 626fcc35..626fcc35 100644 --- a/org.eclipse.vex.repository/site.xml +++ b/org.eclipse.vex.repository/category.xml diff --git a/org.eclipse.vex.repository/pom.xml b/org.eclipse.vex.repository/pom.xml index cba3ea25..93d95f05 100644 --- a/org.eclipse.vex.repository/pom.xml +++ b/org.eclipse.vex.repository/pom.xml @@ -2,10 +2,9 @@ <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/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>org.eclipse.vex</groupId> - <artifactId>org.eclipse.vex.repository</artifactId> - <packaging>eclipse-update-site</packaging> - <name>Vex Update Site</name> + <artifactId>org.eclipse.vex.repository</artifactId> + <packaging>eclipse-repository</packaging> + <name>Vex Update Site</name> <parent> <artifactId>org.eclipse.vex-releng</artifactId> diff --git a/org.eclipse.vex.sdk.feature/.gitignore b/org.eclipse.vex.sdk.feature/.gitignore index ea8c4bf7..eb5a316c 100644 --- a/org.eclipse.vex.sdk.feature/.gitignore +++ b/org.eclipse.vex.sdk.feature/.gitignore @@ -1 +1 @@ -/target +target diff --git a/org.eclipse.vex.sdk.feature/.project b/org.eclipse.vex.sdk.feature/.project index b3668994..dfd77351 100644 --- a/org.eclipse.vex.sdk.feature/.project +++ b/org.eclipse.vex.sdk.feature/.project @@ -10,8 +10,14 @@ <arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.FeatureNature</nature>
</natures>
</projectDescription>
diff --git a/org.eclipse.vex.sdk.feature/.settings/org.eclipse.core.resources.prefs b/org.eclipse.vex.sdk.feature/.settings/org.eclipse.core.resources.prefs index 3750df1b..3d916f29 100644 --- a/org.eclipse.vex.sdk.feature/.settings/org.eclipse.core.resources.prefs +++ b/org.eclipse.vex.sdk.feature/.settings/org.eclipse.core.resources.prefs @@ -1,3 +1,2 @@ -#Sun Dec 16 16:57:57 EST 2007 -eclipse.preferences.version=1 -encoding/<project>=ISO-8859-1 +eclipse.preferences.version=1
+encoding/<project>=Cp1252
diff --git a/org.eclipse.vex.sdk.feature/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.vex.sdk.feature/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 00000000..14b697b7 --- /dev/null +++ b/org.eclipse.vex.sdk.feature/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.vex.sdk.feature/pom.xml b/org.eclipse.vex.sdk.feature/pom.xml index 5aede7e0..a7d5bbd6 100644 --- a/org.eclipse.vex.sdk.feature/pom.xml +++ b/org.eclipse.vex.sdk.feature/pom.xml @@ -4,7 +4,6 @@ <modelVersion>4.0.0</modelVersion> <artifactId>org.eclipse.vex.sdk.feature</artifactId> <packaging>eclipse-feature</packaging> - <version>1.1.0-SNAPSHOT</version> <name>Vex SDK Feature</name> <parent> diff --git a/org.eclipse.vex.ui.tests/.classpath b/org.eclipse.vex.ui.tests/.classpath index 64c5e31b..a9558867 100644 --- a/org.eclipse.vex.ui.tests/.classpath +++ b/org.eclipse.vex.ui.tests/.classpath @@ -1,7 +1,7 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src"/> - <classpathentry kind="output" path="bin"/> -</classpath> +<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src/"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/org.eclipse.vex.ui.tests/.gitignore b/org.eclipse.vex.ui.tests/.gitignore index fe07c278..193255b0 100644 --- a/org.eclipse.vex.ui.tests/.gitignore +++ b/org.eclipse.vex.ui.tests/.gitignore @@ -1,2 +1,2 @@ bin
-/target +target diff --git a/org.eclipse.vex.ui.tests/.project b/org.eclipse.vex.ui.tests/.project index 79b35ee0..3f7f0719 100644 --- a/org.eclipse.vex.ui.tests/.project +++ b/org.eclipse.vex.ui.tests/.project @@ -20,8 +20,14 @@ <arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
diff --git a/org.eclipse.vex.ui.tests/.settings/org.eclipse.core.resources.prefs b/org.eclipse.vex.ui.tests/.settings/org.eclipse.core.resources.prefs index 9241652d..3d916f29 100644 --- a/org.eclipse.vex.ui.tests/.settings/org.eclipse.core.resources.prefs +++ b/org.eclipse.vex.ui.tests/.settings/org.eclipse.core.resources.prefs @@ -1,3 +1,2 @@ -#Sun Nov 01 00:52:51 GMT 2009 -eclipse.preferences.version=1 -encoding/<project>=UTF-8 +eclipse.preferences.version=1
+encoding/<project>=Cp1252
diff --git a/org.eclipse.vex.ui.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.vex.ui.tests/.settings/org.eclipse.jdt.core.prefs index e32a8bcc..656ddb20 100644 --- a/org.eclipse.vex.ui.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.vex.ui.tests/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,5 @@ eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
org.eclipse.jdt.core.compiler.compliance=1.5
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
diff --git a/org.eclipse.vex.ui.tests/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.vex.ui.tests/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 00000000..14b697b7 --- /dev/null +++ b/org.eclipse.vex.ui.tests/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.vex.ui.tests/pom.xml b/org.eclipse.vex.ui.tests/pom.xml index d25de66c..59bb2d29 100644 --- a/org.eclipse.vex.ui.tests/pom.xml +++ b/org.eclipse.vex.ui.tests/pom.xml @@ -4,7 +4,6 @@ <modelVersion>4.0.0</modelVersion> <artifactId>org.eclipse.vex.ui.tests</artifactId> <packaging>eclipse-test-plugin</packaging> - <version>1.1.0-SNAPSHOT</version> <name>Vex UI Tests</name> <parent> @@ -14,19 +13,4 @@ <relativePath>../org.eclipse.vex.releng/pom.xml</relativePath> </parent> - <build> - <plugins> - <plugin> - <groupId>org.sonatype.tycho</groupId> - <artifactId>maven-osgi-test-plugin</artifactId> - <version>${tycho-version}</version> - <configuration> - <useUIHarness>true</useUIHarness> - <testSuite>org.eclipse.vex.ui.tests</testSuite> - <testClass>org.eclipse.vex.ui.tests.VexUiTestSuite</testClass> - </configuration> - </plugin> - </plugins> - </build> - </project> diff --git a/org.eclipse.vex.ui/.classpath b/org.eclipse.vex.ui/.classpath index 472ee29b..a9558867 100644 --- a/org.eclipse.vex.ui/.classpath +++ b/org.eclipse.vex.ui/.classpath @@ -1,7 +1,7 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="src"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> - <classpathentry kind="output" path="bin"/> -</classpath> +<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src/"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/org.eclipse.vex.ui/.gitignore b/org.eclipse.vex.ui/.gitignore index fe07c278..193255b0 100644 --- a/org.eclipse.vex.ui/.gitignore +++ b/org.eclipse.vex.ui/.gitignore @@ -1,2 +1,2 @@ bin
-/target +target diff --git a/org.eclipse.vex.ui/.project b/org.eclipse.vex.ui/.project index bacac737..adce8986 100644 --- a/org.eclipse.vex.ui/.project +++ b/org.eclipse.vex.ui/.project @@ -20,8 +20,14 @@ <arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
diff --git a/org.eclipse.vex.ui/.settings/org.eclipse.core.resources.prefs b/org.eclipse.vex.ui/.settings/org.eclipse.core.resources.prefs index 25c8a241..3d916f29 100644 --- a/org.eclipse.vex.ui/.settings/org.eclipse.core.resources.prefs +++ b/org.eclipse.vex.ui/.settings/org.eclipse.core.resources.prefs @@ -1,3 +1,2 @@ -#Sun Nov 01 00:52:35 GMT 2009 -eclipse.preferences.version=1 -encoding/<project>=UTF-8 +eclipse.preferences.version=1
+encoding/<project>=Cp1252
diff --git a/org.eclipse.vex.ui/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.vex.ui/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 00000000..14b697b7 --- /dev/null +++ b/org.eclipse.vex.ui/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.vex.ui/build.properties b/org.eclipse.vex.ui/build.properties index ef23051c..1f3a122c 100644 --- a/org.eclipse.vex.ui/build.properties +++ b/org.eclipse.vex.ui/build.properties @@ -1,5 +1,4 @@ bin.includes = plugin.xml,\ - *.gif,\ .,\ plugin_fr.properties,\ plugin.properties,\ diff --git a/org.eclipse.vex.ui/pom.xml b/org.eclipse.vex.ui/pom.xml index fe93ebff..25bd70a7 100644 --- a/org.eclipse.vex.ui/pom.xml +++ b/org.eclipse.vex.ui/pom.xml @@ -4,7 +4,6 @@ <modelVersion>4.0.0</modelVersion> <artifactId>org.eclipse.vex.ui</artifactId> <packaging>eclipse-plugin</packaging> - <version>1.1.0-SNAPSHOT</version> <name>Vex UI</name> <parent> @@ -14,43 +13,4 @@ <relativePath>../org.eclipse.vex.releng/pom.xml</relativePath> </parent> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> - <version>2.3.2</version> - <configuration> - <findbugsXmlOutput>true</findbugsXmlOutput> - <failOnError>false</failOnError> - </configuration> - <executions> - <execution> - <goals> - <goal>check</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - <configuration> - <sourceEncoding>utf-8</sourceEncoding> - <minimumTokens>100</minimumTokens> - <targetJdk>1.5</targetJdk> - <format>xml</format> - <failOnViolation>false</failOnViolation> - </configuration> - <executions> - <execution> - <goals> - <goal>cpd-check</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </project> diff --git a/org.eclipse.vex.xhtml/.classpath b/org.eclipse.vex.xhtml/.classpath index 472ee29b..a9558867 100644 --- a/org.eclipse.vex.xhtml/.classpath +++ b/org.eclipse.vex.xhtml/.classpath @@ -1,7 +1,7 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="src"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> - <classpathentry kind="output" path="bin"/> -</classpath> +<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src/"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/org.eclipse.vex.xhtml/.gitignore b/org.eclipse.vex.xhtml/.gitignore index fe07c278..193255b0 100644 --- a/org.eclipse.vex.xhtml/.gitignore +++ b/org.eclipse.vex.xhtml/.gitignore @@ -1,2 +1,2 @@ bin
-/target +target diff --git a/org.eclipse.vex.xhtml/.project b/org.eclipse.vex.xhtml/.project index b579381c..d2aee3f4 100644 --- a/org.eclipse.vex.xhtml/.project +++ b/org.eclipse.vex.xhtml/.project @@ -20,8 +20,14 @@ <arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
diff --git a/org.eclipse.vex.xhtml/.settings/org.eclipse.core.resources.prefs b/org.eclipse.vex.xhtml/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 00000000..3d916f29 --- /dev/null +++ b/org.eclipse.vex.xhtml/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1
+encoding/<project>=Cp1252
diff --git a/org.eclipse.vex.xhtml/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.vex.xhtml/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 00000000..14b697b7 --- /dev/null +++ b/org.eclipse.vex.xhtml/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.vex.xhtml/pom.xml b/org.eclipse.vex.xhtml/pom.xml index 98341f0c..a3e8c1f6 100644 --- a/org.eclipse.vex.xhtml/pom.xml +++ b/org.eclipse.vex.xhtml/pom.xml @@ -4,7 +4,6 @@ <modelVersion>4.0.0</modelVersion> <artifactId>org.eclipse.vex.xhtml</artifactId> <packaging>eclipse-plugin</packaging> - <version>1.1.0-SNAPSHOT</version> <name>Vex XHTML Support</name> <parent> @@ -14,43 +13,4 @@ <relativePath>../org.eclipse.vex.releng/pom.xml</relativePath> </parent> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> - <version>2.3.2</version> - <configuration> - <findbugsXmlOutput>true</findbugsXmlOutput> - <failOnError>false</failOnError> - </configuration> - <executions> - <execution> - <goals> - <goal>check</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - <configuration> - <sourceEncoding>utf-8</sourceEncoding> - <minimumTokens>100</minimumTokens> - <targetJdk>1.5</targetJdk> - <format>xml</format> - <failOnViolation>false</failOnViolation> - </configuration> - <executions> - <execution> - <goals> - <goal>cpd-check</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </project> diff --git a/org.eclipse.vex/.classpath b/org.eclipse.vex/.classpath new file mode 100644 index 00000000..d51d2790 --- /dev/null +++ b/org.eclipse.vex/.classpath @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src_does_not_exist/"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/org.eclipse.vex/.gitignore b/org.eclipse.vex/.gitignore index ea8c4bf7..eb5a316c 100644 --- a/org.eclipse.vex/.gitignore +++ b/org.eclipse.vex/.gitignore @@ -1 +1 @@ -/target +target diff --git a/org.eclipse.vex/.project b/org.eclipse.vex/.project index bc7b1cea..07f2827f 100644 --- a/org.eclipse.vex/.project +++ b/org.eclipse.vex/.project @@ -6,6 +6,11 @@ </projects>
<buildSpec>
<buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
@@ -15,8 +20,15 @@ <arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
diff --git a/org.eclipse.vex/.settings/org.eclipse.core.resources.prefs b/org.eclipse.vex/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 00000000..3d916f29 --- /dev/null +++ b/org.eclipse.vex/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1
+encoding/<project>=Cp1252
diff --git a/org.eclipse.vex/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.vex/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 00000000..14b697b7 --- /dev/null +++ b/org.eclipse.vex/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.vex/pom.xml b/org.eclipse.vex/pom.xml index ec556a81..0789e265 100644 --- a/org.eclipse.vex/pom.xml +++ b/org.eclipse.vex/pom.xml @@ -4,7 +4,6 @@ <modelVersion>4.0.0</modelVersion> <artifactId>org.eclipse.vex</artifactId> <packaging>eclipse-plugin</packaging> - <version>1.1.0-SNAPSHOT</version> <name>Vex Branding</name> <parent> diff --git a/pom.xml b/pom.xml deleted file mode 100644 index 9de81492..00000000 --- a/pom.xml +++ /dev/null @@ -1,37 +0,0 @@ -<?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.eclipse.vex</groupId>
- <artifactId>org.eclipse.vex-parent</artifactId>
- <version>1.1.0-SNAPSHOT</version>
- <packaging>pom</packaging>
- <mailingLists>
- <mailingList>
- <name>Vex Mailing List</name>
- <post>mylyn-vex-dev@eclipse.org</post>
- <subscribe>https://dev.eclipse.org/mailman/listinfo/mylyn-vex-dev</subscribe>
- <unsubscribe>https://dev.eclipse.org/mailman/listinfo/mylyn-vex-dev</unsubscribe>
- <archive>http://dev.eclipse.org/mhonarc/lists/mylyn-vex-dev</archive>
- </mailingList>
- </mailingLists>
- <issueManagement>
- <url>https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced;classification=Mylyn;product=Mylyn%20Docs%20Vex</url>
- <system>Bugzilla</system>
- </issueManagement>
- <repositories>
- <repository>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <id>vex-milestones</id>
- <url>http://download.eclipse.org/vex/milestones</url>
- <layout>default</layout>
- </repository>
- <repository>
- <id>vex-releases</id>
- <url>http://download.eclipse.org/vex/releases</url>
- <layout>default</layout>
- </repository>
- </repositories>
-</project>
\ No newline at end of file |