[389864] Improve example installer builds; eliminate useless artifacts.
diff --git a/doc/org.eclipse.xsd.doc-feature/eclipse_update_120.jpg b/doc/org.eclipse.xsd.doc-feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/doc/org.eclipse.xsd.doc-feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/doc/org.eclipse.xsd.doc-feature/feature.xml b/doc/org.eclipse.xsd.doc-feature/feature.xml
index cc21317..2a5d608 100644
--- a/doc/org.eclipse.xsd.doc-feature/feature.xml
+++ b/doc/org.eclipse.xsd.doc-feature/feature.xml
@@ -4,7 +4,6 @@
label="%featureName"
version="2.8.0.qualifier"
provider-name="%providerName"
- image="eclipse_update_120.jpg"
license-feature="org.eclipse.xsd.license"
license-feature-version="2.7.0.qualifier">
diff --git a/examples/org.eclipse.xsd.example/.externalToolBuilders/copyExample.ant b/examples/org.eclipse.xsd.example/.externalToolBuilders/copyExample.ant
new file mode 100644
index 0000000..a686f2c
--- /dev/null
+++ b/examples/org.eclipse.xsd.example/.externalToolBuilders/copyExample.ant
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<project name="copyExample" default="main" basedir="../..">
+
+ <property name="installer" value="org.eclipse.xsd.example.installer" />
+ <import file="../../../plugins/${installer}/copyExampleLib.ant" optional="true" />
+ <basename file="${build.project}" property="project" />
+
+ <target name="main">
+ <copyExample project="${project}" />
+ </target>
+
+</project>
diff --git a/examples/org.eclipse.xsd.example/.externalToolBuilders/org.eclipse.xsd.example.launch b/examples/org.eclipse.xsd.example/.externalToolBuilders/org.eclipse.xsd.example.launch
new file mode 100644
index 0000000..050d2d6
--- /dev/null
+++ b/examples/org.eclipse.xsd.example/.externalToolBuilders/org.eclipse.xsd.example.launch
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
+<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
+<booleanAttribute key="org.eclipse.ant.uiSET_INPUTHANDLER" value="false"/>
+<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.xsd.example.installer/examples" type="2"/> </resources>}"/>
+<booleanAttribute key="org.eclipse.debug.core.capture_output" value="false"/>
+<booleanAttribute key="org.eclipse.debug.ui.ATTR_CONSOLE_OUTPUT_ON" value="false"/>
+<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
+<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value=""/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="true"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.xsd.example.installer/examples/org.eclipse.xsd.example/" type="2"/> <item path="/org.eclipse.xsd.example/.classpath" type="1"/> <item path="/org.eclipse.xsd.example/.externalToolBuilders" type="2"/> <item path="/org.eclipse.xsd.example/.gitignore" type="1"/> <item path="/org.eclipse.xsd.example/.project" type="1"/> <item path="/org.eclipse.xsd.example/.settings" type="2"/> <item path="/org.eclipse.xsd.example/about.html" type="1"/> <item path="/org.eclipse.xsd.example/about.ini" type="1"/> <item path="/org.eclipse.xsd.example/about.mappings" type="1"/> <item path="/org.eclipse.xsd.example/about.properties" type="1"/> <item path="/org.eclipse.xsd.example/build" type="2"/> <item path="/org.eclipse.xsd.example/build.properties" type="1"/> <item path="/org.eclipse.xsd.example/data" type="2"/> <item path="/org.eclipse.xsd.example/META-INF" type="2"/> <item path="/org.eclipse.xsd.example/modeling32.png" type="1"/> <item path="/org.eclipse.xsd.example/plugin.properties" type="1"/> <item path="/org.eclipse.xsd.example/plugin.xml" type="1"/> <item path="/org.eclipse.xsd.example/release.digest" type="1"/> <item path="/org.eclipse.xsd.example/release.properties" type="1"/> <item path="/org.eclipse.xsd.example/release.xml" type="1"/> <item path="/org.eclipse.xsd.example/src" type="2"/> </resources>}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${project_loc:/org.eclipse.xsd.example}/.externalToolBuilders/copyExample.ant"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="incremental,auto,"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-Dbuild.project=${project_loc:/org.eclipse.xsd.example}"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
+</launchConfiguration>
diff --git a/examples/org.eclipse.xsd.example/.project b/examples/org.eclipse.xsd.example/.project
index c86bed3..bacf369 100644
--- a/examples/org.eclipse.xsd.example/.project
+++ b/examples/org.eclipse.xsd.example/.project
@@ -41,6 +41,20 @@
</dictionary>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
+ <triggers>auto,full,incremental,</triggers>
+ <arguments>
+ <dictionary>
+ <key>LaunchConfigHandle</key>
+ <value><project>/.externalToolBuilders/org.eclipse.xsd.example.launch</value>
+ </dictionary>
+ <dictionary>
+ <key>incclean</key>
+ <value>true</value>
+ </dictionary>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
diff --git a/examples/org.eclipse.xsd.example/build/files_to_massage.lst b/examples/org.eclipse.xsd.example/build/files_to_massage.lst
deleted file mode 100644
index ab9047e..0000000
--- a/examples/org.eclipse.xsd.example/build/files_to_massage.lst
+++ /dev/null
@@ -1,8 +0,0 @@
-# This is a list of files in this plugin (relative to the plugin)
-# that contains names of plugins (e.g. org.eclipse.emf.ecore) which need
-# to be appended with version number (e.g. org.eclipse.emf.ecore_1.0.1)
-# during packaging.
-
-data/run-schema-for-schema-test.bat
-data/xsd-generate-schema-for-schema-html.bat
-data/xsd-standalone-example.bat
diff --git a/features/org.eclipse.xsd-feature/eclipse_update_120.jpg b/features/org.eclipse.xsd-feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.xsd-feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.xsd-feature/feature.xml b/features/org.eclipse.xsd-feature/feature.xml
index bdf986e..a12bb81 100644
--- a/features/org.eclipse.xsd-feature/feature.xml
+++ b/features/org.eclipse.xsd-feature/feature.xml
@@ -2,9 +2,8 @@
<feature
id="org.eclipse.xsd"
label="%featureName"
- version="2.8.0.qualifier"
+ version="2.9.0.qualifier"
provider-name="%providerName"
- image="eclipse_update_120.jpg"
license-feature="org.eclipse.xsd.license"
license-feature-version="2.7.0.qualifier">
diff --git a/features/org.eclipse.xsd.mapping.editor-feature/feature.xml b/features/org.eclipse.xsd.mapping.editor-feature/feature.xml
index ca6f050..1388d64 100644
--- a/features/org.eclipse.xsd.mapping.editor-feature/feature.xml
+++ b/features/org.eclipse.xsd.mapping.editor-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.xsd.mapping.editor"
label="%featureName"
- version="2.7.0.qualifier"
+ version="2.8.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.xsd.license"
license-feature-version="2.7.0.qualifier">
diff --git a/features/org.eclipse.xsd.sdk-feature/eclipse.png b/features/org.eclipse.xsd.sdk-feature/eclipse.png
deleted file mode 100755
index 7397524..0000000
--- a/features/org.eclipse.xsd.sdk-feature/eclipse.png
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.xsd.sdk-feature/eclipse32.gif b/features/org.eclipse.xsd.sdk-feature/eclipse32.gif
deleted file mode 100755
index 811eccb..0000000
--- a/features/org.eclipse.xsd.sdk-feature/eclipse32.gif
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.xsd.sdk-feature/eclipse32.png b/features/org.eclipse.xsd.sdk-feature/eclipse32.png
deleted file mode 100755
index 568fac1..0000000
--- a/features/org.eclipse.xsd.sdk-feature/eclipse32.png
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.xsd.sdk-feature/eclipse48.png b/features/org.eclipse.xsd.sdk-feature/eclipse48.png
deleted file mode 100755
index b60ab3c..0000000
--- a/features/org.eclipse.xsd.sdk-feature/eclipse48.png
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.xsd.sdk-feature/eclipse_update_120.jpg b/features/org.eclipse.xsd.sdk-feature/eclipse_update_120.jpg
deleted file mode 100755
index bfdf708..0000000
--- a/features/org.eclipse.xsd.sdk-feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.xsd.sdk-feature/feature.xml b/features/org.eclipse.xsd.sdk-feature/feature.xml
index e2eeb94..40f090c 100644
--- a/features/org.eclipse.xsd.sdk-feature/feature.xml
+++ b/features/org.eclipse.xsd.sdk-feature/feature.xml
@@ -4,7 +4,6 @@
label="%featureName"
version="2.9.0.qualifier"
provider-name="%providerName"
- image="eclipse_update_120.jpg"
license-feature="org.eclipse.xsd.license"
license-feature-version="2.7.0.qualifier">
diff --git a/features/org.eclipse.xsd.sdk-feature/sourceTemplateFeature/eclipse_update_120.jpg b/features/org.eclipse.xsd.sdk-feature/sourceTemplateFeature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.xsd.sdk-feature/sourceTemplateFeature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.xsd.sdk-feature/sourceTemplatePlugin/eclipse.png b/features/org.eclipse.xsd.sdk-feature/sourceTemplatePlugin/eclipse.png
deleted file mode 100644
index 7397524..0000000
--- a/features/org.eclipse.xsd.sdk-feature/sourceTemplatePlugin/eclipse.png
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.xsd.sdk-feature/sourceTemplatePlugin/eclipse32.gif b/features/org.eclipse.xsd.sdk-feature/sourceTemplatePlugin/eclipse32.gif
deleted file mode 100644
index 811eccb..0000000
--- a/features/org.eclipse.xsd.sdk-feature/sourceTemplatePlugin/eclipse32.gif
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.xsd.sdk-feature/sourceTemplatePlugin/eclipse32.png b/features/org.eclipse.xsd.sdk-feature/sourceTemplatePlugin/eclipse32.png
deleted file mode 100644
index 568fac1..0000000
--- a/features/org.eclipse.xsd.sdk-feature/sourceTemplatePlugin/eclipse32.png
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.xsd.sdk-feature/sourceTemplatePlugin/eclipse48.png b/features/org.eclipse.xsd.sdk-feature/sourceTemplatePlugin/eclipse48.png
deleted file mode 100644
index b60ab3c..0000000
--- a/features/org.eclipse.xsd.sdk-feature/sourceTemplatePlugin/eclipse48.png
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.xsd.sdk-feature/sourceTemplatePlugin/modeling32.png b/features/org.eclipse.xsd.sdk-feature/sourceTemplatePlugin/modeling32.png
deleted file mode 100644
index 6b08de2..0000000
--- a/features/org.eclipse.xsd.sdk-feature/sourceTemplatePlugin/modeling32.png
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.emf.mapping.xsd2ecore/build/files_to_massage.lst b/plugins/org.eclipse.emf.mapping.xsd2ecore/build/files_to_massage.lst
deleted file mode 100644
index 2e2d779..0000000
--- a/plugins/org.eclipse.emf.mapping.xsd2ecore/build/files_to_massage.lst
+++ /dev/null
@@ -1,8 +0,0 @@
-# This is a list of files in this plugin (relative to the plugin)
-# that contains names of plugins (e.g. org.eclipse.emf.mapping.xsd2ecore) which need
-# to be appended with version number (e.g. org.eclipse.emf.mapping.xsd2ecore_1.0.1)
-# during packaging.
-
-# .ecore and .genmodel no longer need to be massaged (as of Eclipse 3.1.0.M7 / EMF 2.1.0.I200505191347)
-
-model/XSD2Ecore.mdl
diff --git a/plugins/org.eclipse.xsd.example.installer/META-INF/MANIFEST.MF b/plugins/org.eclipse.xsd.example.installer/META-INF/MANIFEST.MF
index 42f380d..b4a149f 100644
--- a/plugins/org.eclipse.xsd.example.installer/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.xsd.example.installer/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.xsd.example.installer;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.2.0.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Require-Bundle: org.eclipse.emf.common.ui,
diff --git a/plugins/org.eclipse.xsd.example.installer/XSD Example Installer.launch b/plugins/org.eclipse.xsd.example.installer/XSD Example Installer.launch
new file mode 100644
index 0000000..c7cc926
--- /dev/null
+++ b/plugins/org.eclipse.xsd.example.installer/XSD Example Installer.launch
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
+<booleanAttribute key="org.eclipse.ant.uiSET_INPUTHANDLER" value="false"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.eclipse.xsd.example.installer/generateXSDExampleBuilders.ant"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
+<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry containerPath="org.eclipse.jdt.launching.JRE_CONTAINER" path="1" type="4"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry id="org.eclipse.ant.ui.classpathentry.antHome"> <memento default="true"/> </runtimeClasspathEntry> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry id="org.eclipse.ant.ui.classpathentry.extraClasspathEntries"> <memento/> </runtimeClasspathEntry> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/org.eclipse.emf.releng/bin" path="3" type="2"/> "/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
+<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.xsd.example.installer"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.xsd.example.installer/generateXSDExampleBuilders.ant}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-Dbuild.project=${project_loc:/org.eclipse.xsd.example.installer} -Dreleng.location=${project_loc:/org.eclipse.emf.releng}"/>
+<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
+</launchConfiguration>
diff --git a/plugins/org.eclipse.xsd.example.installer/buckminster.cspex b/plugins/org.eclipse.xsd.example.installer/buckminster.cspex
deleted file mode 100644
index 71f8891..0000000
--- a/plugins/org.eclipse.xsd.example.installer/buckminster.cspex
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<cs:cspecExtension xmlns:com="http://www.eclipse.org/buckminster/Common-1.0" xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0">
- <cs:dependencies>
- <!--
- each of the example projects must be listed twice in the dependency list:
- - once with a component type of "osgi.bunlde" - this copy of the example project is bound
- to the workspace and associated with a team provider - this is necessary for the project
- to be tagged when using the Buckminster tagging support to carry out the tagging operation
- - once with a component type of "unknown" - this copy is NOT bound to the workspace (making
- it unsuitable for tagging using the Buckminster tagging support, BUT) preventing it from
- being modified (this is in contrast to the formerly described copy) by any of the builders
- the project may define - which is what we want when inserting the example project's files
- into the installer bundle
- -->
- <cs:dependency name="org.eclipse.xsd.example" componentType="osgi.bundle" />
- <cs:dependency name="org.eclipse.xsd.example" componentType="unknown" />
- </cs:dependencies>
-
- <cs:actions>
- <cs:private name="install.example.projects" actor="ant">
- <cs:actorProperties>
- <cs:property key="buildFile" value="install.ant" />
- </cs:actorProperties>
- <cs:prerequisites alias="example.projects">
- <cs:attribute name="example.projects" />
- </cs:prerequisites>
- <cs:products alias="output" base="${buckminster.temp}">
- <cs:path path="examples/" />
- </cs:products>
- </cs:private>
- </cs:actions>
-
- <cs:groups>
- <cs:private name="example.projects">
- <cs:attribute component="org.eclipse.xsd.example" componentType="unknown" />
- </cs:private>
- </cs:groups>
-
- <cs:alterGroups>
- <cs:private name="jar.contents">
- <cs:attribute name="install.example.projects" />
- </cs:private>
- </cs:alterGroups>
-</cs:cspecExtension>
diff --git a/plugins/org.eclipse.xsd.example.installer/copyExampleLib.ant b/plugins/org.eclipse.xsd.example.installer/copyExampleLib.ant
new file mode 100644
index 0000000..16e743b
--- /dev/null
+++ b/plugins/org.eclipse.xsd.example.installer/copyExampleLib.ant
@@ -0,0 +1,68 @@
+<?xml version="1.0"?>
+<!--
+ Copyright (c) 2012 Eclispe contributors and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+-->
+<project name="copyExampleLib" basedir="..">
+
+ <property name="examples.path" value="../plugins/org.eclipse.xsd.example.installer/examples" />
+ <basename file="${build.project}" property="project" />
+
+ <macrodef name="copyExample">
+ <attribute name="project" />
+ <sequential>
+ <delete includeemptydirs="true" failonerror="false">
+ <fileset dir="${examples.path}/@{project}">
+ <include name="**" />
+ </fileset>
+ </delete>
+
+ <copy todir="${examples.path}/@{project}" overwrite="true">
+ <fileset dir="@{project}">
+ <exclude name=".externalToolBuilders/" />
+ <exclude name="database/" />
+ <exclude name="bin/" />
+ <exclude name=".settings/org.eclipse.mylyn*" />
+ <exclude name=".settings/org.eclipse.pde.api.tools.prefs" />
+ <exclude name="**/.gitignore" />
+ <exclude name="**/release.*" />
+ <include name="**" />
+ </fileset>
+ </copy>
+
+ <replaceregexp file="${examples.path}/@{project}/.project"
+ byline="false"
+ flags="sg"
+ match="\s*<buildCommand>\s+<name>org.eclipse.ui.externaltools.ExternalToolBuilder.*?</buildCommand>"
+ replace="" />
+
+ <replaceregexp file="${examples.path}/@{project}/.project"
+ byline="false"
+ flags="s"
+ match="\s*<buildCommand>\s+<name>org.eclipse.pde.api.tools.apiAnalysisBuilder.*?</buildCommand>"
+ replace="" />
+
+ <replaceregexp file="${examples.path}/@{project}/.project"
+ byline="false"
+ flags="s"
+ match="\s*<buildCommand>\s+<name>org.eclipse.emf.cdo.releng.version.VersionBuilder.*?</buildCommand>"
+ replace="" />
+
+ <replaceregexp file="${examples.path}/@{project}/.project"
+ byline="false"
+ flags="s"
+ match="\s*<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>"
+ replace="" />
+
+ <replaceregexp file="${examples.path}/@{project}/.project"
+ byline="false"
+ flags="s"
+ match="\s*<nature>org.eclipse.emf.cdo.releng.version.VersionNature</nature>"
+ replace="" />
+ </sequential>
+ </macrodef>
+
+</project>
diff --git a/plugins/org.eclipse.xsd.example.installer/customBuildCallbacks.xml b/plugins/org.eclipse.xsd.example.installer/customBuildCallbacks.xml
deleted file mode 100644
index 01b7020..0000000
--- a/plugins/org.eclipse.xsd.example.installer/customBuildCallbacks.xml
+++ /dev/null
@@ -1,172 +0,0 @@
-<!-- ===================================================================== -->
-<!-- Custom targets called from a project's generated build.xml -->
-<!-- Set customBuildCallbacks=<path/to/this/file> in your build.properties.-->
-<!-- ===================================================================== -->
-<project name="Build specific targets and properties" default="noDefault">
-
- <!-- ===================================================================== -->
- <!-- Default target -->
- <!-- ===================================================================== -->
- <target name="noDefault">
- <echo message="This file must be called with explicit targets" />
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do before the target build.jars -->
- <!-- Available parameters : -->
- <!-- build.result.folder - folder to contain the build results -->
- <!-- ===================================================================== -->
-
- <target name="pre.build.jars">
- <!-- ${build.result.folder} = /home/www-data/build/emf/downloads/drops/2.4.0/N200805051552/eclipse/plugins/org.eclipse.emf.example.installer -->
- <property file="${build.result.folder}/../../../build.cfg" />
- <condition property="exampleCVSTag" value="build_${buildTimestamp}" else="${branch}">
- <istrue value="${tagBuild}"/>
- </condition>
- <echo message="Checking out org.eclipse.mdt/org.eclipse.xsd/examples from ${exampleCVSTag} ..."/>
- <cvs failonerror="true" dest="${build.result.folder}/examples" cvsroot=":pserver:anonymous@dev.eclipse.org:/cvsroot/modeling">
- <commandline>
- <argument line="-Q export -r ${exampleCVSTag} org.eclipse.mdt/org.eclipse.xsd/examples" />
- </commandline>
- </cvs>
-
- <move todir="${build.result.folder}/examples/" includeemptydirs="true">
- <fileset dir="${build.result.folder}/examples/org.eclipse.mdt/org.eclipse.xsd/examples/">
- <exclude name="**/.cvsignore" />
- <exclude name="**/build/**" />
- </fileset>
- </move>
-
- <delete dir="${build.result.folder}/examples/org.eclipse.mdt" />
- </target>
-
-
- <!-- ===================================================================== -->
- <!-- Steps to do after the target build.jars -->
- <!-- Available parameters : -->
- <!-- build.result.folder - folder to contain the build results -->
- <!-- ===================================================================== -->
- <target name="post.build.jars">
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do before the target build.sources -->
- <!-- Available parameters : -->
- <!-- build.result.folder - folder to contain the build results -->
- <!-- ===================================================================== -->
- <target name="pre.build.sources">
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do after the target build.sources -->
- <!-- Available parameters : -->
- <!-- build.result.folder - folder to contain the build results -->
- <!-- ===================================================================== -->
- <target name="post.build.sources">
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do before the compilation target <name> -->
- <!-- Available parameters : -->
- <!-- source.foldern : n = 1 ... N, the source folders -->
- <!-- target.folder : where the results of the compilation go -->
- <!-- <name>.classpath : name = name of the compilation target. A -->
- <!-- reference to the classpath structure. -->
- <!-- ===================================================================== -->
- <target name="pre.@dot">
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do during the compilation target <name>, after the compile -->
- <!-- but before jaring -->
- <!-- Available parameters : -->
- <!-- source.foldern : n = 1 ... N, the source folders -->
- <!-- target.folder : where the results of the compilation go -->
- <!-- <name>.classpath : name = name of the compilation target. A -->
- <!-- reference to the classpath structure. -->
- <!-- ===================================================================== -->
- <target name="post.compile.@dot">
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do after the compilation target <name> -->
- <!-- Substitute "name" with the name of the compilation target, eg @dot -->
- <!-- Available parameters : -->
- <!-- jar.location - the location of the compilation results -->
- <!-- <name>.classpath : name = name of the compilation target. A -->
- <!-- reference to the classpath structure. -->
- <!-- ===================================================================== -->
- <target name="post.name">
- </target>
-
- <target name="post.@dot">
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do before the target gather.bin.parts -->
- <!-- Available parameters : -->
- <!-- build.result.folder - folder containing the build results -->
- <!-- target.folder - destination folder -->
- <!-- ===================================================================== -->
- <target name="pre.gather.bin.parts">
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do after the target gather.bin.parts -->
- <!-- Available parameters : -->
- <!-- build.result.folder - folder containing the build results -->
- <!-- target.folder - destination folder -->
- <!-- ===================================================================== -->
- <target name="post.gather.bin.parts">
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do before the target gather.sources -->
- <!-- Available parameters : -->
- <!-- destination.temp.folder - destination folder -->
- <!-- ===================================================================== -->
- <target name="pre.gather.sources">
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do after the target gather.sources -->
- <!-- Available parameters : -->
- <!-- destination.temp.folder - destination folder -->
- <!-- ===================================================================== -->
- <target name="post.gather.sources">
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do before the target gather.logs -->
- <!-- Available parameters : -->
- <!-- destination.temp.folder - destination folder -->
- <!-- ===================================================================== -->
- <target name="pre.gather.logs">
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do after the target gather.logs -->
- <!-- Available parameters : -->
- <!-- destination.temp.folder - destination folder -->
- <!-- ===================================================================== -->
- <target name="post.gather.logs">
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do before the target clean -->
- <!-- Available parameters : -->
- <!-- destination.temp.folder - destination folder -->
- <!-- ===================================================================== -->
- <target name="pre.clean">
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do after the target clean -->
- <!-- Available parameters : -->
- <!-- plugin.destination - final destination of the build -->
- <!-- build.result.folder - results of the compilation -->
- <!-- temp.folder - temporary folder -->
- <!-- ===================================================================== -->
- <target name="post.clean">
- </target>
-</project>
diff --git a/plugins/org.eclipse.xsd.example.installer/examples/.gitignore b/plugins/org.eclipse.xsd.example.installer/examples/.gitignore
index 1ea9060..8df44f9 100644
--- a/plugins/org.eclipse.xsd.example.installer/examples/.gitignore
+++ b/plugins/org.eclipse.xsd.example.installer/examples/.gitignore
@@ -1 +1 @@
-org.eclipse.*
+/org.eclipse.*
diff --git a/plugins/org.eclipse.xsd.example.installer/generateXSDExampleBuilders.ant b/plugins/org.eclipse.xsd.example.installer/generateXSDExampleBuilders.ant
new file mode 100644
index 0000000..56e8d32
--- /dev/null
+++ b/plugins/org.eclipse.xsd.example.installer/generateXSDExampleBuilders.ant
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<!--
+ Copyright (c) 2012 Eclipse contributors and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+-->
+<project name="generateExampleBuilders" default="main">
+
+ <target name="main">
+ <echo message="${releng.location}"></echo>
+ <java fork="false" classpath="${releng.location}/bin" classname="org.eclipse.emf.releng.GenerateExampleBuilders">
+ <arg value="${releng.location}" />
+ <arg value="${build.project}" />
+ </java>
+ </target>
+
+</project>
diff --git a/plugins/org.eclipse.xsd.example.installer/install.ant b/plugins/org.eclipse.xsd.example.installer/install.ant
deleted file mode 100644
index 8062078..0000000
--- a/plugins/org.eclipse.xsd.example.installer/install.ant
+++ /dev/null
@@ -1,21 +0,0 @@
-<project name="Install">
- <target name="install.example.projects">
- <!-- Call the "-install.single.example.project" target for each of the example projects. -->
- <subant genericantfile="${ant.file}" target="-install.single.example.project" inheritall="true">
- <buckminster.valuepath value="${fs:example.projects}" />
- </subant>
- </target>
-
- <target name="-install.single.example.project">
- <basename property="project.name" file="${basedir}" />
- <property name="target.directory" location="${sp:output}/${project.name}" />
-
- <mkdir dir="${target.directory}" />
-
- <copy todir="${target.directory}">
- <fileset dir="${basedir}">
- <exclude name="build/**" />
- </fileset>
- </copy>
- </target>
-</project>
diff --git a/plugins/org.eclipse.xsd.mapping.editor/META-INF/MANIFEST.MF b/plugins/org.eclipse.xsd.mapping.editor/META-INF/MANIFEST.MF
index 65710d4..4a51834 100644
--- a/plugins/org.eclipse.xsd.mapping.editor/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.xsd.mapping.editor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.xsd.mapping.editor;singleton:=true
-Bundle-Version: 2.6.0.qualifier
+Bundle-Version: 2.7.0.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.xsd/build/files_to_massage.lst b/plugins/org.eclipse.xsd/build/files_to_massage.lst
deleted file mode 100644
index 537eb7f..0000000
--- a/plugins/org.eclipse.xsd/build/files_to_massage.lst
+++ /dev/null
@@ -1,8 +0,0 @@
-# This is a list of files in this plugin (relative to the plugin)
-# that contains names of plugins (e.g. org.eclipse.emf.ecore) which need
-# to be appended with version number (e.g. org.eclipse.emf.ecore_1.0.1)
-# during packaging.
-
-# .ecore and .genmodel no longer need to be massaged (as of Eclipse 3.1.0.M7 / EMF 2.1.0.I200505191347)
-
-model/XSD.mdl
diff --git a/plugins/org.eclipse.xsd/eclipse.png b/plugins/org.eclipse.xsd/eclipse.png
deleted file mode 100644
index 7397524..0000000
--- a/plugins/org.eclipse.xsd/eclipse.png
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.xsd/eclipse32.gif b/plugins/org.eclipse.xsd/eclipse32.gif
deleted file mode 100644
index 811eccb..0000000
--- a/plugins/org.eclipse.xsd/eclipse32.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.xsd/eclipse32.png b/plugins/org.eclipse.xsd/eclipse32.png
deleted file mode 100644
index 568fac1..0000000
--- a/plugins/org.eclipse.xsd/eclipse32.png
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.xsd/eclipse48.png b/plugins/org.eclipse.xsd/eclipse48.png
deleted file mode 100644
index b60ab3c..0000000
--- a/plugins/org.eclipse.xsd/eclipse48.png
+++ /dev/null
Binary files differ
