diff options
Diffstat (limited to 'plugins')
117 files changed, 797 insertions, 156 deletions
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer.client/.classpath b/plugins/org.eclipse.emf.cdo.examples.client/.classpath index c83506765b..c83506765b 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer.client/.classpath +++ b/plugins/org.eclipse.emf.cdo.examples.client/.classpath diff --git a/plugins/org.eclipse.emf.cdo.examples.installer.client/.externalToolBuilders/copyExample.ant b/plugins/org.eclipse.emf.cdo.examples.client/.externalToolBuilders/copyExample.ant index 344747b637..344747b637 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer.client/.externalToolBuilders/copyExample.ant +++ b/plugins/org.eclipse.emf.cdo.examples.client/.externalToolBuilders/copyExample.ant diff --git a/plugins/org.eclipse.emf.cdo.examples.client/.externalToolBuilders/org.eclipse.emf.cdo.examples.client.launch b/plugins/org.eclipse.emf.cdo.examples.client/.externalToolBuilders/org.eclipse.emf.cdo.examples.client.launch new file mode 100644 index 0000000000..0bc8086f98 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.examples.client/.externalToolBuilders/org.eclipse.emf.cdo.examples.client.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.emf.cdo.examples.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.emf.cdo.examples.client" type="4"/> <item path="/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone" type="2"/> </resources>}"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${build_project}/.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=${build_project}"/> +<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/> +</launchConfiguration> diff --git a/plugins/org.eclipse.emf.cdo.examples.installer.client/.gitignore b/plugins/org.eclipse.emf.cdo.examples.client/.gitignore index c7601f9498..c7601f9498 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer.client/.gitignore +++ b/plugins/org.eclipse.emf.cdo.examples.client/.gitignore diff --git a/plugins/org.eclipse.emf.cdo.examples.installer.client/.project b/plugins/org.eclipse.emf.cdo.examples.client/.project index 10441c432c..f3755edfae 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer.client/.project +++ b/plugins/org.eclipse.emf.cdo.examples.client/.project @@ -30,7 +30,7 @@ <arguments> <dictionary> <key>LaunchConfigHandle</key> - <value><project>/.externalToolBuilders/org.eclipse.emf.cdo.examples..client.launch</value> + <value><project>/.externalToolBuilders/org.eclipse.emf.cdo.examples.client.launch</value> </dictionary> <dictionary> <key>incclean</key> diff --git a/plugins/org.eclipse.emf.cdo.examples.installer.client/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.emf.cdo.examples.client/.settings/org.eclipse.core.resources.prefs index b9743bf086..b9743bf086 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer.client/.settings/org.eclipse.core.resources.prefs +++ b/plugins/org.eclipse.emf.cdo.examples.client/.settings/org.eclipse.core.resources.prefs diff --git a/plugins/org.eclipse.emf.cdo.examples.installer.client/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.examples.client/.settings/org.eclipse.jdt.core.prefs index 264e6b3acf..264e6b3acf 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer.client/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.emf.cdo.examples.client/.settings/org.eclipse.jdt.core.prefs diff --git a/plugins/org.eclipse.emf.cdo.examples.installer.client/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.emf.cdo.examples.client/.settings/org.eclipse.jdt.ui.prefs index 4343e2f963..4343e2f963 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer.client/.settings/org.eclipse.jdt.ui.prefs +++ b/plugins/org.eclipse.emf.cdo.examples.client/.settings/org.eclipse.jdt.ui.prefs diff --git a/plugins/org.eclipse.emf.cdo.examples.installer.client/.settings/org.eclipse.ltk.core.refactoring.prefs b/plugins/org.eclipse.emf.cdo.examples.client/.settings/org.eclipse.ltk.core.refactoring.prefs index 864e30fe5d..864e30fe5d 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer.client/.settings/org.eclipse.ltk.core.refactoring.prefs +++ b/plugins/org.eclipse.emf.cdo.examples.client/.settings/org.eclipse.ltk.core.refactoring.prefs diff --git a/plugins/org.eclipse.emf.cdo.examples.installer.client/.settings/org.eclipse.mylyn.tasks.ui.prefs b/plugins/org.eclipse.emf.cdo.examples.client/.settings/org.eclipse.mylyn.tasks.ui.prefs index b050639a54..b050639a54 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer.client/.settings/org.eclipse.mylyn.tasks.ui.prefs +++ b/plugins/org.eclipse.emf.cdo.examples.client/.settings/org.eclipse.mylyn.tasks.ui.prefs diff --git a/plugins/org.eclipse.emf.cdo.examples.installer.client/.settings/org.eclipse.mylyn.team.ui.prefs b/plugins/org.eclipse.emf.cdo.examples.client/.settings/org.eclipse.mylyn.team.ui.prefs index 2f50f36c0c..2f50f36c0c 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer.client/.settings/org.eclipse.mylyn.team.ui.prefs +++ b/plugins/org.eclipse.emf.cdo.examples.client/.settings/org.eclipse.mylyn.team.ui.prefs diff --git a/plugins/org.eclipse.emf.cdo.examples.installer.client/.settings/org.eclipse.pde.api.tools.prefs b/plugins/org.eclipse.emf.cdo.examples.client/.settings/org.eclipse.pde.api.tools.prefs index f8d0a0660e..f8d0a0660e 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer.client/.settings/org.eclipse.pde.api.tools.prefs +++ b/plugins/org.eclipse.emf.cdo.examples.client/.settings/org.eclipse.pde.api.tools.prefs diff --git a/plugins/org.eclipse.emf.cdo.examples.installer.client/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.emf.cdo.examples.client/.settings/org.eclipse.pde.prefs index c6b96bb45e..c6b96bb45e 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer.client/.settings/org.eclipse.pde.prefs +++ b/plugins/org.eclipse.emf.cdo.examples.client/.settings/org.eclipse.pde.prefs diff --git a/plugins/org.eclipse.emf.cdo.examples.client/ExampleClient.launch b/plugins/org.eclipse.emf.cdo.examples.client/ExampleClient.launch new file mode 100644 index 0000000000..5a449e1018 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.examples.client/ExampleClient.launch @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench"> +<booleanAttribute key="append.args" value="true"/> +<stringAttribute key="application" value="org.eclipse.emf.cdo.server.app"/> +<booleanAttribute key="askclear" value="true"/> +<booleanAttribute key="automaticAdd" value="false"/> +<booleanAttribute key="automaticValidate" value="true"/> +<stringAttribute key="bootstrap" value=""/> +<stringAttribute key="checked" value="org.eclipse.emf.cdo.common,org.eclipse.emf.cdo.security,org.eclipse.emf.cdo.server,org.eclipse.emf.cdo.server.admin,org.eclipse.emf.cdo.server.db,org.eclipse.emf.cdo.server.net4j,org.eclipse.net4j,org.eclipse.net4j.db,org.eclipse.net4j.db.h2,org.eclipse.net4j.tcp,org.eclipse.net4j.util"/> +<booleanAttribute key="clearConfig" value="false"/> +<booleanAttribute key="clearws" value="false"/> +<booleanAttribute key="clearwslog" value="false"/> +<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/ExampleClient"/> +<booleanAttribute key="default" value="false"/> +<booleanAttribute key="includeOptional" value="false"/> +<stringAttribute key="location" value="${workspace_loc}/../runtime-ExampleClient"/> +<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> +<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -debug -console"/> +<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> +<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx1024m -Ddebug=true -Dosgi.console.enable.builtin=true"/> +<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${project_loc:/org.eclipse.emf.cdo.examples.client}"/> +<stringAttribute key="pde.version" value="3.3"/> +<stringAttribute key="product" value="org.eclipse.platform.ide"/> +<stringAttribute key="selected_target_plugins" value="com.ibm.icu@default:default,org.apache.lucene.analysis@default:default,org.apache.lucene.core@default:default,org.apache.lucene@default:default,org.eclipse.ant.core@default:default,org.eclipse.compare.core@default:default,org.eclipse.compare@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net.win32.x86_64@default:default,org.eclipse.core.net@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.win32.x86_64@default:default,org.eclipse.equinox.security@default:default,org.eclipse.help.base@default:default,org.eclipse.help@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.osgi@-1:true,org.eclipse.platform@default:default,org.eclipse.swt.win32.win32.x86_64@default:default,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.team.ui@default:default,org.eclipse.text@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.win32@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default"/> +<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.cdo.admin@default:default,org.eclipse.emf.cdo.common@default:default,org.eclipse.emf.cdo.edit@default:default,org.eclipse.emf.cdo.examples.client@default:default,org.eclipse.emf.cdo.examples.company.edit@default:default,org.eclipse.emf.cdo.examples.company@default:default,org.eclipse.emf.cdo.net4j@default:default,org.eclipse.emf.cdo.security.edit@default:default,org.eclipse.emf.cdo.security@default:default,org.eclipse.emf.cdo.team@default:default,org.eclipse.emf.cdo.transfer.ui@default:default,org.eclipse.emf.cdo.transfer@default:default,org.eclipse.emf.cdo.ui.admin@default:default,org.eclipse.emf.cdo.ui.ide@default:default,org.eclipse.emf.cdo.ui.shared@default:default,org.eclipse.emf.cdo.ui@default:default,org.eclipse.emf.cdo@default:default,org.eclipse.net4j.tcp@default:default,org.eclipse.net4j.ui.shared@default:default,org.eclipse.net4j.ui@default:default,org.eclipse.net4j.util.ui@default:default,org.eclipse.net4j.util@default:default,org.eclipse.net4j@default:default"/> +<booleanAttribute key="show_selected_only" value="true"/> +<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/> +<booleanAttribute key="tracing" value="true"/> +<booleanAttribute key="useCustomFeatures" value="false"/> +<booleanAttribute key="useDefaultConfig" value="true"/> +<booleanAttribute key="useDefaultConfigArea" value="true"/> +<booleanAttribute key="useProduct" value="true"/> +</launchConfiguration> diff --git a/plugins/org.eclipse.emf.cdo.examples.installer.client/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.client/META-INF/MANIFEST.MF index c1f9b640cf..c1f9b640cf 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer.client/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.examples.client/META-INF/MANIFEST.MF diff --git a/plugins/org.eclipse.emf.cdo.examples.installer.client/README.html b/plugins/org.eclipse.emf.cdo.examples.client/README.html index cc6a385dd8..cc6a385dd8 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer.client/README.html +++ b/plugins/org.eclipse.emf.cdo.examples.client/README.html diff --git a/plugins/org.eclipse.emf.cdo.examples.installer.client/about.html b/plugins/org.eclipse.emf.cdo.examples.client/about.html index f2decc3a0d..f2decc3a0d 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer.client/about.html +++ b/plugins/org.eclipse.emf.cdo.examples.client/about.html diff --git a/plugins/org.eclipse.emf.cdo.examples.installer.client/build.properties b/plugins/org.eclipse.emf.cdo.examples.client/build.properties index 92995ecde7..92995ecde7 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer.client/build.properties +++ b/plugins/org.eclipse.emf.cdo.examples.client/build.properties diff --git a/plugins/org.eclipse.emf.cdo.examples.installer.client/copyright.txt b/plugins/org.eclipse.emf.cdo.examples.client/copyright.txt index 0a0f67e6d7..0a0f67e6d7 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer.client/copyright.txt +++ b/plugins/org.eclipse.emf.cdo.examples.client/copyright.txt diff --git a/plugins/org.eclipse.emf.cdo.examples.installer.client/plugin.properties b/plugins/org.eclipse.emf.cdo.examples.client/plugin.properties index 251f126e45..251f126e45 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer.client/plugin.properties +++ b/plugins/org.eclipse.emf.cdo.examples.client/plugin.properties diff --git a/plugins/org.eclipse.emf.cdo.examples.installer.clone/.classpath b/plugins/org.eclipse.emf.cdo.examples.clone/.classpath index 64c5e31b7a..64c5e31b7a 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer.clone/.classpath +++ b/plugins/org.eclipse.emf.cdo.examples.clone/.classpath diff --git a/plugins/org.eclipse.emf.cdo.examples.installer.clone/.externalToolBuilders/copyExample.ant b/plugins/org.eclipse.emf.cdo.examples.clone/.externalToolBuilders/copyExample.ant index 48fab35278..48fab35278 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer.clone/.externalToolBuilders/copyExample.ant +++ b/plugins/org.eclipse.emf.cdo.examples.clone/.externalToolBuilders/copyExample.ant diff --git a/plugins/org.eclipse.emf.cdo.examples.installer.clone/.externalToolBuilders/org.eclipse.emf.cdo.examples.installer.clone.launch b/plugins/org.eclipse.emf.cdo.examples.clone/.externalToolBuilders/org.eclipse.emf.cdo.examples.clone.launch index 711da89354..9a794799ae 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer.clone/.externalToolBuilders/org.eclipse.emf.cdo.examples.installer.clone.launch +++ b/plugins/org.eclipse.emf.cdo.examples.clone/.externalToolBuilders/org.eclipse.emf.cdo.examples.clone.launch @@ -11,7 +11,7 @@ <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.emf.cdo.examples/src" type="2"/> <item path="/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.installer.clone" type="2"/> <item path="/org.eclipse.emf.cdo.examples.installer.clone" type="4"/> </resources>}"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.emf.cdo.examples/src" type="2"/> <item path="/org.eclipse.emf.cdo.examples.clone" type="4"/> <item path="/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone" type="2"/> </resources>}"/> <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${build_project}/.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=${build_project}"/> diff --git a/plugins/org.eclipse.emf.cdo.examples.installer.clone/.gitignore b/plugins/org.eclipse.emf.cdo.examples.clone/.gitignore index c7601f9498..c7601f9498 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer.clone/.gitignore +++ b/plugins/org.eclipse.emf.cdo.examples.clone/.gitignore diff --git a/plugins/org.eclipse.emf.cdo.examples.installer.clone/.project b/plugins/org.eclipse.emf.cdo.examples.clone/.project index ac1d140cb8..d3cba519fc 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer.clone/.project +++ b/plugins/org.eclipse.emf.cdo.examples.clone/.project @@ -30,7 +30,7 @@ <arguments> <dictionary> <key>LaunchConfigHandle</key> - <value><project>/.externalToolBuilders/org.eclipse.emf.cdo.examples.installer.clone.launch</value> + <value><project>/.externalToolBuilders/org.eclipse.emf.cdo.examples.clone.launch</value> </dictionary> <dictionary> <key>incclean</key> diff --git a/plugins/org.eclipse.emf.cdo.examples.installer.clone/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.emf.cdo.examples.clone/.settings/org.eclipse.core.resources.prefs index f06cc0ffca..f06cc0ffca 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer.clone/.settings/org.eclipse.core.resources.prefs +++ b/plugins/org.eclipse.emf.cdo.examples.clone/.settings/org.eclipse.core.resources.prefs diff --git a/plugins/org.eclipse.emf.cdo.examples.installer.clone/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.examples.clone/.settings/org.eclipse.jdt.core.prefs index e05bd49a20..e05bd49a20 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer.clone/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.emf.cdo.examples.clone/.settings/org.eclipse.jdt.core.prefs diff --git a/plugins/org.eclipse.emf.cdo.examples.installer.clone/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.emf.cdo.examples.clone/.settings/org.eclipse.jdt.ui.prefs index 4343e2f963..4343e2f963 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer.clone/.settings/org.eclipse.jdt.ui.prefs +++ b/plugins/org.eclipse.emf.cdo.examples.clone/.settings/org.eclipse.jdt.ui.prefs diff --git a/plugins/org.eclipse.emf.cdo.examples.installer.clone/.settings/org.eclipse.ltk.core.refactoring.prefs b/plugins/org.eclipse.emf.cdo.examples.clone/.settings/org.eclipse.ltk.core.refactoring.prefs index 864e30fe5d..864e30fe5d 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer.clone/.settings/org.eclipse.ltk.core.refactoring.prefs +++ b/plugins/org.eclipse.emf.cdo.examples.clone/.settings/org.eclipse.ltk.core.refactoring.prefs diff --git a/plugins/org.eclipse.emf.cdo.examples.installer.clone/.settings/org.eclipse.mylyn.tasks.ui.prefs b/plugins/org.eclipse.emf.cdo.examples.clone/.settings/org.eclipse.mylyn.tasks.ui.prefs index b050639a54..b050639a54 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer.clone/.settings/org.eclipse.mylyn.tasks.ui.prefs +++ b/plugins/org.eclipse.emf.cdo.examples.clone/.settings/org.eclipse.mylyn.tasks.ui.prefs diff --git a/plugins/org.eclipse.emf.cdo.examples.installer.clone/.settings/org.eclipse.mylyn.team.ui.prefs b/plugins/org.eclipse.emf.cdo.examples.clone/.settings/org.eclipse.mylyn.team.ui.prefs index 2f50f36c0c..2f50f36c0c 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer.clone/.settings/org.eclipse.mylyn.team.ui.prefs +++ b/plugins/org.eclipse.emf.cdo.examples.clone/.settings/org.eclipse.mylyn.team.ui.prefs diff --git a/plugins/org.eclipse.emf.cdo.examples.installer.clone/.settings/org.eclipse.pde.api.tools.prefs b/plugins/org.eclipse.emf.cdo.examples.clone/.settings/org.eclipse.pde.api.tools.prefs index f8d0a0660e..f8d0a0660e 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer.clone/.settings/org.eclipse.pde.api.tools.prefs +++ b/plugins/org.eclipse.emf.cdo.examples.clone/.settings/org.eclipse.pde.api.tools.prefs diff --git a/plugins/org.eclipse.emf.cdo.examples.installer.clone/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.emf.cdo.examples.clone/.settings/org.eclipse.pde.prefs index c6b96bb45e..c6b96bb45e 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer.clone/.settings/org.eclipse.pde.prefs +++ b/plugins/org.eclipse.emf.cdo.examples.clone/.settings/org.eclipse.pde.prefs diff --git a/plugins/org.eclipse.emf.cdo.examples.installer.clone/ExampleCloneServer.launch b/plugins/org.eclipse.emf.cdo.examples.clone/ExampleCloneServer.launch index d6d6098955..d6d6098955 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer.clone/ExampleCloneServer.launch +++ b/plugins/org.eclipse.emf.cdo.examples.clone/ExampleCloneServer.launch diff --git a/plugins/org.eclipse.emf.cdo.examples.installer.clone/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.clone/META-INF/MANIFEST.MF index fd871f5daf..fd871f5daf 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer.clone/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.examples.clone/META-INF/MANIFEST.MF diff --git a/plugins/org.eclipse.emf.cdo.examples.installer.clone/README.html b/plugins/org.eclipse.emf.cdo.examples.clone/README.html index 893d33c4d7..893d33c4d7 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer.clone/README.html +++ b/plugins/org.eclipse.emf.cdo.examples.clone/README.html diff --git a/plugins/org.eclipse.emf.cdo.examples.installer.clone/about.html b/plugins/org.eclipse.emf.cdo.examples.clone/about.html index f2decc3a0d..f2decc3a0d 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer.clone/about.html +++ b/plugins/org.eclipse.emf.cdo.examples.clone/about.html diff --git a/plugins/org.eclipse.emf.cdo.examples.installer.clone/build.properties b/plugins/org.eclipse.emf.cdo.examples.clone/build.properties index 62c9fab0f3..62c9fab0f3 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer.clone/build.properties +++ b/plugins/org.eclipse.emf.cdo.examples.clone/build.properties diff --git a/plugins/org.eclipse.emf.cdo.examples.installer.clone/copyright.txt b/plugins/org.eclipse.emf.cdo.examples.clone/copyright.txt index 0a0f67e6d7..0a0f67e6d7 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer.clone/copyright.txt +++ b/plugins/org.eclipse.emf.cdo.examples.clone/copyright.txt diff --git a/plugins/org.eclipse.emf.cdo.examples.installer.clone/plugin.properties b/plugins/org.eclipse.emf.cdo.examples.clone/plugin.properties index 56642ad11f..56642ad11f 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer.clone/plugin.properties +++ b/plugins/org.eclipse.emf.cdo.examples.clone/plugin.properties diff --git a/plugins/org.eclipse.emf.cdo.examples.installer.clone/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java b/plugins/org.eclipse.emf.cdo.examples.clone/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java index 7e7e314f1e..7e7e314f1e 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer.clone/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java +++ b/plugins/org.eclipse.emf.cdo.examples.clone/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java diff --git a/plugins/org.eclipse.emf.cdo.examples.installer.clone/src/org/eclipse/emf/cdo/examples/server/offline/OfflineExampleClone.java b/plugins/org.eclipse.emf.cdo.examples.clone/src/org/eclipse/emf/cdo/examples/server/offline/OfflineExampleClone.java index b5a58fb95a..b5a58fb95a 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer.clone/src/org/eclipse/emf/cdo/examples/server/offline/OfflineExampleClone.java +++ b/plugins/org.eclipse.emf.cdo.examples.clone/src/org/eclipse/emf/cdo/examples/server/offline/OfflineExampleClone.java diff --git a/plugins/org.eclipse.emf.cdo.examples.installer.clone/src/org/eclipse/emf/cdo/examples/server/offline/OfflineExampleUtil.java b/plugins/org.eclipse.emf.cdo.examples.clone/src/org/eclipse/emf/cdo/examples/server/offline/OfflineExampleUtil.java index 4405d542c8..4405d542c8 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer.clone/src/org/eclipse/emf/cdo/examples/server/offline/OfflineExampleUtil.java +++ b/plugins/org.eclipse.emf.cdo.examples.clone/src/org/eclipse/emf/cdo/examples/server/offline/OfflineExampleUtil.java diff --git a/plugins/org.eclipse.emf.cdo.examples.company.edit/.externalToolBuilders/copyExample.ant b/plugins/org.eclipse.emf.cdo.examples.company.edit/.externalToolBuilders/copyExample.ant new file mode 100644 index 0000000000..344747b637 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.examples.company.edit/.externalToolBuilders/copyExample.ant @@ -0,0 +1,22 @@ +<?xml version="1.0"?> +<!-- + Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) 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 + + Contributors: + Eike Stepper - initial API and implementation +--> +<project name="copyExample" default="main" basedir="../.."> + + <property name="installer" value="org.eclipse.emf.cdo.examples.installer" /> + <import file="../../${installer}/copyExampleLib.ant" optional="true" /> + <basename file="${build.project}" property="project" /> + + <target name="main"> + <copyExample project="${project}" /> + </target> + +</project> diff --git a/plugins/org.eclipse.emf.cdo.examples.company.edit/.externalToolBuilders/org.eclipse.emf.cdo.examples.company.edit.launch b/plugins/org.eclipse.emf.cdo.examples.company.edit/.externalToolBuilders/org.eclipse.emf.cdo.examples.company.edit.launch new file mode 100644 index 0000000000..a09bf3361f --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.examples.company.edit/.externalToolBuilders/org.eclipse.emf.cdo.examples.company.edit.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.emf.cdo.examples.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.emf.cdo.examples.company.edit" type="4"/> <item path="/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company.edit" type="2"/> </resources>}"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${build_project}/.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=${build_project}"/> +<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/> +</launchConfiguration> diff --git a/plugins/org.eclipse.emf.cdo.examples.company.edit/.project b/plugins/org.eclipse.emf.cdo.examples.company.edit/.project index 3a94db5578..bf5851f617 100644 --- a/plugins/org.eclipse.emf.cdo.examples.company.edit/.project +++ b/plugins/org.eclipse.emf.cdo.examples.company.edit/.project @@ -24,6 +24,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.emf.cdo.examples.company.edit.launch</value> + </dictionary> + <dictionary> + <key>incclean</key> + <value>true</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> diff --git a/plugins/org.eclipse.emf.cdo.examples.company.edit/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.emf.cdo.examples.company.edit/.settings/org.eclipse.core.resources.prefs index c2d4a6afbe..f06cc0ffca 100644 --- a/plugins/org.eclipse.emf.cdo.examples.company.edit/.settings/org.eclipse.core.resources.prefs +++ b/plugins/org.eclipse.emf.cdo.examples.company.edit/.settings/org.eclipse.core.resources.prefs @@ -1,3 +1,3 @@ -#Mon Jul 04 12:55:49 CEST 2011 eclipse.preferences.version=1 +encoding/.project=UTF-8 encoding//model/org.eclipse.emf.cdo.defs.ecorediag=UTF-8 diff --git a/plugins/org.eclipse.emf.cdo.examples.company/.externalToolBuilders/copyExample.ant b/plugins/org.eclipse.emf.cdo.examples.company/.externalToolBuilders/copyExample.ant new file mode 100644 index 0000000000..344747b637 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.examples.company/.externalToolBuilders/copyExample.ant @@ -0,0 +1,22 @@ +<?xml version="1.0"?> +<!-- + Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) 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 + + Contributors: + Eike Stepper - initial API and implementation +--> +<project name="copyExample" default="main" basedir="../.."> + + <property name="installer" value="org.eclipse.emf.cdo.examples.installer" /> + <import file="../../${installer}/copyExampleLib.ant" optional="true" /> + <basename file="${build.project}" property="project" /> + + <target name="main"> + <copyExample project="${project}" /> + </target> + +</project> diff --git a/plugins/org.eclipse.emf.cdo.examples.company/.externalToolBuilders/org.eclipse.emf.cdo.examples.company.launch b/plugins/org.eclipse.emf.cdo.examples.company/.externalToolBuilders/org.eclipse.emf.cdo.examples.company.launch new file mode 100644 index 0000000000..f1503c2d14 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.examples.company/.externalToolBuilders/org.eclipse.emf.cdo.examples.company.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.emf.cdo.examples.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.emf.cdo.examples.company" type="4"/> <item path="/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.company" type="2"/> </resources>}"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${build_project}/.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=${build_project}"/> +<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/> +</launchConfiguration> diff --git a/plugins/org.eclipse.emf.cdo.examples.company/.project b/plugins/org.eclipse.emf.cdo.examples.company/.project index fd9034a694..8df06fb25b 100644 --- a/plugins/org.eclipse.emf.cdo.examples.company/.project +++ b/plugins/org.eclipse.emf.cdo.examples.company/.project @@ -24,6 +24,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.emf.cdo.examples.company.launch</value> + </dictionary> + <dictionary> + <key>incclean</key> + <value>true</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> diff --git a/plugins/org.eclipse.emf.cdo.examples.company/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.emf.cdo.examples.company/.settings/org.eclipse.core.resources.prefs index 461c07441a..70df05bef2 100644 --- a/plugins/org.eclipse.emf.cdo.examples.company/.settings/org.eclipse.core.resources.prefs +++ b/plugins/org.eclipse.emf.cdo.examples.company/.settings/org.eclipse.core.resources.prefs @@ -1,3 +1,4 @@ eclipse.preferences.version=1 +encoding/.project=UTF-8 encoding//model/company.genmodel=UTF-8 encoding//model/org.eclipse.emf.cdo.defs.ecorediag=UTF-8 diff --git a/plugins/org.eclipse.emf.cdo.examples.installer.client/ExampleClient.launch b/plugins/org.eclipse.emf.cdo.examples.installer.client/ExampleClient.launch deleted file mode 100644 index ad539472fe..0000000000 --- a/plugins/org.eclipse.emf.cdo.examples.installer.client/ExampleClient.launch +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench"> -<booleanAttribute key="append.args" value="true"/> -<stringAttribute key="application" value="org.eclipse.emf.cdo.server.app"/> -<booleanAttribute key="askclear" value="true"/> -<booleanAttribute key="automaticAdd" value="false"/> -<booleanAttribute key="automaticValidate" value="true"/> -<stringAttribute key="bootstrap" value=""/> -<stringAttribute key="checked" value="org.eclipse.emf.cdo.common,org.eclipse.emf.cdo.security,org.eclipse.emf.cdo.server,org.eclipse.emf.cdo.server.admin,org.eclipse.emf.cdo.server.db,org.eclipse.emf.cdo.server.net4j,org.eclipse.net4j,org.eclipse.net4j.db,org.eclipse.net4j.db.h2,org.eclipse.net4j.tcp,org.eclipse.net4j.util"/> -<booleanAttribute key="clearConfig" value="false"/> -<booleanAttribute key="clearws" value="false"/> -<booleanAttribute key="clearwslog" value="false"/> -<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/ExampleClient"/> -<booleanAttribute key="default" value="false"/> -<booleanAttribute key="includeOptional" value="false"/> -<stringAttribute key="location" value="${workspace_loc}/../runtime-ExampleClient"/> -<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> -<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -debug -console"/> -<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> -<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx1024m -Ddebug=true -Dosgi.console.enable.builtin=true"/> -<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${project_loc:/cdo.examples.client}"/> -<stringAttribute key="pde.version" value="3.3"/> -<stringAttribute key="product" value="org.eclipse.platform.ide"/> -<stringAttribute key="selected_target_plugins" value="com.ibm.icu@default:default,org.eclipse.compare.core@default:default,org.eclipse.compare@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net.win32.x86_64@default:false,org.eclipse.core.net@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.win32.x86_64@default:false,org.eclipse.equinox.security@default:default,org.eclipse.help@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.osgi@-1:true,org.eclipse.platform@default:default,org.eclipse.swt.win32.win32.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.team.ui@default:default,org.eclipse.text@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.win32@default:false,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default"/> -<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.cdo.admin@default:default,org.eclipse.emf.cdo.common@default:default,org.eclipse.emf.cdo.edit@default:default,org.eclipse.emf.cdo.examples.company.edit@default:default,org.eclipse.emf.cdo.examples.company@default:default,org.eclipse.emf.cdo.examples.installer.client@default:default,org.eclipse.emf.cdo.net4j@default:default,org.eclipse.emf.cdo.security.edit@default:default,org.eclipse.emf.cdo.security@default:default,org.eclipse.emf.cdo.team@default:default,org.eclipse.emf.cdo.ui.admin@default:default,org.eclipse.emf.cdo.ui.ide@default:default,org.eclipse.emf.cdo.ui.shared@default:default,org.eclipse.emf.cdo.ui@default:default,org.eclipse.emf.cdo@default:default,org.eclipse.net4j.tcp@default:default,org.eclipse.net4j.ui.shared@default:default,org.eclipse.net4j.ui@default:default,org.eclipse.net4j.util.ui@default:default,org.eclipse.net4j.util@default:default,org.eclipse.net4j@default:default"/> -<booleanAttribute key="show_selected_only" value="false"/> -<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/> -<booleanAttribute key="tracing" value="true"/> -<booleanAttribute key="useCustomFeatures" value="false"/> -<booleanAttribute key="useDefaultConfig" value="true"/> -<booleanAttribute key="useDefaultConfigArea" value="true"/> -<booleanAttribute key="useProduct" value="true"/> -</launchConfiguration> diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/plugin.xml b/plugins/org.eclipse.emf.cdo.examples.installer/plugin.xml index 5901a91215..2cd130bf84 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer/plugin.xml +++ b/plugins/org.eclipse.emf.cdo.examples.installer/plugin.xml @@ -76,38 +76,38 @@ id="org.eclipse.emf.cdo.examples.ExampleMasterServer" wizardID="org.eclipse.emf.cdo.examples.ExampleMasterWizard" pageImage="icons/full/wizban/NewEMFExample.gif"> - <fileToOpen editorID="org.eclipse.ui.browser.editor" location="cdo.example.master/README.html"/> + <fileToOpen editorID="org.eclipse.ui.browser.editor" location="org.eclipse.emf.cdo.examples.master/README.html"/> <projectDescriptor - name="cdo.example.master" - contentURI="examples/master/" + name="org.eclipse.emf.cdo.examples.master" + contentURI="examples/org.eclipse.emf.cdo.examples.master/" description="%ExampleMasterProject_desc"/> </example> <example id="org.eclipse.emf.cdo.examples.ExampleCloneServer" wizardID="org.eclipse.emf.cdo.examples.ExampleCloneWizard" pageImage="icons/full/wizban/NewEMFExample.gif"> - <fileToOpen editorID="org.eclipse.ui.browser.editor" location="cdo.example.clone/README.html"/> + <fileToOpen editorID="org.eclipse.ui.browser.editor" location="org.eclipse.emf.cdo.examples.clone/README.html"/> <projectDescriptor - name="cdo.example.clone" - contentURI="examples/clone/" + name="org.eclipse.emf.cdo.examples.clone" + contentURI="examples/org.eclipse.emf.cdo.examples.clone/" description="%ExampleCloneProject_desc"/> </example> <example id="org.eclipse.emf.cdo.examples.ExampleClient" wizardID="org.eclipse.emf.cdo.examples.ExampleClientWizard" pageImage="icons/full/wizban/NewEMFExample.gif"> - <fileToOpen editorID="org.eclipse.ui.browser.editor" location="cdo.example.client/README.html"/> + <fileToOpen editorID="org.eclipse.ui.browser.editor" location="org.eclipse.emf.cdo.examples.client/README.html"/> <projectDescriptor - name="cdo.example.client" - contentURI="examples/client/" + name="org.eclipse.emf.cdo.examples.client" + contentURI="examples/org.eclipse.emf.cdo.examples.client/" description="%ExampleClientProject_desc"/> <projectDescriptor name="org.eclipse.emf.cdo.examples.company" - contentURI="examples/model/" + contentURI="examples/org.eclipse.emf.cdo.examples.company/" description="%ExampleModelProject_desc"/> <projectDescriptor name="org.eclipse.emf.cdo.examples.company.edit" - contentURI="examples/model.edit/" + contentURI="examples/org.eclipse.emf.cdo.examples.company.edit/" description="%ExampleEditProject_desc"/> </example> <example @@ -116,11 +116,11 @@ pageImage="icons/full/wizban/NewEMFExample.gif"> <projectDescriptor name="org.eclipse.emf.cdo.examples.company" - contentURI="examples/model/" + contentURI="examples/org.eclipse.emf.cdo.examples.company/" description="%ExampleModelProject_desc"/> <projectDescriptor name="org.eclipse.emf.cdo.examples.company.edit" - contentURI="examples/model.edit/" + contentURI="examples/org.eclipse.emf.cdo.examples.company.edit/" description="%ExampleEditProject_desc"/> </example> <example @@ -130,43 +130,43 @@ <fileToOpen editorID="org.eclipse.ui.browser.editor" location="org.gastro.server/README.html"/> <projectDescriptor name="org.gastro.inventory" - contentURI="examples/gastro.inventory/" + contentURI="examples/org.gastro.inventory/" description="%ExampleProject_gastro.inventory_desc"/> <projectDescriptor name="org.gastro.inventory.edit" - contentURI="examples/gastro.inventory.edit/" + contentURI="examples/org.gastro.inventory.edit/" description="%ExampleProject_gastro.inventory.edit_desc"/> <projectDescriptor name="org.gastro.business" - contentURI="examples/gastro.business/" + contentURI="examples/org.gastro.business/" description="%ExampleProject_gastro.business_desc"/> <projectDescriptor name="org.gastro.business.edit" - contentURI="examples/gastro.business.edit/" + contentURI="examples/org.gastro.business.edit/" description="%ExampleProject_gastro.business.edit_desc"/> <projectDescriptor name="org.gastro.rcp" - contentURI="examples/gastro.rcp/" + contentURI="examples/org.gastro.rcp/" description="%ExampleProject_gastro.rcp_desc"/> <projectDescriptor name="org.gastro.rcp.department" - contentURI="examples/gastro.rcp.department/" + contentURI="examples/org.gastro.rcp.department/" description="%ExampleProject_gastro.rcp.department_desc"/> <projectDescriptor name="org.gastro.rcp.table" - contentURI="examples/gastro.rcp.table/" + contentURI="examples/org.gastro.rcp.table/" description="%ExampleProject_gastro.rcp.table_desc"/> <projectDescriptor name="org.gastro.server" - contentURI="examples/gastro.server/" + contentURI="examples/org.gastro.server/" description="%ExampleProject_gastro.server_desc"/> <projectDescriptor name="org.gastro.server.web" - contentURI="examples/gastro.server.web/" + contentURI="examples/org.gastro.server.web/" description="%ExampleProject_gastro.server.web_desc"/> <projectDescriptor name="org.gastro.testclient" - contentURI="examples/gastro.testclient/" + contentURI="examples/org.gastro.testclient/" description="%ExampleProject_gastro.testclient_desc"/> </example> </extension> diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/update.ant b/plugins/org.eclipse.emf.cdo.examples.installer/update.ant deleted file mode 100644 index 5c5000a980..0000000000 --- a/plugins/org.eclipse.emf.cdo.examples.installer/update.ant +++ /dev/null @@ -1,55 +0,0 @@ -<?xml version="1.0"?> -<!-- - Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) 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 - - Contributors: - Eike Stepper - initial API and implementation ---> -<project name="UpdateExamplesInstaller" basedir=".."> - - <!-- - <import file="../org.eclipse.emf.cdo.examples.installer/updateLib.ant" /> - - <target name="main"> - <ant antfile="org.eclipse.emf.cdo.examples.installer.master/update.ant" /> - <ant antfile="org.eclipse.emf.cdo.examples.installer.clone/update.ant" /> - - <update-example example="org.eclipse.emf.cdo.examples.installer.master" target="master" /> - <update-launch example="org.eclipse.emf.cdo.examples.installer.master" - target="master" - launch="ExampleMasterServer" - project="cdo.example.master" /> - - <update-example example="org.eclipse.emf.cdo.examples.installer.clone" target="clone" /> - <update-launch example="org.eclipse.emf.cdo.examples.installer.clone" - target="clone" - launch="ExampleCloneServer" - project="cdo.example.clone" /> - - <update-example example="org.eclipse.emf.cdo.examples.installer.client" target="client" /> - <update-launch example="org.eclipse.emf.cdo.examples.installer.client" - target="client" - launch="ExampleClient" - project="cdo.example.client" /> - - <update-example example="org.eclipse.emf.cdo.examples.company" target="model" /> - <update-example example="org.eclipse.emf.cdo.examples.company.edit" target="model.edit" /> - - <update-example example="org.gastro.business" target="gastro.business" /> - <update-example example="org.gastro.business.edit" target="gastro.business.edit" /> - <update-example example="org.gastro.inventory" target="gastro.inventory" /> - <update-example example="org.gastro.inventory.edit" target="gastro.inventory.edit" /> - <update-example example="org.gastro.rcp" target="gastro.rcp" /> - <update-example example="org.gastro.rcp.department" target="gastro.rcp.department" /> - <update-example example="org.gastro.rcp.table" target="gastro.rcp.table" /> - <update-example example="org.gastro.server" target="gastro.server" /> - <update-example example="org.gastro.server.web" target="gastro.server.web" /> - <update-example example="org.gastro.testclient" target="gastro.testclient" /> - </target> - --> - -</project> diff --git a/plugins/org.eclipse.emf.cdo.examples.installer.master/.classpath b/plugins/org.eclipse.emf.cdo.examples.master/.classpath index c83506765b..c83506765b 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer.master/.classpath +++ b/plugins/org.eclipse.emf.cdo.examples.master/.classpath diff --git a/plugins/org.eclipse.emf.cdo.examples.installer.master/.externalToolBuilders/copyExample.ant b/plugins/org.eclipse.emf.cdo.examples.master/.externalToolBuilders/copyExample.ant index e8db8a68d4..e8db8a68d4 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer.master/.externalToolBuilders/copyExample.ant +++ b/plugins/org.eclipse.emf.cdo.examples.master/.externalToolBuilders/copyExample.ant diff --git a/plugins/org.eclipse.emf.cdo.examples.installer.master/.externalToolBuilders/org.eclipse.emf.cdo.examples.installer.master.launch b/plugins/org.eclipse.emf.cdo.examples.master/.externalToolBuilders/org.eclipse.emf.cdo.examples.master.launch index 9ef57d5fd3..3d0d4a037b 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer.master/.externalToolBuilders/org.eclipse.emf.cdo.examples.installer.master.launch +++ b/plugins/org.eclipse.emf.cdo.examples.master/.externalToolBuilders/org.eclipse.emf.cdo.examples.master.launch @@ -11,7 +11,7 @@ <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.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.installer.master" type="2"/> <item path="/org.eclipse.emf.cdo.examples.installer.master" type="4"/> <item path="/org.eclipse.emf.cdo.server.product/config/cdo-server.xml" type="1"/> </resources>}"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.master" type="2"/> <item path="/org.eclipse.emf.cdo.examples.master" type="4"/> <item path="/org.eclipse.emf.cdo.server.product/config/cdo-server.xml" type="1"/> </resources>}"/> <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${build_project}/.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=${build_project}"/> diff --git a/plugins/org.eclipse.emf.cdo.examples.installer.master/.gitignore b/plugins/org.eclipse.emf.cdo.examples.master/.gitignore index c7601f9498..c7601f9498 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer.master/.gitignore +++ b/plugins/org.eclipse.emf.cdo.examples.master/.gitignore diff --git a/plugins/org.eclipse.emf.cdo.examples.installer.master/.project b/plugins/org.eclipse.emf.cdo.examples.master/.project index 9181dd1e46..8a472fcec1 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer.master/.project +++ b/plugins/org.eclipse.emf.cdo.examples.master/.project @@ -26,11 +26,10 @@ </buildCommand> <buildCommand> <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name> - <triggers>auto,full,incremental,</triggers> <arguments> <dictionary> <key>LaunchConfigHandle</key> - <value><project>/.externalToolBuilders/org.eclipse.emf.cdo.examples.installer.master.launch</value> + <value><project>/.externalToolBuilders/org.eclipse.emf.cdo.examples.master.launch</value> </dictionary> <dictionary> <key>incclean</key> diff --git a/plugins/org.eclipse.emf.cdo.examples.installer.master/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.emf.cdo.examples.master/.settings/org.eclipse.core.resources.prefs index f06cc0ffca..f06cc0ffca 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer.master/.settings/org.eclipse.core.resources.prefs +++ b/plugins/org.eclipse.emf.cdo.examples.master/.settings/org.eclipse.core.resources.prefs diff --git a/plugins/org.eclipse.emf.cdo.examples.installer.master/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.examples.master/.settings/org.eclipse.jdt.core.prefs index 264e6b3acf..264e6b3acf 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer.master/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.emf.cdo.examples.master/.settings/org.eclipse.jdt.core.prefs diff --git a/plugins/org.eclipse.emf.cdo.examples.installer.master/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.emf.cdo.examples.master/.settings/org.eclipse.jdt.ui.prefs index 4343e2f963..4343e2f963 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer.master/.settings/org.eclipse.jdt.ui.prefs +++ b/plugins/org.eclipse.emf.cdo.examples.master/.settings/org.eclipse.jdt.ui.prefs diff --git a/plugins/org.eclipse.emf.cdo.examples.installer.master/.settings/org.eclipse.ltk.core.refactoring.prefs b/plugins/org.eclipse.emf.cdo.examples.master/.settings/org.eclipse.ltk.core.refactoring.prefs index 864e30fe5d..864e30fe5d 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer.master/.settings/org.eclipse.ltk.core.refactoring.prefs +++ b/plugins/org.eclipse.emf.cdo.examples.master/.settings/org.eclipse.ltk.core.refactoring.prefs diff --git a/plugins/org.eclipse.emf.cdo.examples.installer.master/.settings/org.eclipse.mylyn.tasks.ui.prefs b/plugins/org.eclipse.emf.cdo.examples.master/.settings/org.eclipse.mylyn.tasks.ui.prefs index b050639a54..b050639a54 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer.master/.settings/org.eclipse.mylyn.tasks.ui.prefs +++ b/plugins/org.eclipse.emf.cdo.examples.master/.settings/org.eclipse.mylyn.tasks.ui.prefs diff --git a/plugins/org.eclipse.emf.cdo.examples.installer.master/.settings/org.eclipse.mylyn.team.ui.prefs b/plugins/org.eclipse.emf.cdo.examples.master/.settings/org.eclipse.mylyn.team.ui.prefs index 2f50f36c0c..2f50f36c0c 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer.master/.settings/org.eclipse.mylyn.team.ui.prefs +++ b/plugins/org.eclipse.emf.cdo.examples.master/.settings/org.eclipse.mylyn.team.ui.prefs diff --git a/plugins/org.eclipse.emf.cdo.examples.installer.master/.settings/org.eclipse.pde.api.tools.prefs b/plugins/org.eclipse.emf.cdo.examples.master/.settings/org.eclipse.pde.api.tools.prefs index f8d0a0660e..f8d0a0660e 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer.master/.settings/org.eclipse.pde.api.tools.prefs +++ b/plugins/org.eclipse.emf.cdo.examples.master/.settings/org.eclipse.pde.api.tools.prefs diff --git a/plugins/org.eclipse.emf.cdo.examples.installer.master/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.emf.cdo.examples.master/.settings/org.eclipse.pde.prefs index c6b96bb45e..c6b96bb45e 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer.master/.settings/org.eclipse.pde.prefs +++ b/plugins/org.eclipse.emf.cdo.examples.master/.settings/org.eclipse.pde.prefs diff --git a/plugins/org.eclipse.emf.cdo.examples.installer.master/ExampleMasterServer.launch b/plugins/org.eclipse.emf.cdo.examples.master/ExampleMasterServer.launch index c814006ecb..29bcebe504 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer.master/ExampleMasterServer.launch +++ b/plugins/org.eclipse.emf.cdo.examples.master/ExampleMasterServer.launch @@ -17,12 +17,12 @@ <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -debug -console"/> <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> -<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx1024m -Ddebug=true -Dnet4j.config="${project_loc:/cdo.examples.master}/config" -Dorg.eclipse.emf.cdo.server.browser.port=7777 -Dosgi.console.enable.builtin=true"/> -<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${project_loc:/cdo.examples.master}"/> +<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx1024m -Ddebug=true -Dnet4j.config="${project_loc:/org.eclipse.emf.cdo.examples.master}/config" -Dorg.eclipse.emf.cdo.server.browser.port=7777 -Dosgi.console.enable.builtin=true"/> +<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${project_loc:/org.eclipse.emf.cdo.examples.master}"/> <stringAttribute key="pde.version" value="3.3"/> <stringAttribute key="product" value="org.eclipse.platform.ide"/> <stringAttribute key="selected_target_plugins" value="org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.osgi@-1:true,org.eclipse.team.core@default:default,org.h2@default:default"/> -<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.cdo.common@default:default,org.eclipse.emf.cdo.examples.installer.master,org.eclipse.emf.cdo.server.admin@default:default,org.eclipse.emf.cdo.server.db@default:default,org.eclipse.emf.cdo.server.net4j@default:default,org.eclipse.emf.cdo.server@default:default,org.eclipse.emf.cdo@default:default,org.eclipse.net4j.db.h2@default:default,org.eclipse.net4j.db@default:default,org.eclipse.net4j.tcp@default:default,org.eclipse.net4j.util@default:default,org.eclipse.net4j@default:default"/> +<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.cdo.common@default:default,org.eclipse.emf.cdo.examples.master@default:default,org.eclipse.emf.cdo.server.admin@default:default,org.eclipse.emf.cdo.server.db@default:default,org.eclipse.emf.cdo.server.net4j@default:default,org.eclipse.emf.cdo.server@default:default,org.eclipse.emf.cdo@default:default,org.eclipse.net4j.db.h2@default:default,org.eclipse.net4j.db@default:default,org.eclipse.net4j.tcp@default:default,org.eclipse.net4j.util@default:default,org.eclipse.net4j@default:default"/> <booleanAttribute key="show_selected_only" value="true"/> <stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/> <booleanAttribute key="tracing" value="true"/> diff --git a/plugins/org.eclipse.emf.cdo.examples.installer.master/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.master/META-INF/MANIFEST.MF index 5e04836219..5e04836219 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer.master/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.examples.master/META-INF/MANIFEST.MF diff --git a/plugins/org.eclipse.emf.cdo.examples.installer.master/README.html b/plugins/org.eclipse.emf.cdo.examples.master/README.html index ef1163844d..ef1163844d 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer.master/README.html +++ b/plugins/org.eclipse.emf.cdo.examples.master/README.html diff --git a/plugins/org.eclipse.emf.cdo.examples.installer.master/about.html b/plugins/org.eclipse.emf.cdo.examples.master/about.html index f2decc3a0d..f2decc3a0d 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer.master/about.html +++ b/plugins/org.eclipse.emf.cdo.examples.master/about.html diff --git a/plugins/org.eclipse.emf.cdo.examples.installer.master/build.properties b/plugins/org.eclipse.emf.cdo.examples.master/build.properties index b08b97ad07..b08b97ad07 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer.master/build.properties +++ b/plugins/org.eclipse.emf.cdo.examples.master/build.properties diff --git a/plugins/org.eclipse.emf.cdo.examples.installer.master/config/cdo-server.xml b/plugins/org.eclipse.emf.cdo.examples.master/config/cdo-server.xml index c9ddd819cc..c9ddd819cc 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer.master/config/cdo-server.xml +++ b/plugins/org.eclipse.emf.cdo.examples.master/config/cdo-server.xml diff --git a/plugins/org.eclipse.emf.cdo.examples.installer.master/copyright.txt b/plugins/org.eclipse.emf.cdo.examples.master/copyright.txt index 0a0f67e6d7..0a0f67e6d7 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer.master/copyright.txt +++ b/plugins/org.eclipse.emf.cdo.examples.master/copyright.txt diff --git a/plugins/org.eclipse.emf.cdo.examples.installer.master/plugin.properties b/plugins/org.eclipse.emf.cdo.examples.master/plugin.properties index c41470077e..c41470077e 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer.master/plugin.properties +++ b/plugins/org.eclipse.emf.cdo.examples.master/plugin.properties diff --git a/plugins/org.eclipse.emf.cdo.releng.release/release.properties b/plugins/org.eclipse.emf.cdo.releng.release/release.properties index c165297f76..6a6793229f 100644 --- a/plugins/org.eclipse.emf.cdo.releng.release/release.properties +++ b/plugins/org.eclipse.emf.cdo.releng.release/release.properties @@ -1,3 +1,5 @@ +# +#Mon Sep 17 13:51:34 CEST 2012 +root.projects=org.eclipse.emf.cdo.site-feature org.eclipse.net4j.db.db2-feature org.eclipse.emf.cdo.releng org.eclipse.emf.cdo.releng.doc org.eclipse.emf.cdo.releng.release org.eclipse.emf.cdo.examples.clone org.eclipse.emf.cdo.examples.client org.eclipse.emf.cdo.examples.master baseline.for.integration=true -root.projects=org.eclipse.emf.cdo.site-feature org.eclipse.net4j.db.db2-feature org.eclipse.emf.cdo.releng org.eclipse.emf.cdo.releng.doc org.eclipse.emf.cdo.releng.release show.deviations=false diff --git a/plugins/org.eclipse.emf.cdo.releng/buckminster.cspex b/plugins/org.eclipse.emf.cdo.releng/buckminster.cspex index d8a90d3f03..f3a7b279d5 100644 --- a/plugins/org.eclipse.emf.cdo.releng/buckminster.cspex +++ b/plugins/org.eclipse.emf.cdo.releng/buckminster.cspex @@ -3,6 +3,9 @@ <cs:dependencies> <cs:dependency name="org.eclipse.emf.cdo.site" componentType="eclipse.feature"/> <cs:dependency name="org.eclipse.emf.cdo.releng.release" componentType="osgi.bundle"/> + <cs:dependency name="org.eclipse.emf.cdo.examples.client" componentType="osgi.bundle"/> + <cs:dependency name="org.eclipse.emf.cdo.examples.master" componentType="osgi.bundle"/> + <cs:dependency name="org.eclipse.emf.cdo.examples.clone" componentType="osgi.bundle"/> <cs:dependency name="org.eclipse.emf.cdo.efs" componentType="osgi.bundle"/> <cs:dependency name="org.eclipse.emf.cdo.ui.efs" componentType="osgi.bundle"/> @@ -28,21 +31,6 @@ <cs:dependency name="org.eclipse.swtbot.eclipse" componentType="eclipse.feature"/> <cs:dependency name="org.eclipse.swtbot.eclipse.gef" componentType="eclipse.feature"/> - <!-- - <cs:dependency name="org.eclipse.xtext.sdk" componentType="eclipse.feature"/> - --> - - <!-- - <cs:dependency name="org.eclipse.rap.rwt.source" componentType="osgi.bundle"/> - <cs:dependency name="org.eclipse.rap.rwt.q07" componentType="osgi.bundle"/> - <cs:dependency name="org.eclipse.rap.rwt.q07.source" componentType="osgi.bundle"/> - <cs:dependency name="org.eclipse.rap.jface.source" componentType="osgi.bundle"/> - <cs:dependency name="org.eclipse.rap.ui.source" componentType="osgi.bundle"/> - <cs:dependency name="org.eclipse.rap.ui.forms.source" componentType="osgi.bundle"/> - <cs:dependency name="org.eclipse.rap.ui.views.source" componentType="osgi.bundle"/> - <cs:dependency name="org.eclipse.rap.ui.workbench.source" componentType="osgi.bundle"/> - --> - <cs:dependency name="com.mysql.jdbc" componentType="eclipse.feature"/> <cs:dependency name="org.hsqldb" componentType="eclipse.feature"/> <cs:dependency name="org.postgresql.jdbc3" componentType="eclipse.feature"/> @@ -51,13 +39,5 @@ <cs:dependency name="org.hibernate" componentType="eclipse.feature"/> <cs:dependency name="org.dom4j" componentType="eclipse.feature"/> <cs:dependency name="javax.persistence" componentType="eclipse.feature"/> - - <!-- - <cs:dependency name="com.google.collect" componentType="osgi.bundle"/> - <cs:dependency name="com.google.collect.source" componentType="osgi.bundle"/> - <cs:dependency name="com.google.inject" componentType="osgi.bundle"/> - <cs:dependency name="com.google.inject.source" componentType="osgi.bundle"/> - --> - </cs:dependencies> </cs:cspecExtension>
\ No newline at end of file diff --git a/plugins/org.gastro.business.edit/.externalToolBuilders/copyExample.ant b/plugins/org.gastro.business.edit/.externalToolBuilders/copyExample.ant new file mode 100644 index 0000000000..344747b637 --- /dev/null +++ b/plugins/org.gastro.business.edit/.externalToolBuilders/copyExample.ant @@ -0,0 +1,22 @@ +<?xml version="1.0"?> +<!-- + Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) 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 + + Contributors: + Eike Stepper - initial API and implementation +--> +<project name="copyExample" default="main" basedir="../.."> + + <property name="installer" value="org.eclipse.emf.cdo.examples.installer" /> + <import file="../../${installer}/copyExampleLib.ant" optional="true" /> + <basename file="${build.project}" property="project" /> + + <target name="main"> + <copyExample project="${project}" /> + </target> + +</project> diff --git a/plugins/org.eclipse.emf.cdo.examples.installer.client/.externalToolBuilders/org.eclipse.emf.cdo.examples..client.launch b/plugins/org.gastro.business.edit/.externalToolBuilders/org.gastro.business.edit.launch index 982818692a..92707cad70 100644 --- a/plugins/org.eclipse.emf.cdo.examples.installer.client/.externalToolBuilders/org.eclipse.emf.cdo.examples..client.launch +++ b/plugins/org.gastro.business.edit/.externalToolBuilders/org.gastro.business.edit.launch @@ -17,7 +17,7 @@ <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.emf.cdo.examples.client"/> <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.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.installer.client" type="2"/> <item path="/org.eclipse.emf.cdo.examples.installer.client" type="4"/> </resources>}"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.business.edit" type="2"/> <item path="/org.gastro.business.edit" type="4"/> </resources>}"/> <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${build_project}/.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=${build_project}"/> diff --git a/plugins/org.gastro.business.edit/.project b/plugins/org.gastro.business.edit/.project index cc604fa349..5a5cec8203 100644 --- a/plugins/org.gastro.business.edit/.project +++ b/plugins/org.gastro.business.edit/.project @@ -24,6 +24,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.gastro.business.edit.launch</value> + </dictionary> + <dictionary> + <key>incclean</key> + <value>true</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> diff --git a/plugins/org.gastro.business.edit/.settings/org.eclipse.core.resources.prefs b/plugins/org.gastro.business.edit/.settings/org.eclipse.core.resources.prefs index 0236bbdcf9..f06cc0ffca 100644 --- a/plugins/org.gastro.business.edit/.settings/org.eclipse.core.resources.prefs +++ b/plugins/org.gastro.business.edit/.settings/org.eclipse.core.resources.prefs @@ -1,3 +1,3 @@ -#Mon Jul 04 13:03:27 CEST 2011 eclipse.preferences.version=1 +encoding/.project=UTF-8 encoding//model/org.eclipse.emf.cdo.defs.ecorediag=UTF-8 diff --git a/plugins/org.gastro.business/.externalToolBuilders/copyExample.ant b/plugins/org.gastro.business/.externalToolBuilders/copyExample.ant new file mode 100644 index 0000000000..344747b637 --- /dev/null +++ b/plugins/org.gastro.business/.externalToolBuilders/copyExample.ant @@ -0,0 +1,22 @@ +<?xml version="1.0"?> +<!-- + Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) 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 + + Contributors: + Eike Stepper - initial API and implementation +--> +<project name="copyExample" default="main" basedir="../.."> + + <property name="installer" value="org.eclipse.emf.cdo.examples.installer" /> + <import file="../../${installer}/copyExampleLib.ant" optional="true" /> + <basename file="${build.project}" property="project" /> + + <target name="main"> + <copyExample project="${project}" /> + </target> + +</project> diff --git a/plugins/org.gastro.business/.externalToolBuilders/org.gastro.business.launch b/plugins/org.gastro.business/.externalToolBuilders/org.gastro.business.launch new file mode 100644 index 0000000000..fcfeb41977 --- /dev/null +++ b/plugins/org.gastro.business/.externalToolBuilders/org.gastro.business.launch @@ -0,0 +1,25 @@ +<?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.emf.cdo.examples.installer/examples" type="2"/> </resources>}"/> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> +<listEntry value="/org.eclipse.emf.cdo.examples.client"/> +</listAttribute> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> +<listEntry value="4"/> +</listAttribute> +<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="org.eclipse.emf.cdo.examples.client"/> +<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.emf.cdo.examples.installer/examples/org.gastro.business" type="2"/> <item path="/org.gastro.business" type="4"/> </resources>}"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${build_project}/.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=${build_project}"/> +<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/> +</launchConfiguration> diff --git a/plugins/org.gastro.business/.project b/plugins/org.gastro.business/.project index 87e87da3a4..7eaf7c3cd2 100644 --- a/plugins/org.gastro.business/.project +++ b/plugins/org.gastro.business/.project @@ -24,6 +24,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.gastro.business.launch</value> + </dictionary> + <dictionary> + <key>incclean</key> + <value>true</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> diff --git a/plugins/org.gastro.business/.settings/org.eclipse.core.resources.prefs b/plugins/org.gastro.business/.settings/org.eclipse.core.resources.prefs index 66ab9e9c09..f06cc0ffca 100644 --- a/plugins/org.gastro.business/.settings/org.eclipse.core.resources.prefs +++ b/plugins/org.gastro.business/.settings/org.eclipse.core.resources.prefs @@ -1,3 +1,3 @@ -#Mon Jul 04 13:04:54 CEST 2011 eclipse.preferences.version=1 +encoding/.project=UTF-8 encoding//model/org.eclipse.emf.cdo.defs.ecorediag=UTF-8 diff --git a/plugins/org.gastro.inventory.edit/.externalToolBuilders/copyExample.ant b/plugins/org.gastro.inventory.edit/.externalToolBuilders/copyExample.ant new file mode 100644 index 0000000000..344747b637 --- /dev/null +++ b/plugins/org.gastro.inventory.edit/.externalToolBuilders/copyExample.ant @@ -0,0 +1,22 @@ +<?xml version="1.0"?> +<!-- + Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) 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 + + Contributors: + Eike Stepper - initial API and implementation +--> +<project name="copyExample" default="main" basedir="../.."> + + <property name="installer" value="org.eclipse.emf.cdo.examples.installer" /> + <import file="../../${installer}/copyExampleLib.ant" optional="true" /> + <basename file="${build.project}" property="project" /> + + <target name="main"> + <copyExample project="${project}" /> + </target> + +</project> diff --git a/plugins/org.gastro.inventory.edit/.externalToolBuilders/org.gastro.inventory.edit.launch b/plugins/org.gastro.inventory.edit/.externalToolBuilders/org.gastro.inventory.edit.launch new file mode 100644 index 0000000000..174ae2d76d --- /dev/null +++ b/plugins/org.gastro.inventory.edit/.externalToolBuilders/org.gastro.inventory.edit.launch @@ -0,0 +1,25 @@ +<?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.emf.cdo.examples.installer/examples" type="2"/> </resources>}"/> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> +<listEntry value="/org.eclipse.emf.cdo.examples.client"/> +</listAttribute> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> +<listEntry value="4"/> +</listAttribute> +<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="org.eclipse.emf.cdo.examples.client"/> +<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.emf.cdo.examples.installer/examples/org.gastro.inventory.edit" type="2"/> <item path="/org.gastro.inventory.edit" type="4"/> </resources>}"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${build_project}/.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=${build_project}"/> +<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/> +</launchConfiguration> diff --git a/plugins/org.gastro.inventory.edit/.project b/plugins/org.gastro.inventory.edit/.project index b8b7cabcc5..1677f918aa 100644 --- a/plugins/org.gastro.inventory.edit/.project +++ b/plugins/org.gastro.inventory.edit/.project @@ -24,6 +24,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.gastro.inventory.edit.launch</value> + </dictionary> + <dictionary> + <key>incclean</key> + <value>true</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> diff --git a/plugins/org.gastro.inventory.edit/.settings/org.eclipse.core.resources.prefs b/plugins/org.gastro.inventory.edit/.settings/org.eclipse.core.resources.prefs index c407b010c2..f06cc0ffca 100644 --- a/plugins/org.gastro.inventory.edit/.settings/org.eclipse.core.resources.prefs +++ b/plugins/org.gastro.inventory.edit/.settings/org.eclipse.core.resources.prefs @@ -1,3 +1,3 @@ -#Mon Jul 04 12:59:37 CEST 2011 eclipse.preferences.version=1 +encoding/.project=UTF-8 encoding//model/org.eclipse.emf.cdo.defs.ecorediag=UTF-8 diff --git a/plugins/org.gastro.inventory/.externalToolBuilders/copyExample.ant b/plugins/org.gastro.inventory/.externalToolBuilders/copyExample.ant new file mode 100644 index 0000000000..344747b637 --- /dev/null +++ b/plugins/org.gastro.inventory/.externalToolBuilders/copyExample.ant @@ -0,0 +1,22 @@ +<?xml version="1.0"?> +<!-- + Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) 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 + + Contributors: + Eike Stepper - initial API and implementation +--> +<project name="copyExample" default="main" basedir="../.."> + + <property name="installer" value="org.eclipse.emf.cdo.examples.installer" /> + <import file="../../${installer}/copyExampleLib.ant" optional="true" /> + <basename file="${build.project}" property="project" /> + + <target name="main"> + <copyExample project="${project}" /> + </target> + +</project> diff --git a/plugins/org.gastro.inventory/.externalToolBuilders/org.gastro.inventory.launch b/plugins/org.gastro.inventory/.externalToolBuilders/org.gastro.inventory.launch new file mode 100644 index 0000000000..9bb285701a --- /dev/null +++ b/plugins/org.gastro.inventory/.externalToolBuilders/org.gastro.inventory.launch @@ -0,0 +1,25 @@ +<?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.emf.cdo.examples.installer/examples" type="2"/> </resources>}"/> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> +<listEntry value="/org.eclipse.emf.cdo.examples.client"/> +</listAttribute> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> +<listEntry value="4"/> +</listAttribute> +<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="org.eclipse.emf.cdo.examples.client"/> +<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.emf.cdo.examples.installer/examples/org.gastro.inventory" type="2"/> <item path="/org.gastro.inventory" type="4"/> </resources>}"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${build_project}/.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=${build_project}"/> +<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/> +</launchConfiguration> diff --git a/plugins/org.gastro.inventory/.project b/plugins/org.gastro.inventory/.project index 202af030d1..19049f1434 100644 --- a/plugins/org.gastro.inventory/.project +++ b/plugins/org.gastro.inventory/.project @@ -24,6 +24,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.gastro.inventory.launch</value> + </dictionary> + <dictionary> + <key>incclean</key> + <value>true</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> diff --git a/plugins/org.gastro.inventory/.settings/org.eclipse.core.resources.prefs b/plugins/org.gastro.inventory/.settings/org.eclipse.core.resources.prefs index 2259eb186d..f06cc0ffca 100644 --- a/plugins/org.gastro.inventory/.settings/org.eclipse.core.resources.prefs +++ b/plugins/org.gastro.inventory/.settings/org.eclipse.core.resources.prefs @@ -1,3 +1,3 @@ -#Mon Jul 04 13:05:34 CEST 2011 eclipse.preferences.version=1 +encoding/.project=UTF-8 encoding//model/org.eclipse.emf.cdo.defs.ecorediag=UTF-8 diff --git a/plugins/org.gastro.rcp.department/.externalToolBuilders/copyExample.ant b/plugins/org.gastro.rcp.department/.externalToolBuilders/copyExample.ant new file mode 100644 index 0000000000..344747b637 --- /dev/null +++ b/plugins/org.gastro.rcp.department/.externalToolBuilders/copyExample.ant @@ -0,0 +1,22 @@ +<?xml version="1.0"?> +<!-- + Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) 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 + + Contributors: + Eike Stepper - initial API and implementation +--> +<project name="copyExample" default="main" basedir="../.."> + + <property name="installer" value="org.eclipse.emf.cdo.examples.installer" /> + <import file="../../${installer}/copyExampleLib.ant" optional="true" /> + <basename file="${build.project}" property="project" /> + + <target name="main"> + <copyExample project="${project}" /> + </target> + +</project> diff --git a/plugins/org.gastro.rcp.department/.externalToolBuilders/org.gastro.rcp.department.launch b/plugins/org.gastro.rcp.department/.externalToolBuilders/org.gastro.rcp.department.launch new file mode 100644 index 0000000000..c3e97007e5 --- /dev/null +++ b/plugins/org.gastro.rcp.department/.externalToolBuilders/org.gastro.rcp.department.launch @@ -0,0 +1,25 @@ +<?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.emf.cdo.examples.installer/examples" type="2"/> </resources>}"/> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> +<listEntry value="/org.eclipse.emf.cdo.examples.client"/> +</listAttribute> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> +<listEntry value="4"/> +</listAttribute> +<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="org.eclipse.emf.cdo.examples.client"/> +<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.emf.cdo.examples.installer/examples/org.gastro.rcp.department" type="2"/> <item path="/org.gastro.rcp.department" type="4"/> </resources>}"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${build_project}/.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=${build_project}"/> +<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/> +</launchConfiguration> diff --git a/plugins/org.gastro.rcp.department/.project b/plugins/org.gastro.rcp.department/.project index b3631f3dd7..61d161c71b 100644 --- a/plugins/org.gastro.rcp.department/.project +++ b/plugins/org.gastro.rcp.department/.project @@ -24,6 +24,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.gastro.rcp.department.launch</value> + </dictionary> + <dictionary> + <key>incclean</key> + <value>true</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> diff --git a/plugins/org.gastro.rcp.department/.settings/org.eclipse.core.resources.prefs b/plugins/org.gastro.rcp.department/.settings/org.eclipse.core.resources.prefs index 593f7f5f8c..f06cc0ffca 100644 --- a/plugins/org.gastro.rcp.department/.settings/org.eclipse.core.resources.prefs +++ b/plugins/org.gastro.rcp.department/.settings/org.eclipse.core.resources.prefs @@ -1,3 +1,3 @@ -#Mon Jul 04 12:58:56 CEST 2011 eclipse.preferences.version=1 +encoding/.project=UTF-8 encoding//model/org.eclipse.emf.cdo.defs.ecorediag=UTF-8 diff --git a/plugins/org.gastro.rcp.table/.externalToolBuilders/copyExample.ant b/plugins/org.gastro.rcp.table/.externalToolBuilders/copyExample.ant new file mode 100644 index 0000000000..344747b637 --- /dev/null +++ b/plugins/org.gastro.rcp.table/.externalToolBuilders/copyExample.ant @@ -0,0 +1,22 @@ +<?xml version="1.0"?> +<!-- + Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) 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 + + Contributors: + Eike Stepper - initial API and implementation +--> +<project name="copyExample" default="main" basedir="../.."> + + <property name="installer" value="org.eclipse.emf.cdo.examples.installer" /> + <import file="../../${installer}/copyExampleLib.ant" optional="true" /> + <basename file="${build.project}" property="project" /> + + <target name="main"> + <copyExample project="${project}" /> + </target> + +</project> diff --git a/plugins/org.gastro.rcp.table/.externalToolBuilders/org.gastro.rcp.table.launch b/plugins/org.gastro.rcp.table/.externalToolBuilders/org.gastro.rcp.table.launch new file mode 100644 index 0000000000..7ea1d9084d --- /dev/null +++ b/plugins/org.gastro.rcp.table/.externalToolBuilders/org.gastro.rcp.table.launch @@ -0,0 +1,25 @@ +<?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.emf.cdo.examples.installer/examples" type="2"/> </resources>}"/> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> +<listEntry value="/org.eclipse.emf.cdo.examples.client"/> +</listAttribute> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> +<listEntry value="4"/> +</listAttribute> +<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="org.eclipse.emf.cdo.examples.client"/> +<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.emf.cdo.examples.installer/examples/org.gastro.rcp.table" type="2"/> <item path="/org.gastro.rcp.table" type="4"/> </resources>}"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${build_project}/.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=${build_project}"/> +<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/> +</launchConfiguration> diff --git a/plugins/org.gastro.rcp.table/.project b/plugins/org.gastro.rcp.table/.project index d67450e6d7..51329af356 100644 --- a/plugins/org.gastro.rcp.table/.project +++ b/plugins/org.gastro.rcp.table/.project @@ -24,6 +24,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.gastro.rcp.table.launch</value> + </dictionary> + <dictionary> + <key>incclean</key> + <value>true</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> diff --git a/plugins/org.gastro.rcp.table/.settings/org.eclipse.core.resources.prefs b/plugins/org.gastro.rcp.table/.settings/org.eclipse.core.resources.prefs index d52ecb07ed..f06cc0ffca 100644 --- a/plugins/org.gastro.rcp.table/.settings/org.eclipse.core.resources.prefs +++ b/plugins/org.gastro.rcp.table/.settings/org.eclipse.core.resources.prefs @@ -1,3 +1,3 @@ -#Mon Jul 04 12:58:02 CEST 2011 eclipse.preferences.version=1 +encoding/.project=UTF-8 encoding//model/org.eclipse.emf.cdo.defs.ecorediag=UTF-8 diff --git a/plugins/org.gastro.rcp/.externalToolBuilders/copyExample.ant b/plugins/org.gastro.rcp/.externalToolBuilders/copyExample.ant new file mode 100644 index 0000000000..344747b637 --- /dev/null +++ b/plugins/org.gastro.rcp/.externalToolBuilders/copyExample.ant @@ -0,0 +1,22 @@ +<?xml version="1.0"?> +<!-- + Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) 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 + + Contributors: + Eike Stepper - initial API and implementation +--> +<project name="copyExample" default="main" basedir="../.."> + + <property name="installer" value="org.eclipse.emf.cdo.examples.installer" /> + <import file="../../${installer}/copyExampleLib.ant" optional="true" /> + <basename file="${build.project}" property="project" /> + + <target name="main"> + <copyExample project="${project}" /> + </target> + +</project> diff --git a/plugins/org.gastro.rcp/.externalToolBuilders/org.gastro.rcp.launch b/plugins/org.gastro.rcp/.externalToolBuilders/org.gastro.rcp.launch new file mode 100644 index 0000000000..74bafc843b --- /dev/null +++ b/plugins/org.gastro.rcp/.externalToolBuilders/org.gastro.rcp.launch @@ -0,0 +1,25 @@ +<?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.emf.cdo.examples.installer/examples" type="2"/> </resources>}"/> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> +<listEntry value="/org.eclipse.emf.cdo.examples.client"/> +</listAttribute> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> +<listEntry value="4"/> +</listAttribute> +<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="org.eclipse.emf.cdo.examples.client"/> +<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.emf.cdo.examples.installer/examples/org.gastro.rcp" type="2"/> <item path="/org.gastro.rcp" type="4"/> </resources>}"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${build_project}/.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=${build_project}"/> +<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/> +</launchConfiguration> diff --git a/plugins/org.gastro.rcp/.project b/plugins/org.gastro.rcp/.project index ee2a4ac279..fbff4155df 100644 --- a/plugins/org.gastro.rcp/.project +++ b/plugins/org.gastro.rcp/.project @@ -24,6 +24,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.gastro.rcp.launch</value> + </dictionary> + <dictionary> + <key>incclean</key> + <value>true</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> diff --git a/plugins/org.gastro.rcp/.settings/org.eclipse.core.resources.prefs b/plugins/org.gastro.rcp/.settings/org.eclipse.core.resources.prefs index d9198464ec..f06cc0ffca 100644 --- a/plugins/org.gastro.rcp/.settings/org.eclipse.core.resources.prefs +++ b/plugins/org.gastro.rcp/.settings/org.eclipse.core.resources.prefs @@ -1,3 +1,3 @@ -#Mon Jul 04 12:56:56 CEST 2011 eclipse.preferences.version=1 +encoding/.project=UTF-8 encoding//model/org.eclipse.emf.cdo.defs.ecorediag=UTF-8 diff --git a/plugins/org.gastro.server.web/.externalToolBuilders/copyExample.ant b/plugins/org.gastro.server.web/.externalToolBuilders/copyExample.ant new file mode 100644 index 0000000000..344747b637 --- /dev/null +++ b/plugins/org.gastro.server.web/.externalToolBuilders/copyExample.ant @@ -0,0 +1,22 @@ +<?xml version="1.0"?> +<!-- + Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) 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 + + Contributors: + Eike Stepper - initial API and implementation +--> +<project name="copyExample" default="main" basedir="../.."> + + <property name="installer" value="org.eclipse.emf.cdo.examples.installer" /> + <import file="../../${installer}/copyExampleLib.ant" optional="true" /> + <basename file="${build.project}" property="project" /> + + <target name="main"> + <copyExample project="${project}" /> + </target> + +</project> diff --git a/plugins/org.gastro.server.web/.externalToolBuilders/org.gastro.server.web.launch b/plugins/org.gastro.server.web/.externalToolBuilders/org.gastro.server.web.launch new file mode 100644 index 0000000000..1a16f951a1 --- /dev/null +++ b/plugins/org.gastro.server.web/.externalToolBuilders/org.gastro.server.web.launch @@ -0,0 +1,25 @@ +<?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.emf.cdo.examples.installer/examples" type="2"/> </resources>}"/> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> +<listEntry value="/org.eclipse.emf.cdo.examples.client"/> +</listAttribute> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> +<listEntry value="4"/> +</listAttribute> +<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="org.eclipse.emf.cdo.examples.client"/> +<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.emf.cdo.examples.installer/examples/org.gastro.server.web" type="2"/> <item path="/org.gastro.server.web" type="4"/> </resources>}"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${build_project}/.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=${build_project}"/> +<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/> +</launchConfiguration> diff --git a/plugins/org.gastro.server.web/.project b/plugins/org.gastro.server.web/.project index acb16e9da4..c7911af2e8 100644 --- a/plugins/org.gastro.server.web/.project +++ b/plugins/org.gastro.server.web/.project @@ -29,6 +29,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.gastro.server.web.launch</value> + </dictionary> + <dictionary> + <key>incclean</key> + <value>true</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.emf.codegen.jet.IJETNature</nature> diff --git a/plugins/org.gastro.server.web/.settings/org.eclipse.core.resources.prefs b/plugins/org.gastro.server.web/.settings/org.eclipse.core.resources.prefs index f0a3c095d3..f06cc0ffca 100644 --- a/plugins/org.gastro.server.web/.settings/org.eclipse.core.resources.prefs +++ b/plugins/org.gastro.server.web/.settings/org.eclipse.core.resources.prefs @@ -1,3 +1,3 @@ -#Mon Jul 04 13:05:24 CEST 2011 eclipse.preferences.version=1 +encoding/.project=UTF-8 encoding//model/org.eclipse.emf.cdo.defs.ecorediag=UTF-8 diff --git a/plugins/org.gastro.server/.externalToolBuilders/copyExample.ant b/plugins/org.gastro.server/.externalToolBuilders/copyExample.ant new file mode 100644 index 0000000000..344747b637 --- /dev/null +++ b/plugins/org.gastro.server/.externalToolBuilders/copyExample.ant @@ -0,0 +1,22 @@ +<?xml version="1.0"?> +<!-- + Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) 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 + + Contributors: + Eike Stepper - initial API and implementation +--> +<project name="copyExample" default="main" basedir="../.."> + + <property name="installer" value="org.eclipse.emf.cdo.examples.installer" /> + <import file="../../${installer}/copyExampleLib.ant" optional="true" /> + <basename file="${build.project}" property="project" /> + + <target name="main"> + <copyExample project="${project}" /> + </target> + +</project> diff --git a/plugins/org.gastro.server/.externalToolBuilders/org.gastro.server.launch b/plugins/org.gastro.server/.externalToolBuilders/org.gastro.server.launch new file mode 100644 index 0000000000..5c7679acfe --- /dev/null +++ b/plugins/org.gastro.server/.externalToolBuilders/org.gastro.server.launch @@ -0,0 +1,25 @@ +<?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.emf.cdo.examples.installer/examples" type="2"/> </resources>}"/> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> +<listEntry value="/org.eclipse.emf.cdo.examples.client"/> +</listAttribute> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> +<listEntry value="4"/> +</listAttribute> +<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="org.eclipse.emf.cdo.examples.client"/> +<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.emf.cdo.examples.installer/examples/org.gastro.server" type="2"/> <item path="/org.gastro.server" type="4"/> </resources>}"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${build_project}/.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=${build_project}"/> +<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/> +</launchConfiguration> diff --git a/plugins/org.gastro.server/.project b/plugins/org.gastro.server/.project index 51bcb8cc96..36351be5ef 100644 --- a/plugins/org.gastro.server/.project +++ b/plugins/org.gastro.server/.project @@ -24,6 +24,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.gastro.server.launch</value> + </dictionary> + <dictionary> + <key>incclean</key> + <value>true</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> diff --git a/plugins/org.gastro.server/.settings/org.eclipse.core.resources.prefs b/plugins/org.gastro.server/.settings/org.eclipse.core.resources.prefs index df985ca0c4..f06cc0ffca 100644 --- a/plugins/org.gastro.server/.settings/org.eclipse.core.resources.prefs +++ b/plugins/org.gastro.server/.settings/org.eclipse.core.resources.prefs @@ -1,3 +1,3 @@ -#Mon Jul 04 13:01:42 CEST 2011 eclipse.preferences.version=1 +encoding/.project=UTF-8 encoding//model/org.eclipse.emf.cdo.defs.ecorediag=UTF-8 diff --git a/plugins/org.gastro.testclient/.externalToolBuilders/copyExample.ant b/plugins/org.gastro.testclient/.externalToolBuilders/copyExample.ant new file mode 100644 index 0000000000..344747b637 --- /dev/null +++ b/plugins/org.gastro.testclient/.externalToolBuilders/copyExample.ant @@ -0,0 +1,22 @@ +<?xml version="1.0"?> +<!-- + Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) 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 + + Contributors: + Eike Stepper - initial API and implementation +--> +<project name="copyExample" default="main" basedir="../.."> + + <property name="installer" value="org.eclipse.emf.cdo.examples.installer" /> + <import file="../../${installer}/copyExampleLib.ant" optional="true" /> + <basename file="${build.project}" property="project" /> + + <target name="main"> + <copyExample project="${project}" /> + </target> + +</project> diff --git a/plugins/org.gastro.testclient/.externalToolBuilders/org.gastro.testclient.launch b/plugins/org.gastro.testclient/.externalToolBuilders/org.gastro.testclient.launch new file mode 100644 index 0000000000..b709d37221 --- /dev/null +++ b/plugins/org.gastro.testclient/.externalToolBuilders/org.gastro.testclient.launch @@ -0,0 +1,25 @@ +<?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.emf.cdo.examples.installer/examples" type="2"/> </resources>}"/> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> +<listEntry value="/org.eclipse.emf.cdo.examples.client"/> +</listAttribute> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> +<listEntry value="4"/> +</listAttribute> +<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="org.eclipse.emf.cdo.examples.client"/> +<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.emf.cdo.examples.installer/examples/org.gastro.testclient" type="2"/> <item path="/org.gastro.testclient" type="4"/> </resources>}"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${build_project}/.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=${build_project}"/> +<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/> +</launchConfiguration> diff --git a/plugins/org.gastro.testclient/.project b/plugins/org.gastro.testclient/.project index 61ae7147db..a8dab985d0 100644 --- a/plugins/org.gastro.testclient/.project +++ b/plugins/org.gastro.testclient/.project @@ -24,6 +24,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.gastro.testclient.launch</value> + </dictionary> + <dictionary> + <key>incclean</key> + <value>true</value> + </dictionary> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> diff --git a/plugins/org.gastro.testclient/.settings/org.eclipse.core.resources.prefs b/plugins/org.gastro.testclient/.settings/org.eclipse.core.resources.prefs index d54b9c8568..f06cc0ffca 100644 --- a/plugins/org.gastro.testclient/.settings/org.eclipse.core.resources.prefs +++ b/plugins/org.gastro.testclient/.settings/org.eclipse.core.resources.prefs @@ -1,3 +1,3 @@ -#Mon Jul 04 13:01:11 CEST 2011 eclipse.preferences.version=1 +encoding/.project=UTF-8 encoding//model/org.eclipse.emf.cdo.defs.ecorediag=UTF-8 |