Bug 566463 - Update samples to latest OTJLD
- make ordersystem and stopwatch runnable on modular JRE (using otdre)
diff --git a/othersrc/otdt-examples/OTSample-Stopwatch-src/.settings/org.eclipse.jdt.core.prefs b/othersrc/otdt-examples/OTSample-Stopwatch-src/.settings/org.eclipse.jdt.core.prefs
index 87e37e0..e38c197 100644
--- a/othersrc/otdt-examples/OTSample-Stopwatch-src/.settings/org.eclipse.jdt.core.prefs
+++ b/othersrc/otdt-examples/OTSample-Stopwatch-src/.settings/org.eclipse.jdt.core.prefs
@@ -62,3 +62,4 @@
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.objectteams.otdt.compiler.option.weaving_scheme=OTDRE
diff --git a/othersrc/otdt-examples/OTSample-Stopwatch-src/LaunchStopWatch.launch b/othersrc/otdt-examples/OTSample-Stopwatch-src/LaunchStopWatch.launch
new file mode 100644
index 0000000..6f8b7a9
--- /dev/null
+++ b/othersrc/otdt-examples/OTSample-Stopwatch-src/LaunchStopWatch.launch
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
+ <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+ <listEntry value="/OTSample-StopWatch/src/org/eclipse/objectteams/example/stopwatch/Main.java"/>
+ </listAttribute>
+ <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+ <listEntry value="1"/>
+ </listAttribute>
+ <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
+ <booleanAttribute key="org.eclipse.jdt.launching.ATTR_EXCLUDE_TEST_CODE" value="true"/>
+ <booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
+ <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
+ <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.objectteams.example.stopwatch.Main"/>
+ <stringAttribute key="org.eclipse.jdt.launching.MODULE_NAME" value="OTSample-StopWatch"/>
+ <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="OTSample-StopWatch"/>
+ <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="--add-reads=java.base=ALL-UNNAMED"/>
+ <booleanAttribute key="org.eclipse.objectteams.launch" value="true"/>
+</launchConfiguration>
diff --git a/othersrc/otdt-examples/OTSample-Stopwatch-src/stopwatch-zip.jardesc b/othersrc/otdt-examples/OTSample-Stopwatch-src/stopwatch-zip.jardesc
index fda6ab1..e05514e 100644
--- a/othersrc/otdt-examples/OTSample-Stopwatch-src/stopwatch-zip.jardesc
+++ b/othersrc/otdt-examples/OTSample-Stopwatch-src/stopwatch-zip.jardesc
@@ -5,9 +5,11 @@
<storedRefactorings deprecationInfo="true" structuralOnly="false"/>
<selectedProjects/>
<selectedElements exportClassFiles="false" exportJavaFiles="true" exportOutputFolder="false">
+ <file path="/OTSample-Stopwatch-src/.project"/>
<javaElement handleIdentifier="=OTSample-Stopwatch-src/src"/>
<file path="/OTSample-Stopwatch-src/.classpath"/>
- <file path="/OTSample-Stopwatch-src/.project"/>
<folder path="/OTSample-Stopwatch-src/img"/>
+ <file path="/OTSample-Stopwatch-src/LaunchStopWatch.launch"/>
+ <folder path="/OTSample-Stopwatch-src/.settings"/>
</selectedElements>
</jardesc>
diff --git a/othersrc/otdt-examples/OTSample-ordersystem-src/.settings/org.eclipse.jdt.core.prefs b/othersrc/otdt-examples/OTSample-ordersystem-src/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..b988fa9
--- /dev/null
+++ b/othersrc/otdt-examples/OTSample-ordersystem-src/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,13 @@
+#Thu Mar 01 00:59:03 CET 2007
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.objectteams.otdt.compiler.option.weaving_scheme=OTDRE
diff --git a/othersrc/otdt-examples/OTSample-ordersystem-src/LaunchOrderGUI.launch b/othersrc/otdt-examples/OTSample-ordersystem-src/LaunchOrderGUI.launch
new file mode 100644
index 0000000..0fa6b52
--- /dev/null
+++ b/othersrc/otdt-examples/OTSample-ordersystem-src/LaunchOrderGUI.launch
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
+ <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+ <listEntry value="/OTSample-Ordersystem/src/org/eclipse/objectteams/samples/ordersystem/gui/GUITest.java"/>
+ </listAttribute>
+ <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+ <listEntry value="1"/>
+ </listAttribute>
+ <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
+ <booleanAttribute key="org.eclipse.jdt.launching.ATTR_EXCLUDE_TEST_CODE" value="true"/>
+ <booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
+ <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
+ <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.objectteams.samples.ordersystem.gui.GUITest"/>
+ <stringAttribute key="org.eclipse.jdt.launching.MODULE_NAME" value="OTSample-Ordersystem"/>
+ <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="OTSample-Ordersystem"/>
+ <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="--add-reads=java.base=ALL-UNNAMED"/>
+ <booleanAttribute key="org.eclipse.objectteams.launch" value="true"/>
+ <listAttribute key="org.eclipse.objectteams.otdt.debug.TEAMCONFIG_ATTR">
+ <listEntry value="=OTSample-Ordersystem/src<org.eclipse.objectteams.samples.ordersystem.gui{ControllerAdapterTeam.java[ControllerAdapterTeam"/>
+ <listEntry value="=OTSample-Ordersystem/src<org.eclipse.objectteams.samples.ordersystem.gui{GUIAdapterTeam.java[GUIAdapterTeam"/>
+ <listEntry value="=OTSample-Ordersystem/src<org.eclipse.objectteams.samples.ordersystem.gui{ModelAdapterTeam.java[ModelAdapterTeam"/>
+ </listAttribute>
+</launchConfiguration>
diff --git a/othersrc/otdt-examples/OTSample-ordersystem-src/ordersystem-zip.jardesc b/othersrc/otdt-examples/OTSample-ordersystem-src/ordersystem-zip.jardesc
index 78d703e..3119016 100644
--- a/othersrc/otdt-examples/OTSample-ordersystem-src/ordersystem-zip.jardesc
+++ b/othersrc/otdt-examples/OTSample-ordersystem-src/ordersystem-zip.jardesc
@@ -5,14 +5,11 @@
<storedRefactorings deprecationInfo="true" structuralOnly="false"/>
<selectedProjects/>
<selectedElements exportClassFiles="false" exportJavaFiles="true" exportOutputFolder="false">
- <javaElement handleIdentifier="=OTSample-ordersystem-src/src<org.eclipse.objectteams.samples.ordersystem.gui"/>
<file path="/OTSample-ordersystem-src/Intro0.html"/>
- <javaElement handleIdentifier="=OTSample-ordersystem-src/src<org.eclipse.objectteams.samples.ordersystem.store"/>
- <javaElement handleIdentifier="=OTSample-ordersystem-src/src<org.eclipse.objectteams.samples.ordersystem.reservation"/>
- <javaElement handleIdentifier="=OTSample-ordersystem-src/src<org.eclipse.objectteams.samples.ordersystem.order"/>
- <file path="/OTSample-ordersystem-src/.project"/>
<file path="/OTSample-ordersystem-src/.classpath"/>
- <javaElement handleIdentifier="=OTSample-ordersystem-src/src<org.eclipse.objectteams.samples.ordersystem.data"/>
- <javaElement handleIdentifier="=OTSample-ordersystem-src/src<org.eclipse.objectteams.samples.ordersystem"/>
+ <file path="/OTSample-ordersystem-src/.project"/>
+ <folder path="/OTSample-ordersystem-src/.settings"/>
+ <file path="/OTSample-ordersystem-src/LaunchOrderGUI.launch"/>
+ <javaElement handleIdentifier="=OTSample-ordersystem-src/src"/>
</selectedElements>
</jardesc>
diff --git a/plugins/org.eclipse.objectteams.otdt.samples/samples/ordersystem.zip b/plugins/org.eclipse.objectteams.otdt.samples/samples/ordersystem.zip
index d87966a..4014dcf 100644
--- a/plugins/org.eclipse.objectteams.otdt.samples/samples/ordersystem.zip
+++ b/plugins/org.eclipse.objectteams.otdt.samples/samples/ordersystem.zip
Binary files differ
diff --git a/plugins/org.eclipse.objectteams.otdt.samples/samples/stopwatch.zip b/plugins/org.eclipse.objectteams.otdt.samples/samples/stopwatch.zip
index 364d4ec..8a3be57 100644
--- a/plugins/org.eclipse.objectteams.otdt.samples/samples/stopwatch.zip
+++ b/plugins/org.eclipse.objectteams.otdt.samples/samples/stopwatch.zip
Binary files differ
