Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Taal2014-12-17 19:10:15 -0500
committerMartin Taal2014-12-17 19:10:15 -0500
commita207936b82ff4325806e41940d7f6bf91cd29b0e (patch)
treecbe9f49165e97630ec4d87c9cbe397434567a23f
parent3ab56ce74ecde57809656fcfbc4e814d6ddd381d (diff)
downloadorg.eclipse.emf.texo-a207936b82ff4325806e41940d7f6bf91cd29b0e.tar.gz
org.eclipse.emf.texo-a207936b82ff4325806e41940d7f6bf91cd29b0e.tar.xz
org.eclipse.emf.texo-a207936b82ff4325806e41940d7f6bf91cd29b0e.zip
Many changes to classpaths, dependencies to make Texo build with Luna
-rw-r--r--core/org.eclipse.emf.texo.datagenerator/.classpath12
-rw-r--r--core/org.eclipse.emf.texo.datagenerator/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--core/org.eclipse.emf.texo.datagenerator/.settings/org.eclipse.wst.common.project.facet.core.xml2
-rw-r--r--core/org.eclipse.emf.texo.datagenerator/META-INF/MANIFEST.MF2
-rw-r--r--core/org.eclipse.emf.texo.json/.classpath12
-rw-r--r--core/org.eclipse.emf.texo.json/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--core/org.eclipse.emf.texo.json/.settings/org.eclipse.wst.common.project.facet.core.xml2
-rw-r--r--core/org.eclipse.emf.texo.json/META-INF/MANIFEST.MF2
-rw-r--r--core/org.eclipse.emf.texo.xml/.classpath12
-rw-r--r--core/org.eclipse.emf.texo.xml/.settings/org.eclipse.jdt.core.prefs8
-rw-r--r--core/org.eclipse.emf.texo.xml/.settings/org.eclipse.wst.common.project.facet.core.xml2
-rw-r--r--core/org.eclipse.emf.texo.xml/META-INF/MANIFEST.MF2
-rwxr-xr-xcore/org.eclipse.emf.texo/.classpath12
-rwxr-xr-xcore/org.eclipse.emf.texo/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--core/org.eclipse.emf.texo/.settings/org.eclipse.wst.common.project.facet.core.xml2
-rwxr-xr-xcore/org.eclipse.emf.texo/META-INF/MANIFEST.MF2
-rw-r--r--generator/org.eclipse.emf.texo.annotations.model.edit/.classpath2
-rw-r--r--generator/org.eclipse.emf.texo.annotations.model.edit/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--generator/org.eclipse.emf.texo.annotations.model.edit/META-INF/MANIFEST.MF2
-rw-r--r--generator/org.eclipse.emf.texo.annotations.model.editor/.classpath2
-rw-r--r--generator/org.eclipse.emf.texo.annotations.model.editor/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--generator/org.eclipse.emf.texo.annotations.model.editor/META-INF/MANIFEST.MF2
-rw-r--r--generator/org.eclipse.emf.texo.annotations.model/.classpath2
-rw-r--r--generator/org.eclipse.emf.texo.annotations.model/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--generator/org.eclipse.emf.texo.annotations.model/META-INF/MANIFEST.MF2
-rw-r--r--generator/org.eclipse.emf.texo.eclipse.generator/.classpath2
-rw-r--r--generator/org.eclipse.emf.texo.eclipse.generator/.settings/org.eclipse.jdt.core.prefs6
-rw-r--r--generator/org.eclipse.emf.texo.eclipse.generator/META-INF/MANIFEST.MF2
-rw-r--r--generator/org.eclipse.emf.texo.eclipse/.classpath2
-rw-r--r--generator/org.eclipse.emf.texo.eclipse/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--generator/org.eclipse.emf.texo.eclipse/META-INF/MANIFEST.MF2
-rw-r--r--generator/org.eclipse.emf.texo.generator/.classpath2
-rw-r--r--generator/org.eclipse.emf.texo.generator/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--generator/org.eclipse.emf.texo.generator/META-INF/MANIFEST.MF2
-rw-r--r--generator/org.eclipse.emf.texo.modelgenerator.edit/.classpath2
-rw-r--r--generator/org.eclipse.emf.texo.modelgenerator.edit/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--generator/org.eclipse.emf.texo.modelgenerator.edit/META-INF/MANIFEST.MF2
-rw-r--r--generator/org.eclipse.emf.texo.modelgenerator/.classpath2
-rw-r--r--generator/org.eclipse.emf.texo.modelgenerator/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--generator/org.eclipse.emf.texo.modelgenerator/META-INF/MANIFEST.MF2
-rw-r--r--generator/org.eclipse.emf.texo.orm.edit/.classpath2
-rw-r--r--generator/org.eclipse.emf.texo.orm.edit/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--generator/org.eclipse.emf.texo.orm.edit/META-INF/MANIFEST.MF2
-rw-r--r--generator/org.eclipse.emf.texo.orm/.classpath2
-rw-r--r--generator/org.eclipse.emf.texo.orm/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--generator/org.eclipse.emf.texo.orm/META-INF/MANIFEST.MF2
-rw-r--r--runtime/org.eclipse.emf.texo.demo/model/identifiable.ecore7
-rw-r--r--runtime/org.eclipse.emf.texo.demo/model/library.ecore10
-rw-r--r--runtime/org.eclipse.emf.texo.demo/src-gen/org/eclipse/emf/texo/test/model/samples/library/Asdad.java26
-rw-r--r--runtime/org.eclipse.emf.texo.demo/src-gen/org/eclipse/emf/texo/test/model/samples/library/Book.java178
-rw-r--r--runtime/org.eclipse.emf.texo.demo/src-gen/org/eclipse/emf/texo/test/model/samples/library/BookCategory.java244
-rw-r--r--runtime/org.eclipse.emf.texo.demo/src-gen/org/eclipse/emf/texo/test/model/samples/library/Library.java227
-rw-r--r--runtime/org.eclipse.emf.texo.demo/src-gen/org/eclipse/emf/texo/test/model/samples/library/Writer.java150
-rw-r--r--runtime/org.eclipse.emf.texo.demo/src-gen/org/eclipse/emf/texo/test/model/samples/librarymodelclasses/model/LibraryModelFactory.java629
-rw-r--r--runtime/org.eclipse.emf.texo.demo/src-gen/org/eclipse/emf/texo/test/model/samples/librarymodelclasses/model/LibraryModelPackage.java491
-rw-r--r--runtime/org.eclipse.emf.texo.demo/src-gen/org/eclipse/emf/texo/test/model/samples/librarymodelclasses/model/library.ecore96
-rw-r--r--runtime/org.eclipse.emf.texo.jetty/.classpath2
-rw-r--r--runtime/org.eclipse.emf.texo.jetty/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--runtime/org.eclipse.emf.texo.jetty/META-INF/MANIFEST.MF6
-rw-r--r--runtime/org.eclipse.emf.texo.server/.classpath12
-rw-r--r--runtime/org.eclipse.emf.texo.server/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--runtime/org.eclipse.emf.texo.server/.settings/org.eclipse.wst.common.project.facet.core.xml2
-rw-r--r--runtime/org.eclipse.emf.texo.server/META-INF/MANIFEST.MF6
-rw-r--r--tests/org.eclipse.emf.texo.datagenerator.test/.classpath2
-rw-r--r--tests/org.eclipse.emf.texo.datagenerator.test/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--tests/org.eclipse.emf.texo.datagenerator.test/META-INF/MANIFEST.MF2
-rw-r--r--tests/org.eclipse.emf.texo.json.test/.classpath2
-rw-r--r--tests/org.eclipse.emf.texo.json.test/.settings/org.eclipse.jdt.core.prefs12
-rw-r--r--tests/org.eclipse.emf.texo.json.test/META-INF/MANIFEST.MF2
-rw-r--r--tests/org.eclipse.emf.texo.modelgenerator.test/.classpath4
-rw-r--r--tests/org.eclipse.emf.texo.modelgenerator.test/.settings/org.eclipse.jdt.core.prefs7
-rwxr-xr-xtests/org.eclipse.emf.texo.modelgenerator.test/EclipseModelGeneratorSingleModelTest.launch4
-rw-r--r--tests/org.eclipse.emf.texo.modelgenerator.test/HudsonModelGeneratorTest.launch2
-rw-r--r--tests/org.eclipse.emf.texo.modelgenerator.test/bin/org/eclipse/emf/texo/modelgenerator/test/test_gen_model.oaw10
-rwxr-xr-xtests/org.eclipse.emf.texo.modelgenerator.test/src/org/eclipse/emf/texo/modelgenerator/test/EclipseModelGeneratorSingleModelTest.java6
-rw-r--r--tests/org.eclipse.emf.texo.modelgenerator.test/src/org/eclipse/emf/texo/modelgenerator/test/test_gen_model.oaw10
-rw-r--r--tests/org.eclipse.emf.texo.orm.test/.classpath2
-rw-r--r--tests/org.eclipse.emf.texo.orm.test/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--tests/org.eclipse.emf.texo.orm.test/HudsonORMGeneratorTest.launch2
-rwxr-xr-xtests/org.eclipse.emf.texo.orm.test/META-INF/MANIFEST.MF2
-rw-r--r--tests/org.eclipse.emf.texo.orm.test/ORMGeneratorTest.launch2
-rw-r--r--tests/org.eclipse.emf.texo.server.test/.classpath2
-rw-r--r--tests/org.eclipse.emf.texo.server.test/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--tests/org.eclipse.emf.texo.server.test/META-INF/MANIFEST.MF5
-rw-r--r--tests/org.eclipse.emf.texo.test.all/.classpath2
-rw-r--r--tests/org.eclipse.emf.texo.test.all/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--tests/org.eclipse.emf.texo.test.all/LocalTexoAllTests.launch6
-rw-r--r--tests/org.eclipse.emf.texo.test.all/META-INF/MANIFEST.MF2
-rw-r--r--tests/org.eclipse.emf.texo.test.all/TexoAllTests.launch2
-rw-r--r--tests/org.eclipse.emf.texo.test.emfmodel/.classpath2
-rw-r--r--tests/org.eclipse.emf.texo.test.emfmodel/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--tests/org.eclipse.emf.texo.test.emfmodel/META-INF/MANIFEST.MF2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/.classpath2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/.settings/org.eclipse.jdt.core.prefs6
-rw-r--r--tests/org.eclipse.emf.texo.test.model/META-INF/MANIFEST.MF2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/club-orm.xml4
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/competition-orm.xml1
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/society-orm.xml1
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/travel-orm.xml4
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/sport/club/Club.java4
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/sport/club/ClubModelFactory.java6
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/sport/club/ClubModelPackage.java15
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/sport/club/club.ecore2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/sport/competition/Competition.java8
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/sport/competition/CompetitionModelFactory.java10
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/sport/competition/CompetitionModelPackage.java10
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/travel/City.java8
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/travel/Journey.java8
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/travel/TravelModelFactory.java22
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/travel/TravelModelPackage.java10
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/travel/Trip.java8
-rw-r--r--tests/org.eclipse.emf.texo.test/.classpath2
-rw-r--r--tests/org.eclipse.emf.texo.test/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--tests/org.eclipse.emf.texo.test/META-INF/MANIFEST.MF2
-rw-r--r--tests/org.eclipse.emf.texo.xml.test/.classpath2
-rw-r--r--tests/org.eclipse.emf.texo.xml.test/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--tests/org.eclipse.emf.texo.xml.test/META-INF/MANIFEST.MF2
117 files changed, 2313 insertions, 271 deletions
diff --git a/core/org.eclipse.emf.texo.datagenerator/.classpath b/core/org.eclipse.emf.texo.datagenerator/.classpath
index 64c5e31b..8a4a512c 100644
--- a/core/org.eclipse.emf.texo.datagenerator/.classpath
+++ b/core/org.eclipse.emf.texo.datagenerator/.classpath
@@ -1,7 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
+ <attributes>
+ <attribute name="org.eclipse.jst.component.nondependency" value=""/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+ <attributes>
+ <attribute name="owner.project.facets" value="java"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/core/org.eclipse.emf.texo.datagenerator/.settings/org.eclipse.jdt.core.prefs b/core/org.eclipse.emf.texo.datagenerator/.settings/org.eclipse.jdt.core.prefs
index f578e6d5..d452002b 100644
--- a/core/org.eclipse.emf.texo.datagenerator/.settings/org.eclipse.jdt.core.prefs
+++ b/core/org.eclipse.emf.texo.datagenerator/.settings/org.eclipse.jdt.core.prefs
@@ -1,9 +1,8 @@
-#Thu Mar 29 22:20:19 CEST 2012
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.targetPlatform=1.7
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -72,7 +71,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
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.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.7
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff --git a/core/org.eclipse.emf.texo.datagenerator/.settings/org.eclipse.wst.common.project.facet.core.xml b/core/org.eclipse.emf.texo.datagenerator/.settings/org.eclipse.wst.common.project.facet.core.xml
index 3c2f8a39..70e9d8a3 100644
--- a/core/org.eclipse.emf.texo.datagenerator/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/core/org.eclipse.emf.texo.datagenerator/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -2,6 +2,6 @@
<faceted-project>
<fixed facet="java"/>
<fixed facet="jst.utility"/>
- <installed facet="java" version="1.5"/>
<installed facet="jst.utility" version="1.0"/>
+ <installed facet="java" version="1.7"/>
</faceted-project>
diff --git a/core/org.eclipse.emf.texo.datagenerator/META-INF/MANIFEST.MF b/core/org.eclipse.emf.texo.datagenerator/META-INF/MANIFEST.MF
index ce049e1f..50ad34be 100644
--- a/core/org.eclipse.emf.texo.datagenerator/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.emf.texo.datagenerator/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 0.1.0.qualifier
Bundle-Vendor: %providerName
Bundle-ClassPath: .
Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)"
Export-Package: org.eclipse.emf.texo.datagenerator;version="0.1.0",
org.eclipse.emf.texo.datagenerator.attributegenerators;version="0.1.0",
diff --git a/core/org.eclipse.emf.texo.json/.classpath b/core/org.eclipse.emf.texo.json/.classpath
index 64c5e31b..91659e04 100644
--- a/core/org.eclipse.emf.texo.json/.classpath
+++ b/core/org.eclipse.emf.texo.json/.classpath
@@ -1,7 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
+ <attributes>
+ <attribute name="org.eclipse.jst.component.nondependency" value=""/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.7.0">
+ <attributes>
+ <attribute name="owner.project.facets" value="java"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/core/org.eclipse.emf.texo.json/.settings/org.eclipse.jdt.core.prefs b/core/org.eclipse.emf.texo.json/.settings/org.eclipse.jdt.core.prefs
index 9284c44d..19212765 100644
--- a/core/org.eclipse.emf.texo.json/.settings/org.eclipse.jdt.core.prefs
+++ b/core/org.eclipse.emf.texo.json/.settings/org.eclipse.jdt.core.prefs
@@ -1,11 +1,10 @@
-#Thu Mar 29 22:20:27 CEST 2012
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
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.jdt.core.compiler.source=1.7
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff --git a/core/org.eclipse.emf.texo.json/.settings/org.eclipse.wst.common.project.facet.core.xml b/core/org.eclipse.emf.texo.json/.settings/org.eclipse.wst.common.project.facet.core.xml
index ed4460b5..6fd4b787 100644
--- a/core/org.eclipse.emf.texo.json/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/core/org.eclipse.emf.texo.json/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -3,6 +3,6 @@
<runtime name="Apache Tomcat v7.0"/>
<fixed facet="jst.utility"/>
<fixed facet="java"/>
- <installed facet="java" version="1.5"/>
<installed facet="jst.utility" version="1.0"/>
+ <installed facet="java" version="1.7"/>
</faceted-project>
diff --git a/core/org.eclipse.emf.texo.json/META-INF/MANIFEST.MF b/core/org.eclipse.emf.texo.json/META-INF/MANIFEST.MF
index f5ca2fb8..75122dc0 100644
--- a/core/org.eclipse.emf.texo.json/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.emf.texo.json/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.texo.json
Bundle-Version: 0.1.0.qualifier
Bundle-Vendor: %pluginProvider
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Import-Package: org.json
Export-Package: org.eclipse.emf.texo.json;version="0.1.0"
Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.7.0, 3.0.0)",
diff --git a/core/org.eclipse.emf.texo.xml/.classpath b/core/org.eclipse.emf.texo.xml/.classpath
index 64c5e31b..91659e04 100644
--- a/core/org.eclipse.emf.texo.xml/.classpath
+++ b/core/org.eclipse.emf.texo.xml/.classpath
@@ -1,7 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
+ <attributes>
+ <attribute name="org.eclipse.jst.component.nondependency" value=""/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.7.0">
+ <attributes>
+ <attribute name="owner.project.facets" value="java"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/core/org.eclipse.emf.texo.xml/.settings/org.eclipse.jdt.core.prefs b/core/org.eclipse.emf.texo.xml/.settings/org.eclipse.jdt.core.prefs
index f578e6d5..62989a64 100644
--- a/core/org.eclipse.emf.texo.xml/.settings/org.eclipse.jdt.core.prefs
+++ b/core/org.eclipse.emf.texo.xml/.settings/org.eclipse.jdt.core.prefs
@@ -1,9 +1,9 @@
-#Thu Mar 29 22:20:19 CEST 2012
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.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -72,7 +72,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
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.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.7
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff --git a/core/org.eclipse.emf.texo.xml/.settings/org.eclipse.wst.common.project.facet.core.xml b/core/org.eclipse.emf.texo.xml/.settings/org.eclipse.wst.common.project.facet.core.xml
index 7a1c5688..77fedc87 100644
--- a/core/org.eclipse.emf.texo.xml/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/core/org.eclipse.emf.texo.xml/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -3,6 +3,6 @@
<runtime name="Apache Tomcat v7.0"/>
<fixed facet="java"/>
<fixed facet="jst.utility"/>
- <installed facet="java" version="1.5"/>
<installed facet="jst.utility" version="1.0"/>
+ <installed facet="java" version="1.7"/>
</faceted-project>
diff --git a/core/org.eclipse.emf.texo.xml/META-INF/MANIFEST.MF b/core/org.eclipse.emf.texo.xml/META-INF/MANIFEST.MF
index 4fd45e65..d0855017 100644
--- a/core/org.eclipse.emf.texo.xml/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.emf.texo.xml/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.texo.xml
Bundle-Version: 0.1.0.qualifier
Bundle-Vendor: %pluginProvider
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-ClassPath: .
Bundle-Localization: plugin
Require-Bundle: org.eclipse.emf.texo;bundle-version="[0.1.0,1.1.0)",
diff --git a/core/org.eclipse.emf.texo/.classpath b/core/org.eclipse.emf.texo/.classpath
index 64c5e31b..91659e04 100755
--- a/core/org.eclipse.emf.texo/.classpath
+++ b/core/org.eclipse.emf.texo/.classpath
@@ -1,7 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
+ <attributes>
+ <attribute name="org.eclipse.jst.component.nondependency" value=""/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.7.0">
+ <attributes>
+ <attribute name="owner.project.facets" value="java"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/core/org.eclipse.emf.texo/.settings/org.eclipse.jdt.core.prefs b/core/org.eclipse.emf.texo/.settings/org.eclipse.jdt.core.prefs
index f578e6d5..d452002b 100755
--- a/core/org.eclipse.emf.texo/.settings/org.eclipse.jdt.core.prefs
+++ b/core/org.eclipse.emf.texo/.settings/org.eclipse.jdt.core.prefs
@@ -1,9 +1,8 @@
-#Thu Mar 29 22:20:19 CEST 2012
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.targetPlatform=1.7
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -72,7 +71,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
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.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.7
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff --git a/core/org.eclipse.emf.texo/.settings/org.eclipse.wst.common.project.facet.core.xml b/core/org.eclipse.emf.texo/.settings/org.eclipse.wst.common.project.facet.core.xml
index 7a1c5688..77fedc87 100644
--- a/core/org.eclipse.emf.texo/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/core/org.eclipse.emf.texo/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -3,6 +3,6 @@
<runtime name="Apache Tomcat v7.0"/>
<fixed facet="java"/>
<fixed facet="jst.utility"/>
- <installed facet="java" version="1.5"/>
<installed facet="jst.utility" version="1.0"/>
+ <installed facet="java" version="1.7"/>
</faceted-project>
diff --git a/core/org.eclipse.emf.texo/META-INF/MANIFEST.MF b/core/org.eclipse.emf.texo/META-INF/MANIFEST.MF
index 647c8a20..70f2cd13 100755
--- a/core/org.eclipse.emf.texo/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.emf.texo/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 0.1.0.qualifier
Bundle-Vendor: %providerName
Bundle-ClassPath: .
Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)",
org.eclipse.emf.ecore.xmi;bundle-version="[2.5.0,3.0.0)"
Export-Package: org.eclipse.emf.texo.component;version="0.1.0",
diff --git a/generator/org.eclipse.emf.texo.annotations.model.edit/.classpath b/generator/org.eclipse.emf.texo.annotations.model.edit/.classpath
index 64c5e31b..098194ca 100644
--- a/generator/org.eclipse.emf.texo.annotations.model.edit/.classpath
+++ b/generator/org.eclipse.emf.texo.annotations.model.edit/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/generator/org.eclipse.emf.texo.annotations.model.edit/.settings/org.eclipse.jdt.core.prefs b/generator/org.eclipse.emf.texo.annotations.model.edit/.settings/org.eclipse.jdt.core.prefs
index 0858b9dc..19212765 100644
--- a/generator/org.eclipse.emf.texo.annotations.model.edit/.settings/org.eclipse.jdt.core.prefs
+++ b/generator/org.eclipse.emf.texo.annotations.model.edit/.settings/org.eclipse.jdt.core.prefs
@@ -1,11 +1,10 @@
-#Thu Jun 07 19:40:27 CEST 2012
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
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.jdt.core.compiler.source=1.7
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff --git a/generator/org.eclipse.emf.texo.annotations.model.edit/META-INF/MANIFEST.MF b/generator/org.eclipse.emf.texo.annotations.model.edit/META-INF/MANIFEST.MF
index ada51f22..1155e08a 100644
--- a/generator/org.eclipse.emf.texo.annotations.model.edit/META-INF/MANIFEST.MF
+++ b/generator/org.eclipse.emf.texo.annotations.model.edit/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.texo.annotations.annotationsmodel.provider.TexoannotationsmodelEditPlugin$Implementation
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Export-Package: org.eclipse.emf.texo.annotations.annotationsmodel.provider;version="0.1.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.emf.texo.annotations.model;bundle-version="[0.1.0,1.1.0)",
diff --git a/generator/org.eclipse.emf.texo.annotations.model.editor/.classpath b/generator/org.eclipse.emf.texo.annotations.model.editor/.classpath
index 64c5e31b..098194ca 100644
--- a/generator/org.eclipse.emf.texo.annotations.model.editor/.classpath
+++ b/generator/org.eclipse.emf.texo.annotations.model.editor/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/generator/org.eclipse.emf.texo.annotations.model.editor/.settings/org.eclipse.jdt.core.prefs b/generator/org.eclipse.emf.texo.annotations.model.editor/.settings/org.eclipse.jdt.core.prefs
index 0858b9dc..19212765 100644
--- a/generator/org.eclipse.emf.texo.annotations.model.editor/.settings/org.eclipse.jdt.core.prefs
+++ b/generator/org.eclipse.emf.texo.annotations.model.editor/.settings/org.eclipse.jdt.core.prefs
@@ -1,11 +1,10 @@
-#Thu Jun 07 19:40:27 CEST 2012
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
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.jdt.core.compiler.source=1.7
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff --git a/generator/org.eclipse.emf.texo.annotations.model.editor/META-INF/MANIFEST.MF b/generator/org.eclipse.emf.texo.annotations.model.editor/META-INF/MANIFEST.MF
index d97c1f00..7bcfa081 100644
--- a/generator/org.eclipse.emf.texo.annotations.model.editor/META-INF/MANIFEST.MF
+++ b/generator/org.eclipse.emf.texo.annotations.model.editor/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.texo.annotations.annotationsmodel.presentation.TexoannotationsmodelEditorPlugin$Implementation
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Export-Package: org.eclipse.emf.texo.annotations.annotationsmodel.presentation
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)",
diff --git a/generator/org.eclipse.emf.texo.annotations.model/.classpath b/generator/org.eclipse.emf.texo.annotations.model/.classpath
index 64c5e31b..098194ca 100644
--- a/generator/org.eclipse.emf.texo.annotations.model/.classpath
+++ b/generator/org.eclipse.emf.texo.annotations.model/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/generator/org.eclipse.emf.texo.annotations.model/.settings/org.eclipse.jdt.core.prefs b/generator/org.eclipse.emf.texo.annotations.model/.settings/org.eclipse.jdt.core.prefs
index 81ca71d2..b091e51d 100644
--- a/generator/org.eclipse.emf.texo.annotations.model/.settings/org.eclipse.jdt.core.prefs
+++ b/generator/org.eclipse.emf.texo.annotations.model/.settings/org.eclipse.jdt.core.prefs
@@ -1,9 +1,8 @@
-#Thu Jun 07 19:40:27 CEST 2012
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.targetPlatform=1.7
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -72,7 +71,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
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.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.7
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff --git a/generator/org.eclipse.emf.texo.annotations.model/META-INF/MANIFEST.MF b/generator/org.eclipse.emf.texo.annotations.model/META-INF/MANIFEST.MF
index f7e53694..35cd9d0d 100644
--- a/generator/org.eclipse.emf.texo.annotations.model/META-INF/MANIFEST.MF
+++ b/generator/org.eclipse.emf.texo.annotations.model/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 0.1.0.qualifier
Bundle-Vendor: %providerName
Bundle-ClassPath: .
Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Export-Package: org.eclipse.emf.texo.annotations;version="0.1.0",
org.eclipse.emf.texo.annotations.annotationsmodel;version="0.1.0",
org.eclipse.emf.texo.annotations.annotationsmodel.util;version="0.1.0"
diff --git a/generator/org.eclipse.emf.texo.eclipse.generator/.classpath b/generator/org.eclipse.emf.texo.eclipse.generator/.classpath
index 64c5e31b..098194ca 100644
--- a/generator/org.eclipse.emf.texo.eclipse.generator/.classpath
+++ b/generator/org.eclipse.emf.texo.eclipse.generator/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/generator/org.eclipse.emf.texo.eclipse.generator/.settings/org.eclipse.jdt.core.prefs b/generator/org.eclipse.emf.texo.eclipse.generator/.settings/org.eclipse.jdt.core.prefs
index 1b79561c..19212765 100644
--- a/generator/org.eclipse.emf.texo.eclipse.generator/.settings/org.eclipse.jdt.core.prefs
+++ b/generator/org.eclipse.emf.texo.eclipse.generator/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
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.jdt.core.compiler.source=1.7
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff --git a/generator/org.eclipse.emf.texo.eclipse.generator/META-INF/MANIFEST.MF b/generator/org.eclipse.emf.texo.eclipse.generator/META-INF/MANIFEST.MF
index 5910e579..679f9673 100644
--- a/generator/org.eclipse.emf.texo.eclipse.generator/META-INF/MANIFEST.MF
+++ b/generator/org.eclipse.emf.texo.eclipse.generator/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.texo.eclipse.generator;singleton:=true
Bundle-Version: 0.1.0.qualifier
Bundle-Vendor: %pluginProvider
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Require-Bundle: org.eclipse.emf.texo.orm;bundle-version="[0.1.0, 1.1.0)",
org.eclipse.emf.texo.eclipse;bundle-version="[0.1.0, 1.1.0)",
org.eclipse.emf.texo.generator;bundle-version="[0.1.0, 1.1.0)",
diff --git a/generator/org.eclipse.emf.texo.eclipse/.classpath b/generator/org.eclipse.emf.texo.eclipse/.classpath
index 64c5e31b..098194ca 100644
--- a/generator/org.eclipse.emf.texo.eclipse/.classpath
+++ b/generator/org.eclipse.emf.texo.eclipse/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/generator/org.eclipse.emf.texo.eclipse/.settings/org.eclipse.jdt.core.prefs b/generator/org.eclipse.emf.texo.eclipse/.settings/org.eclipse.jdt.core.prefs
index f232949a..f632bbda 100644
--- a/generator/org.eclipse.emf.texo.eclipse/.settings/org.eclipse.jdt.core.prefs
+++ b/generator/org.eclipse.emf.texo.eclipse/.settings/org.eclipse.jdt.core.prefs
@@ -1,15 +1,14 @@
-#Thu Jun 07 19:40:27 CEST 2012
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.targetPlatform=1.7
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.7
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.jdt.core.compiler.source=1.7
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff --git a/generator/org.eclipse.emf.texo.eclipse/META-INF/MANIFEST.MF b/generator/org.eclipse.emf.texo.eclipse/META-INF/MANIFEST.MF
index 0bc26ad1..7b2a8159 100644
--- a/generator/org.eclipse.emf.texo.eclipse/META-INF/MANIFEST.MF
+++ b/generator/org.eclipse.emf.texo.eclipse/META-INF/MANIFEST.MF
@@ -23,6 +23,6 @@ Export-Package: org.eclipse.emf.texo.eclipse;version="0.1.0",
org.eclipse.emf.texo.eclipse.nature;version="0.1.0",
org.eclipse.emf.texo.eclipse.popup.actions;version="0.1.0",
org.eclipse.emf.texo.eclipse.properties;version="0.1.0"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/generator/org.eclipse.emf.texo.generator/.classpath b/generator/org.eclipse.emf.texo.generator/.classpath
index 64c5e31b..098194ca 100644
--- a/generator/org.eclipse.emf.texo.generator/.classpath
+++ b/generator/org.eclipse.emf.texo.generator/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/generator/org.eclipse.emf.texo.generator/.settings/org.eclipse.jdt.core.prefs b/generator/org.eclipse.emf.texo.generator/.settings/org.eclipse.jdt.core.prefs
index 637dd191..d452002b 100644
--- a/generator/org.eclipse.emf.texo.generator/.settings/org.eclipse.jdt.core.prefs
+++ b/generator/org.eclipse.emf.texo.generator/.settings/org.eclipse.jdt.core.prefs
@@ -1,9 +1,8 @@
-#Thu Jun 07 19:40:27 CEST 2012
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.targetPlatform=1.7
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -72,7 +71,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
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.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.7
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff --git a/generator/org.eclipse.emf.texo.generator/META-INF/MANIFEST.MF b/generator/org.eclipse.emf.texo.generator/META-INF/MANIFEST.MF
index 4fbb1ec7..420cb147 100644
--- a/generator/org.eclipse.emf.texo.generator/META-INF/MANIFEST.MF
+++ b/generator/org.eclipse.emf.texo.generator/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 0.1.0.qualifier
Bundle-Vendor: %providerName
Bundle-ClassPath: .
Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Require-Bundle: org.eclipse.emf.texo.annotations.model;bundle-version="[0.1.0,1.1.0)",
org.eclipse.jdt.core;bundle-version="[3.5.0,4.0.0)",
org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
diff --git a/generator/org.eclipse.emf.texo.modelgenerator.edit/.classpath b/generator/org.eclipse.emf.texo.modelgenerator.edit/.classpath
index 64c5e31b..098194ca 100644
--- a/generator/org.eclipse.emf.texo.modelgenerator.edit/.classpath
+++ b/generator/org.eclipse.emf.texo.modelgenerator.edit/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/generator/org.eclipse.emf.texo.modelgenerator.edit/.settings/org.eclipse.jdt.core.prefs b/generator/org.eclipse.emf.texo.modelgenerator.edit/.settings/org.eclipse.jdt.core.prefs
index 0858b9dc..19212765 100644
--- a/generator/org.eclipse.emf.texo.modelgenerator.edit/.settings/org.eclipse.jdt.core.prefs
+++ b/generator/org.eclipse.emf.texo.modelgenerator.edit/.settings/org.eclipse.jdt.core.prefs
@@ -1,11 +1,10 @@
-#Thu Jun 07 19:40:27 CEST 2012
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
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.jdt.core.compiler.source=1.7
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff --git a/generator/org.eclipse.emf.texo.modelgenerator.edit/META-INF/MANIFEST.MF b/generator/org.eclipse.emf.texo.modelgenerator.edit/META-INF/MANIFEST.MF
index 112e6b56..e7972402 100644
--- a/generator/org.eclipse.emf.texo.modelgenerator.edit/META-INF/MANIFEST.MF
+++ b/generator/org.eclipse.emf.texo.modelgenerator.edit/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.texo.modelgenerator.modelannotations.provider.TexoannotationsmodelgeneratorEditPlugin$Implementation
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Export-Package: org.eclipse.emf.texo.modelgenerator.modelannotations.provider;version="0.1.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.emf.texo.modelgenerator;bundle-version="[0.1.0,1.1.0)",
diff --git a/generator/org.eclipse.emf.texo.modelgenerator/.classpath b/generator/org.eclipse.emf.texo.modelgenerator/.classpath
index 7380c130..92c61ad4 100644
--- a/generator/org.eclipse.emf.texo.modelgenerator/.classpath
+++ b/generator/org.eclipse.emf.texo.modelgenerator/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="xtend-gen"/>
<classpathentry kind="src" path="src"/>
diff --git a/generator/org.eclipse.emf.texo.modelgenerator/.settings/org.eclipse.jdt.core.prefs b/generator/org.eclipse.emf.texo.modelgenerator/.settings/org.eclipse.jdt.core.prefs
index 637dd191..d452002b 100644
--- a/generator/org.eclipse.emf.texo.modelgenerator/.settings/org.eclipse.jdt.core.prefs
+++ b/generator/org.eclipse.emf.texo.modelgenerator/.settings/org.eclipse.jdt.core.prefs
@@ -1,9 +1,8 @@
-#Thu Jun 07 19:40:27 CEST 2012
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.targetPlatform=1.7
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -72,7 +71,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
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.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.7
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff --git a/generator/org.eclipse.emf.texo.modelgenerator/META-INF/MANIFEST.MF b/generator/org.eclipse.emf.texo.modelgenerator/META-INF/MANIFEST.MF
index 0840286d..b8dcd52a 100644
--- a/generator/org.eclipse.emf.texo.modelgenerator/META-INF/MANIFEST.MF
+++ b/generator/org.eclipse.emf.texo.modelgenerator/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 0.1.0.qualifier
Bundle-Vendor: %providerName
Bundle-ClassPath: .
Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="[2.5.0,3.0.0)",
org.eclipse.xsd;bundle-version="[2.5.0,3.0.0)",
org.eclipse.emf.texo.annotations.model;bundle-version="[0.1.0,1.1.0)",
diff --git a/generator/org.eclipse.emf.texo.orm.edit/.classpath b/generator/org.eclipse.emf.texo.orm.edit/.classpath
index 64c5e31b..098194ca 100644
--- a/generator/org.eclipse.emf.texo.orm.edit/.classpath
+++ b/generator/org.eclipse.emf.texo.orm.edit/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/generator/org.eclipse.emf.texo.orm.edit/.settings/org.eclipse.jdt.core.prefs b/generator/org.eclipse.emf.texo.orm.edit/.settings/org.eclipse.jdt.core.prefs
index 0858b9dc..19212765 100644
--- a/generator/org.eclipse.emf.texo.orm.edit/.settings/org.eclipse.jdt.core.prefs
+++ b/generator/org.eclipse.emf.texo.orm.edit/.settings/org.eclipse.jdt.core.prefs
@@ -1,11 +1,10 @@
-#Thu Jun 07 19:40:27 CEST 2012
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
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.jdt.core.compiler.source=1.7
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff --git a/generator/org.eclipse.emf.texo.orm.edit/META-INF/MANIFEST.MF b/generator/org.eclipse.emf.texo.orm.edit/META-INF/MANIFEST.MF
index 9915ea5f..a0ebce3e 100644
--- a/generator/org.eclipse.emf.texo.orm.edit/META-INF/MANIFEST.MF
+++ b/generator/org.eclipse.emf.texo.orm.edit/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.texo.orm.ormannotations.provider.TexoannotationsormEditPlugin$Implementation
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Export-Package: org.eclipse.emf.texo.orm.annotations.model.orm.provider;version="0.1.0",
org.eclipse.emf.texo.orm.ormannotations.provider;version="0.1.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
diff --git a/generator/org.eclipse.emf.texo.orm/.classpath b/generator/org.eclipse.emf.texo.orm/.classpath
index 64c5e31b..098194ca 100644
--- a/generator/org.eclipse.emf.texo.orm/.classpath
+++ b/generator/org.eclipse.emf.texo.orm/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/generator/org.eclipse.emf.texo.orm/.settings/org.eclipse.jdt.core.prefs b/generator/org.eclipse.emf.texo.orm/.settings/org.eclipse.jdt.core.prefs
index 0858b9dc..19212765 100644
--- a/generator/org.eclipse.emf.texo.orm/.settings/org.eclipse.jdt.core.prefs
+++ b/generator/org.eclipse.emf.texo.orm/.settings/org.eclipse.jdt.core.prefs
@@ -1,11 +1,10 @@
-#Thu Jun 07 19:40:27 CEST 2012
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
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.jdt.core.compiler.source=1.7
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff --git a/generator/org.eclipse.emf.texo.orm/META-INF/MANIFEST.MF b/generator/org.eclipse.emf.texo.orm/META-INF/MANIFEST.MF
index 4ea10968..370c276e 100644
--- a/generator/org.eclipse.emf.texo.orm/META-INF/MANIFEST.MF
+++ b/generator/org.eclipse.emf.texo.orm/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 0.1.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Export-Package: org.eclipse.emf.texo.orm.annotations.model.orm;version="0.1.0",
org.eclipse.emf.texo.orm.annotations.model.orm.impl;version="0.1.0",
org.eclipse.emf.texo.orm.annotations.model.orm.util;version="0.1.0",
diff --git a/runtime/org.eclipse.emf.texo.demo/model/identifiable.ecore b/runtime/org.eclipse.emf.texo.demo/model/identifiable.ecore
index e13d3430..ae027916 100644
--- a/runtime/org.eclipse.emf.texo.demo/model/identifiable.ecore
+++ b/runtime/org.eclipse.emf.texo.demo/model/identifiable.ecore
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="identifiable"
- nsURI="http://www.eclipse.org/emf/texo/test/model/base/identifiable" nsPrefix="identifiable">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="identifiable" nsURI="http://www.eclipse.org/emf/texo/test/model/base/identifiable"
+ nsPrefix="identifiable">
<eClassifiers xsi:type="ecore:EClass" name="Identifiable" abstract="true">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="db_Id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//ELong"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="db_version" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
diff --git a/runtime/org.eclipse.emf.texo.demo/model/library.ecore b/runtime/org.eclipse.emf.texo.demo/model/library.ecore
index 5cf974e6..7a3e1240 100644
--- a/runtime/org.eclipse.emf.texo.demo/model/library.ecore
+++ b/runtime/org.eclipse.emf.texo.demo/model/library.ecore
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="library"
- nsURI="http://www.eclipse.org/emf/texo/test/model/samples/library" nsPrefix="library">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="library" nsURI="http://www.eclipse.org/emf/texo/test/model/samples/library"
+ nsPrefix="library">
<eAnnotations source="texo.java.annotation">
<details key="type" value="@org.eclipse.emf.texo.test.models.annotations.TestAnnotationOne(&quot;type&quot;)"/>
</eAnnotations>
@@ -13,7 +12,8 @@
<eAnnotations source="org.eclipse.emf.texo">
<details key="title" value="${title} (${pages}) - ${category}"/>
</eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="title" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="title" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
+ defaultValueLiteral="TEST">
<eAnnotations source="texo.java.annotation">
<details key="field" value="@org.eclipse.emf.texo.test.models.annotations.TestAnnotationOne(&quot;field&quot;)&#xA;@org.eclipse.emf.texo.test.models.annotations.TestAnnotationTwo(&quot;field&quot;)"/>
</eAnnotations>
diff --git a/runtime/org.eclipse.emf.texo.demo/src-gen/org/eclipse/emf/texo/test/model/samples/library/Asdad.java b/runtime/org.eclipse.emf.texo.demo/src-gen/org/eclipse/emf/texo/test/model/samples/library/Asdad.java
new file mode 100644
index 00000000..db9b3145
--- /dev/null
+++ b/runtime/org.eclipse.emf.texo.demo/src-gen/org/eclipse/emf/texo/test/model/samples/library/Asdad.java
@@ -0,0 +1,26 @@
+package org.eclipse.emf.texo.test.model.samples.library;
+
+import javax.persistence.Entity;
+import org.eclipse.emf.texo.test.models.annotations.TestAnnotationOne;
+
+/**
+ * A representation of the model object '<em><b>asdad</b></em>'. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+@TestAnnotationOne("type")
+@Entity(name = "library_asdad")
+public class Asdad extends identifiable {
+
+ /**
+ * A toString method which prints the values of all EAttributes of this
+ * instance. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public String toString() {
+ return "asdad ";
+ }
+}
diff --git a/runtime/org.eclipse.emf.texo.demo/src-gen/org/eclipse/emf/texo/test/model/samples/library/Book.java b/runtime/org.eclipse.emf.texo.demo/src-gen/org/eclipse/emf/texo/test/model/samples/library/Book.java
new file mode 100644
index 00000000..9b0751ed
--- /dev/null
+++ b/runtime/org.eclipse.emf.texo.demo/src-gen/org/eclipse/emf/texo/test/model/samples/library/Book.java
@@ -0,0 +1,178 @@
+package org.eclipse.emf.texo.test.model.samples.library;
+
+import javax.persistence.Basic;
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinColumns;
+import javax.persistence.ManyToOne;
+import org.eclipse.emf.texo.test.model.base.identifiable.Identifiable;
+import org.eclipse.emf.texo.test.models.annotations.TestAnnotationOne;
+import org.eclipse.emf.texo.test.models.annotations.TestAnnotationTwo;
+
+/**
+ * A representation of the model object '<em><b>Book</b></em>'. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+@Entity(name = "library_Book")
+@TestAnnotationOne("test")
+public class Book extends Identifiable {
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @TestAnnotationOne("field")
+ @TestAnnotationTwo("field")
+ @Basic()
+ private String title = "TEST";
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @TestAnnotationOne("test")
+ @Basic()
+ private int pages = 100;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @TestAnnotationOne("test")
+ @Basic()
+ @Enumerated(EnumType.STRING)
+ private BookCategory category = BookCategory.SCIENCEFICTION;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @TestAnnotationOne("test")
+ @ManyToOne(cascade = { CascadeType.MERGE, CascadeType.PERSIST,
+ CascadeType.REFRESH }, optional = false)
+ @JoinColumns({ @JoinColumn() })
+ private Writer author = null;
+
+ /**
+ * Returns the value of '<em><b>title</b></em>' feature.
+ *
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return the value of '<em><b>title</b></em>' feature
+ * @generated
+ */
+ public String getTitle() {
+ return title;
+ }
+
+ /**
+ * Sets the '{@link Book#getTitle() <em>title</em>}' feature.
+ *
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @param newTitle
+ * the new value of the '{@link Book#getTitle() title}' feature.
+ * @generated
+ */
+ public void setTitle(String newTitle) {
+ title = newTitle;
+ }
+
+ /**
+ * Returns the value of '<em><b>pages</b></em>' feature.
+ *
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return the value of '<em><b>pages</b></em>' feature
+ * @generated
+ */
+ public int getPages() {
+ return pages;
+ }
+
+ /**
+ * Sets the '{@link Book#getPages() <em>pages</em>}' feature.
+ *
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @param newPages
+ * the new value of the '{@link Book#getPages() pages}' feature.
+ * @generated
+ */
+ public void setPages(int newPages) {
+ pages = newPages;
+ }
+
+ /**
+ * Returns the value of '<em><b>category</b></em>' feature.
+ *
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return the value of '<em><b>category</b></em>' feature
+ * @generated
+ */
+ public BookCategory getCategory() {
+ return category;
+ }
+
+ /**
+ * Sets the '{@link Book#getCategory() <em>category</em>}' feature.
+ *
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @param newCategory
+ * the new value of the '{@link Book#getCategory() category}'
+ * feature.
+ * @generated
+ */
+ public void setCategory(BookCategory newCategory) {
+ category = newCategory;
+ }
+
+ /**
+ * Returns the value of '<em><b>author</b></em>' feature.
+ *
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return the value of '<em><b>author</b></em>' feature
+ * @generated
+ */
+ public Writer getAuthor() {
+ return author;
+ }
+
+ /**
+ * Sets the '{@link Book#getAuthor() <em>author</em>}' feature.
+ *
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @param newAuthor
+ * the new value of the '{@link Book#getAuthor() author}'
+ * feature.
+ * @generated
+ */
+ public void setAuthor(Writer newAuthor) {
+ author = newAuthor;
+ }
+
+ /**
+ * A toString method which prints the values of all EAttributes of this
+ * instance. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public String toString() {
+ return "Book " + " [title: " + getTitle() + "]" + " [pages: "
+ + getPages() + "]" + " [category: " + getCategory() + "]";
+ }
+}
diff --git a/runtime/org.eclipse.emf.texo.demo/src-gen/org/eclipse/emf/texo/test/model/samples/library/BookCategory.java b/runtime/org.eclipse.emf.texo.demo/src-gen/org/eclipse/emf/texo/test/model/samples/library/BookCategory.java
new file mode 100644
index 00000000..f0e04e8f
--- /dev/null
+++ b/runtime/org.eclipse.emf.texo.demo/src-gen/org/eclipse/emf/texo/test/model/samples/library/BookCategory.java
@@ -0,0 +1,244 @@
+package org.eclipse.emf.texo.test.model.samples.library;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import org.eclipse.emf.texo.test.models.annotations.TestAnnotationOne;
+
+/**
+ * A representation of the literals of the enumeration '
+ * <em><b>BookCategory</b></em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+@TestAnnotationOne("enum")
+public enum BookCategory {
+
+ /**
+ * The enum: MYSTERY <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ MYSTERY(0, "Mystery", "Mystery") {
+
+ /**
+ * @return always true for this instance
+ * @generated
+ */
+ @Override
+ public boolean isMystery() {
+ return true;
+ }
+ },
+ /**
+ * The enum: SCIENCEFICTION <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ SCIENCEFICTION(1, "ScienceFiction", "ScienceFiction") {
+
+ /**
+ * @return always true for this instance
+ * @generated
+ */
+ @Override
+ public boolean isScienceFiction() {
+ return true;
+ }
+ },
+ /**
+ * The enum: BIOGRAPHY <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ BIOGRAPHY(2, "Biography", "Biography") {
+
+ /**
+ * @return always true for this instance
+ * @generated
+ */
+ @Override
+ public boolean isBiography() {
+ return true;
+ }
+ };
+
+ /**
+ * An array of all the '<em><b>BookCategory</b></em>' enumerators. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ private static final BookCategory[] VALUES_ARRAY = new BookCategory[] {
+ MYSTERY, SCIENCEFICTION, BIOGRAPHY };
+
+ /**
+ * A public read-only list of all the '<em><b>BookCategory</b></em>'
+ * enumerators. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public static final List<BookCategory> VALUES = Collections
+ .unmodifiableList(Arrays.asList(VALUES_ARRAY));
+
+ /**
+ * Returns the '<em><b>BookCategory</b></em>' literal with the specified
+ * literal value. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @param literal
+ * the literal to use to get the enum instance
+ * @return the BookCategory, the literal enum class
+ * @generated
+ */
+ public static BookCategory get(String literal) {
+ for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+ BookCategory result = VALUES_ARRAY[i];
+ if (result.toString().equals(literal)) {
+ return result;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Returns the '<em><b>BookCategory</b></em>' literal with the specified
+ * name. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @param name
+ * the name to use to get the enum instance
+ * @return the BookCategory, the literal enum class
+ * @generated
+ */
+ public static BookCategory getByName(String name) {
+ for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+ BookCategory result = VALUES_ARRAY[i];
+ if (result.getName().equals(name)) {
+ return result;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Returns the '<em><b>BookCategory</b></em>' literal with the specified
+ * integer value. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @param value
+ * the value to use to get the enum instance
+ * @return the BookCategory, the literal enum
+ * @generated
+ */
+ public static BookCategory get(int value) {
+ for (BookCategory enumInstance : VALUES_ARRAY) {
+ if (enumInstance.getValue() == value) {
+ return enumInstance;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ private final int value;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ private final String name;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ private final String literal;
+
+ /**
+ * Only this class can construct instances. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @generated
+ */
+ private BookCategory(int value, String name, String literal) {
+ this.value = value;
+ this.name = name;
+ this.literal = literal;
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return false, is overridden by actual enum types.
+ * @generated
+ */
+ public boolean isMystery() {
+ return false;
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return false, is overridden by actual enum types.
+ * @generated
+ */
+ public boolean isScienceFiction() {
+ return false;
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return false, is overridden by actual enum types.
+ * @generated
+ */
+ public boolean isBiography() {
+ return false;
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return the value
+ * @generated
+ */
+ public int getValue() {
+ return value;
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return the name
+ * @generated
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return the literal of this enum instance
+ * @generated
+ */
+ public String getLiteral() {
+ return literal;
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return the literal value of the enumerator, which is its string
+ * representation.
+ * @generated
+ */
+ @Override
+ public String toString() {
+ return literal;
+ }
+}
diff --git a/runtime/org.eclipse.emf.texo.demo/src-gen/org/eclipse/emf/texo/test/model/samples/library/Library.java b/runtime/org.eclipse.emf.texo.demo/src-gen/org/eclipse/emf/texo/test/model/samples/library/Library.java
new file mode 100644
index 00000000..188c42ed
--- /dev/null
+++ b/runtime/org.eclipse.emf.texo.demo/src-gen/org/eclipse/emf/texo/test/model/samples/library/Library.java
@@ -0,0 +1,227 @@
+package org.eclipse.emf.texo.test.model.samples.library;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.persistence.Basic;
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.OneToMany;
+import javax.persistence.OrderColumn;
+import org.eclipse.emf.texo.test.model.base.identifiable.Identifiable;
+
+/**
+ * A representation of the model object '<em><b>Library</b></em>'. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+@orgeclipseemftexo.OneDotAnnotation("test")
+@Entity(name = "library_Library")
+public class Library extends Identifiable {
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Basic()
+ private String name = null;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @OneToMany(cascade = { CascadeType.ALL })
+ @OrderColumn()
+ private List<Writer> writers = new ArrayList<Writer>();
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @OneToMany(cascade = { CascadeType.ALL })
+ @OrderColumn()
+ private List<Book> books = new ArrayList<Book>();
+
+ /**
+ * Returns the value of '<em><b>name</b></em>' feature.
+ *
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return the value of '<em><b>name</b></em>' feature
+ * @generated
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * Sets the '{@link Library#getName() <em>name</em>}' feature.
+ *
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @param newName
+ * the new value of the '{@link Library#getName() name}' feature.
+ * @generated
+ */
+ public void setName(String newName) {
+ name = newName;
+ }
+
+ /**
+ * Returns the value of '<em><b>writers</b></em>' feature.
+ *
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return the value of '<em><b>writers</b></em>' feature
+ * @generated
+ */
+ public List<Writer> getWriters() {
+ return writers;
+ }
+
+ /**
+ * Adds to the <em>writers</em> feature.
+ *
+ * @param writersValue
+ * the value to add
+ * @return true if the value is added to the collection (it was not yet
+ * present in the collection), false otherwise
+ * @generated
+ */
+ public boolean addToWriters(Writer writersValue) {
+ if (!writers.contains(writersValue)) {
+ boolean result = writers.add(writersValue);
+ return result;
+ }
+ return false;
+ }
+
+ /**
+ * Removes from the <em>writers</em> feature.
+ *
+ * @param writersValue
+ * the value to remove
+ * @return true if the value is removed from the collection (it existed in
+ * the collection before removing), false otherwise
+ *
+ * @generated
+ */
+ public boolean removeFromWriters(Writer writersValue) {
+ if (writers.contains(writersValue)) {
+ boolean result = writers.remove(writersValue);
+ return result;
+ }
+ return false;
+ }
+
+ /**
+ * Clears the <em>writers</em> feature.
+ *
+ * @generated
+ */
+ public void clearWriters() {
+ while (!writers.isEmpty()) {
+ removeFromWriters(writers.iterator().next());
+ }
+ }
+
+ /**
+ * Sets the '{@link Library#getWriters() <em>writers</em>}' feature.
+ *
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @param newWriters
+ * the new value of the '{@link Library#getWriters() writers}'
+ * feature.
+ * @generated
+ */
+ public void setWriters(List<Writer> newWriters) {
+ writers = newWriters;
+ }
+
+ /**
+ * Returns the value of '<em><b>books</b></em>' feature.
+ *
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return the value of '<em><b>books</b></em>' feature
+ * @generated
+ */
+ public List<Book> getBooks() {
+ return books;
+ }
+
+ /**
+ * Adds to the <em>books</em> feature.
+ *
+ * @param booksValue
+ * the value to add
+ * @return true if the value is added to the collection (it was not yet
+ * present in the collection), false otherwise
+ * @generated
+ */
+ public boolean addToBooks(Book booksValue) {
+ if (!books.contains(booksValue)) {
+ boolean result = books.add(booksValue);
+ return result;
+ }
+ return false;
+ }
+
+ /**
+ * Removes from the <em>books</em> feature.
+ *
+ * @param booksValue
+ * the value to remove
+ * @return true if the value is removed from the collection (it existed in
+ * the collection before removing), false otherwise
+ *
+ * @generated
+ */
+ public boolean removeFromBooks(Book booksValue) {
+ if (books.contains(booksValue)) {
+ boolean result = books.remove(booksValue);
+ return result;
+ }
+ return false;
+ }
+
+ /**
+ * Clears the <em>books</em> feature.
+ *
+ * @generated
+ */
+ public void clearBooks() {
+ while (!books.isEmpty()) {
+ removeFromBooks(books.iterator().next());
+ }
+ }
+
+ /**
+ * Sets the '{@link Library#getBooks() <em>books</em>}' feature.
+ *
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @param newBooks
+ * the new value of the '{@link Library#getBooks() books}'
+ * feature.
+ * @generated
+ */
+ public void setBooks(List<Book> newBooks) {
+ books = newBooks;
+ }
+
+ /**
+ * A toString method which prints the values of all EAttributes of this
+ * instance. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public String toString() {
+ return "Library " + " [name: " + getName() + "]";
+ }
+}
diff --git a/runtime/org.eclipse.emf.texo.demo/src-gen/org/eclipse/emf/texo/test/model/samples/library/Writer.java b/runtime/org.eclipse.emf.texo.demo/src-gen/org/eclipse/emf/texo/test/model/samples/library/Writer.java
new file mode 100644
index 00000000..651e47a9
--- /dev/null
+++ b/runtime/org.eclipse.emf.texo.demo/src-gen/org/eclipse/emf/texo/test/model/samples/library/Writer.java
@@ -0,0 +1,150 @@
+package org.eclipse.emf.texo.test.model.samples.library;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.persistence.Basic;
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.JoinTable;
+import javax.persistence.OneToMany;
+import javax.persistence.OrderColumn;
+import org.eclipse.emf.texo.test.model.base.identifiable.Identifiable;
+import org.eclipse.emf.texo.test.models.annotations.TestAnnotationOne;
+
+/**
+ * A representation of the model object '<em><b>Writer</b></em>'. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+@TestAnnotationOne("type")
+@Entity(name = "library_Writer")
+public class Writer extends Identifiable {
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Basic()
+ private String name = null;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST,
+ CascadeType.REFRESH })
+ @OrderColumn()
+ @JoinTable()
+ private List<Book> books = new ArrayList<Book>();
+
+ /**
+ * Returns the value of '<em><b>name</b></em>' feature.
+ *
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return the value of '<em><b>name</b></em>' feature
+ * @generated
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * Sets the '{@link Writer#getName() <em>name</em>}' feature.
+ *
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @param newName
+ * the new value of the '{@link Writer#getName() name}' feature.
+ * @generated
+ */
+ public void setName(String newName) {
+ name = newName;
+ }
+
+ /**
+ * Returns the value of '<em><b>books</b></em>' feature.
+ *
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return the value of '<em><b>books</b></em>' feature
+ * @generated
+ */
+ public List<Book> getBooks() {
+ return books;
+ }
+
+ /**
+ * Adds to the <em>books</em> feature.
+ *
+ * @param booksValue
+ * the value to add
+ * @return true if the value is added to the collection (it was not yet
+ * present in the collection), false otherwise
+ * @generated
+ */
+ public boolean addToBooks(Book booksValue) {
+ if (!books.contains(booksValue)) {
+ boolean result = books.add(booksValue);
+ return result;
+ }
+ return false;
+ }
+
+ /**
+ * Removes from the <em>books</em> feature.
+ *
+ * @param booksValue
+ * the value to remove
+ * @return true if the value is removed from the collection (it existed in
+ * the collection before removing), false otherwise
+ *
+ * @generated
+ */
+ public boolean removeFromBooks(Book booksValue) {
+ if (books.contains(booksValue)) {
+ boolean result = books.remove(booksValue);
+ return result;
+ }
+ return false;
+ }
+
+ /**
+ * Clears the <em>books</em> feature.
+ *
+ * @generated
+ */
+ public void clearBooks() {
+ while (!books.isEmpty()) {
+ removeFromBooks(books.iterator().next());
+ }
+ }
+
+ /**
+ * Sets the '{@link Writer#getBooks() <em>books</em>}' feature.
+ *
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @param newBooks
+ * the new value of the '{@link Writer#getBooks() books}'
+ * feature.
+ * @generated
+ */
+ public void setBooks(List<Book> newBooks) {
+ books = newBooks;
+ }
+
+ /**
+ * A toString method which prints the values of all EAttributes of this
+ * instance. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public String toString() {
+ return "Writer " + " [name: " + getName() + "]";
+ }
+}
diff --git a/runtime/org.eclipse.emf.texo.demo/src-gen/org/eclipse/emf/texo/test/model/samples/librarymodelclasses/model/LibraryModelFactory.java b/runtime/org.eclipse.emf.texo.demo/src-gen/org/eclipse/emf/texo/test/model/samples/librarymodelclasses/model/LibraryModelFactory.java
new file mode 100644
index 00000000..48e27fcf
--- /dev/null
+++ b/runtime/org.eclipse.emf.texo.demo/src-gen/org/eclipse/emf/texo/test/model/samples/librarymodelclasses/model/LibraryModelFactory.java
@@ -0,0 +1,629 @@
+package org.eclipse.emf.texo.test.model.samples.librarymodelclasses.model;
+
+import java.util.List;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EDataType;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.texo.model.AbstractModelFeatureMapEntry;
+import org.eclipse.emf.texo.model.AbstractModelObject;
+import org.eclipse.emf.texo.model.ModelFactory;
+import org.eclipse.emf.texo.model.ModelFeatureMapEntry;
+import org.eclipse.emf.texo.model.ModelObject;
+import org.eclipse.emf.texo.model.ModelPackage;
+import org.eclipse.emf.texo.test.model.base.identifiable.IdentifiableModelFactory;
+import org.eclipse.emf.texo.test.model.samples.library.Asdad;
+import org.eclipse.emf.texo.test.model.samples.library.Book;
+import org.eclipse.emf.texo.test.model.samples.library.BookCategory;
+import org.eclipse.emf.texo.test.model.samples.library.Library;
+import org.eclipse.emf.texo.test.model.samples.library.Writer;
+
+/**
+ * The <b>{@link ModelFactory}</b> for the types of this model: library. It
+ * contains code to create instances {@link ModelObject} wrappers and instances
+ * for EClasses and convert objects back and forth from their String (XML)
+ * representation. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class LibraryModelFactory implements ModelFactory {
+
+ /**
+ * Creates an instance for an {@link EClass} <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @param eClass
+ * creates a Object instance for this EClass
+ * @return an object representing the eClass
+ * @generated
+ */
+ public Object create(EClass eClass) {
+ switch (eClass.getClassifierID()) {
+ case LibraryModelPackage.BOOK_CLASSIFIER_ID:
+ return createBook();
+ case LibraryModelPackage.WRITER_CLASSIFIER_ID:
+ return createWriter();
+ case LibraryModelPackage.LIBRARY_CLASSIFIER_ID:
+ return createLibrary();
+ case LibraryModelPackage.ASDAD_CLASSIFIER_ID:
+ return createAsdad();
+ default:
+ throw new IllegalArgumentException("The EClass '"
+ + eClass.getName()
+ + "' is not a valid EClass for this EPackage");
+ }
+ }
+
+ /**
+ * Wraps an object in a {@link ModelObject}. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @param eClass
+ * the EClass of the object
+ * @param adaptee
+ * the object being wrapped/adapted
+ * @return the wrapper {@link ModelObject}
+ * @generated
+ */
+ @SuppressWarnings({ "unchecked", "rawtypes" })
+ public ModelObject createModelObject(EClass eClass, Object adaptee) {
+ ModelObject<Object> modelObject = null;
+ switch (eClass.getClassifierID()) {
+ case LibraryModelPackage.BOOK_CLASSIFIER_ID:
+ modelObject = new BookModelObject();
+ break;
+ case LibraryModelPackage.WRITER_CLASSIFIER_ID:
+ modelObject = new WriterModelObject();
+ break;
+ case LibraryModelPackage.LIBRARY_CLASSIFIER_ID:
+ modelObject = new LibraryModelObject();
+ break;
+ case LibraryModelPackage.ASDAD_CLASSIFIER_ID:
+ modelObject = new AsdadModelObject();
+ break;
+ default:
+ throw new IllegalArgumentException("The EClass '" + eClass
+ + "' is not defined in this EPackage");
+ }
+ modelObject.setTarget(adaptee);
+ return modelObject;
+ }
+
+ /**
+ * Creates a feature map entry instance for a certain EStructuralFeature.
+ *
+ * @param eFeature
+ * the feature map feature
+ * @return the pojo feature map entry
+ * @generated
+ */
+ public Object createFeatureMapEntry(EStructuralFeature eFeature) {
+ throw new IllegalArgumentException("The EStructuralFeature '"
+ + eFeature + "' is not a valid feature map in this EPackage");
+ }
+
+ /**
+ * Wraps a feature map entry pojo in a {@link AbstractModelFeatureMapEntry}.
+ * If the feature map entry is null then a new one is created and <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @param eFeature
+ * the feature map feature of the object
+ * @param adaptee
+ * the pojo feature map entry being wrapped/adapted
+ * @return the wrapper {@link ModelFeatureMapEntry}
+ * @generated
+ */
+ public ModelFeatureMapEntry<?> createModelFeatureMapEntry(
+ EStructuralFeature eFeature, Object adaptee) {
+ throw new IllegalArgumentException("The EStructuralFeature '"
+ + eFeature + "' is not a valid feature map in this EPackage");
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return an instance of the model object representing the EClass Book
+ * @generated
+ */
+ public Book createBook() {
+ return new Book();
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return an instance of the model object representing the EClass Writer
+ * @generated
+ */
+ public Writer createWriter() {
+ return new Writer();
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return an instance of the model object representing the EClass Library
+ * @generated
+ */
+ public Library createLibrary() {
+ return new Library();
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return an instance of the model object representing the EClass asdad
+ * @generated
+ */
+ public Asdad createAsdad() {
+ return new Asdad();
+ }
+
+ /**
+ * Converts an instance of an {@link EDataType} to a String. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @param eDataType
+ * the {@link EDataType} defining the type
+ * @param value
+ * the object to convert, if the value is null then null is
+ * returned.
+ * @generated
+ */
+ public Object createFromString(EDataType eDataType, String value) {
+ switch (eDataType.getClassifierID()) {
+ case LibraryModelPackage.BOOKCATEGORY_CLASSIFIER_ID:
+ return createBookCategoryFromString(value);
+ default:
+ throw new IllegalArgumentException("The EDatatype '" + eDataType
+ + "' is not defined in this EPackage");
+ }
+ }
+
+ /**
+ * Converts an instance of an {@link EDataType} to a String. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @param eDataType
+ * the {@link EDataType} defining the type
+ * @param value
+ * the object to convert, if value == null then null is returned
+ * @generated
+ */
+ public String convertToString(EDataType eDataType, Object value) {
+ switch (eDataType.getClassifierID()) {
+ case LibraryModelPackage.BOOKCATEGORY_CLASSIFIER_ID:
+ return convertBookCategoryToString((BookCategory) value);
+ default:
+ throw new IllegalArgumentException("The EDatatype '" + eDataType
+ + "' is not defined in this EPackage.");
+ }
+ }
+
+ /**
+ * Converts the EDataType: BookCategory to a String. <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @param value
+ * the object to convert
+ * @return the String representing the value, if value == null then null is
+ * returned
+ * @generated
+ */
+ public String convertBookCategoryToString(BookCategory value) {
+ if (value == null) {
+ return null;
+ }
+ return value.toString();
+ }
+
+ /**
+ * Creates an instance of the EDataType: BookCategory from a String. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @param value
+ * the string value to convert to an object
+ * @return the instance of the data type, if value == null then null is
+ * returned
+ * @generated
+ */
+ public BookCategory createBookCategoryFromString(String value) {
+ if (value == null) {
+ return null;
+ }
+ return BookCategory.get(value);
+ }
+
+ /**
+ * The adapter/wrapper for the EClass '<em><b>Book</b></em>'.
+ *
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @param <E>
+ * the domain model java class
+ *
+ * @generated
+ */
+ public static class BookModelObject<E extends Book> extends
+ IdentifiableModelFactory.IdentifiableModelObject<E> {
+ /**
+ * @generated
+ */
+ @Override
+ public EClass eClass() {
+ return LibraryModelPackage.INSTANCE.getBookEClass();
+ }
+
+ /**
+ * @generated
+ */
+ @Override
+ public ModelPackage getModelPackage() {
+ return LibraryModelPackage.INSTANCE;
+ }
+
+ /**
+ * @generated
+ */
+ @Override
+ public Object eGet(EStructuralFeature eStructuralFeature) {
+ final int featureID = eClass().getFeatureID(eStructuralFeature);
+ switch (featureID) {
+ case LibraryModelPackage.BOOK_DB_ID_FEATURE_ID:
+ return getTarget().getDb_Id();
+ case LibraryModelPackage.BOOK_DB_VERSION_FEATURE_ID:
+ return getTarget().getDb_version();
+ case LibraryModelPackage.BOOK_TITLE_FEATURE_ID:
+ return getTarget().getTitle();
+ case LibraryModelPackage.BOOK_PAGES_FEATURE_ID:
+ return getTarget().getPages();
+ case LibraryModelPackage.BOOK_CATEGORY_FEATURE_ID:
+ return getTarget().getCategory();
+ case LibraryModelPackage.BOOK_AUTHOR_FEATURE_ID:
+ return getTarget().getAuthor();
+ default:
+ return super.eGet(eStructuralFeature);
+ }
+ }
+
+ /**
+ * @generated
+ */
+ @Override
+ public void eSet(EStructuralFeature eStructuralFeature, Object value) {
+ final int featureID = eClass().getFeatureID(eStructuralFeature);
+ switch (featureID) {
+ case LibraryModelPackage.BOOK_TITLE_FEATURE_ID:
+ getTarget().setTitle((String) value);
+ return;
+ case LibraryModelPackage.BOOK_PAGES_FEATURE_ID:
+ getTarget().setPages((Integer) value);
+ return;
+ case LibraryModelPackage.BOOK_CATEGORY_FEATURE_ID:
+ getTarget().setCategory((BookCategory) value);
+ return;
+ case LibraryModelPackage.BOOK_AUTHOR_FEATURE_ID:
+ getTarget().setAuthor((Writer) value);
+ return;
+ default:
+ super.eSet(eStructuralFeature, value);
+ }
+ }
+
+ /**
+ * @generated
+ */
+ @Override
+ public boolean eAddTo(EStructuralFeature eStructuralFeature,
+ Object value) {
+ final int featureID = eClass().getFeatureID(eStructuralFeature);
+ switch (featureID) {
+
+ default:
+ return super.eAddTo(eStructuralFeature, value);
+ }
+ }
+
+ /**
+ * @generated
+ */
+ @Override
+ public boolean eRemoveFrom(EStructuralFeature eStructuralFeature,
+ Object value) {
+ final int featureID = eClass().getFeatureID(eStructuralFeature);
+ switch (featureID) {
+
+ default:
+ return super.eRemoveFrom(eStructuralFeature, value);
+ }
+ }
+ }
+
+ /**
+ * The adapter/wrapper for the EClass '<em><b>Writer</b></em>'.
+ *
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @param <E>
+ * the domain model java class
+ *
+ * @generated
+ */
+ public static class WriterModelObject<E extends Writer> extends
+ IdentifiableModelFactory.IdentifiableModelObject<E> {
+ /**
+ * @generated
+ */
+ @Override
+ public EClass eClass() {
+ return LibraryModelPackage.INSTANCE.getWriterEClass();
+ }
+
+ /**
+ * @generated
+ */
+ @Override
+ public ModelPackage getModelPackage() {
+ return LibraryModelPackage.INSTANCE;
+ }
+
+ /**
+ * @generated
+ */
+ @Override
+ public Object eGet(EStructuralFeature eStructuralFeature) {
+ final int featureID = eClass().getFeatureID(eStructuralFeature);
+ switch (featureID) {
+ case LibraryModelPackage.WRITER_DB_ID_FEATURE_ID:
+ return getTarget().getDb_Id();
+ case LibraryModelPackage.WRITER_DB_VERSION_FEATURE_ID:
+ return getTarget().getDb_version();
+ case LibraryModelPackage.WRITER_NAME_FEATURE_ID:
+ return getTarget().getName();
+ case LibraryModelPackage.WRITER_BOOKS_FEATURE_ID:
+ return getTarget().getBooks();
+ default:
+ return super.eGet(eStructuralFeature);
+ }
+ }
+
+ /**
+ * @generated
+ */
+ @SuppressWarnings("unchecked")
+ @Override
+ public void eSet(EStructuralFeature eStructuralFeature, Object value) {
+ final int featureID = eClass().getFeatureID(eStructuralFeature);
+ switch (featureID) {
+ case LibraryModelPackage.WRITER_NAME_FEATURE_ID:
+ getTarget().setName((String) value);
+ return;
+ case LibraryModelPackage.WRITER_BOOKS_FEATURE_ID:
+ getTarget().setBooks((List<Book>) value);
+ return;
+ default:
+ super.eSet(eStructuralFeature, value);
+ }
+ }
+
+ /**
+ * @generated
+ */
+ @Override
+ public boolean eAddTo(EStructuralFeature eStructuralFeature,
+ Object value) {
+ final int featureID = eClass().getFeatureID(eStructuralFeature);
+ switch (featureID) {
+
+ case LibraryModelPackage.WRITER_BOOKS_FEATURE_ID:
+ return getTarget().addToBooks((Book) value);
+ default:
+ return super.eAddTo(eStructuralFeature, value);
+ }
+ }
+
+ /**
+ * @generated
+ */
+ @Override
+ public boolean eRemoveFrom(EStructuralFeature eStructuralFeature,
+ Object value) {
+ final int featureID = eClass().getFeatureID(eStructuralFeature);
+ switch (featureID) {
+
+ case LibraryModelPackage.WRITER_BOOKS_FEATURE_ID:
+ return getTarget().removeFromBooks((Book) value);
+ default:
+ return super.eRemoveFrom(eStructuralFeature, value);
+ }
+ }
+ }
+
+ /**
+ * The adapter/wrapper for the EClass '<em><b>Library</b></em>'.
+ *
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @param <E>
+ * the domain model java class
+ *
+ * @generated
+ */
+ public static class LibraryModelObject<E extends Library> extends
+ IdentifiableModelFactory.IdentifiableModelObject<E> {
+ /**
+ * @generated
+ */
+ @Override
+ public EClass eClass() {
+ return LibraryModelPackage.INSTANCE.getLibraryEClass();
+ }
+
+ /**
+ * @generated
+ */
+ @Override
+ public ModelPackage getModelPackage() {
+ return LibraryModelPackage.INSTANCE;
+ }
+
+ /**
+ * @generated
+ */
+ @Override
+ public Object eGet(EStructuralFeature eStructuralFeature) {
+ final int featureID = eClass().getFeatureID(eStructuralFeature);
+ switch (featureID) {
+ case LibraryModelPackage.LIBRARY_DB_ID_FEATURE_ID:
+ return getTarget().getDb_Id();
+ case LibraryModelPackage.LIBRARY_DB_VERSION_FEATURE_ID:
+ return getTarget().getDb_version();
+ case LibraryModelPackage.LIBRARY_NAME_FEATURE_ID:
+ return getTarget().getName();
+ case LibraryModelPackage.LIBRARY_WRITERS_FEATURE_ID:
+ return getTarget().getWriters();
+ case LibraryModelPackage.LIBRARY_BOOKS_FEATURE_ID:
+ return getTarget().getBooks();
+ default:
+ return super.eGet(eStructuralFeature);
+ }
+ }
+
+ /**
+ * @generated
+ */
+ @SuppressWarnings("unchecked")
+ @Override
+ public void eSet(EStructuralFeature eStructuralFeature, Object value) {
+ final int featureID = eClass().getFeatureID(eStructuralFeature);
+ switch (featureID) {
+ case LibraryModelPackage.LIBRARY_NAME_FEATURE_ID:
+ getTarget().setName((String) value);
+ return;
+ case LibraryModelPackage.LIBRARY_WRITERS_FEATURE_ID:
+ getTarget().setWriters((List<Writer>) value);
+ return;
+ case LibraryModelPackage.LIBRARY_BOOKS_FEATURE_ID:
+ getTarget().setBooks((List<Book>) value);
+ return;
+ default:
+ super.eSet(eStructuralFeature, value);
+ }
+ }
+
+ /**
+ * @generated
+ */
+ @Override
+ public boolean eAddTo(EStructuralFeature eStructuralFeature,
+ Object value) {
+ final int featureID = eClass().getFeatureID(eStructuralFeature);
+ switch (featureID) {
+
+ case LibraryModelPackage.LIBRARY_WRITERS_FEATURE_ID:
+ return getTarget().addToWriters((Writer) value);
+
+ case LibraryModelPackage.LIBRARY_BOOKS_FEATURE_ID:
+ return getTarget().addToBooks((Book) value);
+ default:
+ return super.eAddTo(eStructuralFeature, value);
+ }
+ }
+
+ /**
+ * @generated
+ */
+ @Override
+ public boolean eRemoveFrom(EStructuralFeature eStructuralFeature,
+ Object value) {
+ final int featureID = eClass().getFeatureID(eStructuralFeature);
+ switch (featureID) {
+
+ case LibraryModelPackage.LIBRARY_WRITERS_FEATURE_ID:
+ return getTarget().removeFromWriters((Writer) value);
+
+ case LibraryModelPackage.LIBRARY_BOOKS_FEATURE_ID:
+ return getTarget().removeFromBooks((Book) value);
+ default:
+ return super.eRemoveFrom(eStructuralFeature, value);
+ }
+ }
+ }
+
+ /**
+ * The adapter/wrapper for the EClass '<em><b>asdad</b></em>'.
+ *
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @param <E>
+ * the domain model java class
+ *
+ * @generated
+ */
+ public static class AsdadModelObject<E extends Asdad> extends
+ AbstractModelObject<E> {
+ /**
+ * @generated
+ */
+ public EClass eClass() {
+ return LibraryModelPackage.INSTANCE.getAsdadEClass();
+ }
+
+ /**
+ * @generated
+ */
+ public ModelPackage getModelPackage() {
+ return LibraryModelPackage.INSTANCE;
+ }
+
+ /**
+ * @generated
+ */
+ @Override
+ public Object eGet(EStructuralFeature eStructuralFeature) {
+ final int featureID = eClass().getFeatureID(eStructuralFeature);
+ switch (featureID) {
+ default:
+ return super.eGet(eStructuralFeature);
+ }
+ }
+
+ /**
+ * @generated
+ */
+ @Override
+ public void eSet(EStructuralFeature eStructuralFeature, Object value) {
+ final int featureID = eClass().getFeatureID(eStructuralFeature);
+ switch (featureID) {
+ default:
+ super.eSet(eStructuralFeature, value);
+ }
+ }
+
+ /**
+ * @generated
+ */
+ @Override
+ public boolean eAddTo(EStructuralFeature eStructuralFeature,
+ Object value) {
+ final int featureID = eClass().getFeatureID(eStructuralFeature);
+ switch (featureID) {
+ default:
+ return super.eAddTo(eStructuralFeature, value);
+ }
+ }
+
+ /**
+ * @generated
+ */
+ @Override
+ public boolean eRemoveFrom(EStructuralFeature eStructuralFeature,
+ Object value) {
+ final int featureID = eClass().getFeatureID(eStructuralFeature);
+ switch (featureID) {
+ default:
+ return super.eRemoveFrom(eStructuralFeature, value);
+ }
+ }
+ }
+} \ No newline at end of file
diff --git a/runtime/org.eclipse.emf.texo.demo/src-gen/org/eclipse/emf/texo/test/model/samples/librarymodelclasses/model/LibraryModelPackage.java b/runtime/org.eclipse.emf.texo.demo/src-gen/org/eclipse/emf/texo/test/model/samples/librarymodelclasses/model/LibraryModelPackage.java
new file mode 100644
index 00000000..767fa263
--- /dev/null
+++ b/runtime/org.eclipse.emf.texo.demo/src-gen/org/eclipse/emf/texo/test/model/samples/librarymodelclasses/model/LibraryModelPackage.java
@@ -0,0 +1,491 @@
+package org.eclipse.emf.texo.test.model.samples.librarymodelclasses.model;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EEnum;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.texo.model.ModelFactory;
+import org.eclipse.emf.texo.model.ModelPackage;
+import org.eclipse.emf.texo.model.ModelResolver;
+import org.eclipse.emf.texo.test.model.base.identifiable.IdentifiableModelPackage;
+import org.eclipse.emf.texo.test.model.samples.library.Asdad;
+import org.eclipse.emf.texo.test.model.samples.library.Book;
+import org.eclipse.emf.texo.test.model.samples.library.BookCategory;
+import org.eclipse.emf.texo.test.model.samples.library.Library;
+import org.eclipse.emf.texo.test.model.samples.library.Writer;
+import org.eclipse.emf.texo.utils.ModelUtils;
+
+/**
+ * The <b>Package</b> for the model '<em><b>library</b></em>'. It contains
+ * initialization code and access to the Factory to instantiate types of this
+ * package.
+ *
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class LibraryModelPackage extends ModelPackage {
+
+ /**
+ * Is set when the package has been initialized.
+ *
+ * @generated
+ */
+ private static boolean isInitialized = false;
+
+ /**
+ * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public static final String NS_URI = "http://www.eclipse.org/emf/texo/test/model/samples/library";
+
+ /**
+ * The {@link ModelFactory} for this package. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @generated
+ */
+ public static final LibraryModelFactory MODELFACTORY = new LibraryModelFactory();
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public static final int BOOKCATEGORY_CLASSIFIER_ID = 4;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public static final int BOOK_CLASSIFIER_ID = 0;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public static final int BOOK_DB_ID_FEATURE_ID = 0;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public static final int BOOK_DB_VERSION_FEATURE_ID = 1;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public static final int BOOK_TITLE_FEATURE_ID = 2;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public static final int BOOK_PAGES_FEATURE_ID = 3;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public static final int BOOK_CATEGORY_FEATURE_ID = 4;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public static final int BOOK_AUTHOR_FEATURE_ID = 5;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public static final int WRITER_CLASSIFIER_ID = 2;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public static final int WRITER_DB_ID_FEATURE_ID = 0;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public static final int WRITER_DB_VERSION_FEATURE_ID = 1;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public static final int WRITER_NAME_FEATURE_ID = 2;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public static final int WRITER_BOOKS_FEATURE_ID = 3;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public static final int LIBRARY_CLASSIFIER_ID = 1;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public static final int LIBRARY_DB_ID_FEATURE_ID = 0;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public static final int LIBRARY_DB_VERSION_FEATURE_ID = 1;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public static final int LIBRARY_NAME_FEATURE_ID = 2;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public static final int LIBRARY_WRITERS_FEATURE_ID = 3;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public static final int LIBRARY_BOOKS_FEATURE_ID = 4;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public static final int ASDAD_CLASSIFIER_ID = 3;
+
+ /**
+ * The static member with the instance of this {@link ModelPackage}. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public static final LibraryModelPackage INSTANCE = initialize();
+
+ /**
+ * Initializes this {@link ModelPackage}. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @return an initialized instance of this class
+ *
+ * @generated
+ */
+ public static LibraryModelPackage initialize() {
+
+ if (isInitialized) {
+ return (LibraryModelPackage) ModelResolver.getInstance()
+ .getModelPackage(NS_URI);
+ }
+
+ final LibraryModelPackage modelPackage = new LibraryModelPackage();
+
+ ModelResolver.getInstance().registerModelPackage(modelPackage);
+
+ // read the model from the ecore file, the EPackage is registered in the
+ // EPackage.Registry
+ // see the ModelResolver getEPackageRegistry method
+ ModelUtils.readEPackagesFromFile(modelPackage);
+
+ isInitialized = true;
+
+ IdentifiableModelPackage.initialize();
+
+ // force the initialization of the EFactory proxy
+ modelPackage.getEPackage();
+
+ // register the relation between a Class and its EClassifier
+ ModelResolver.getInstance().registerClassModelMapping(Book.class,
+ modelPackage.getBookEClass(), modelPackage);
+ ModelResolver.getInstance().registerClassModelMapping(Writer.class,
+ modelPackage.getWriterEClass(), modelPackage);
+ ModelResolver.getInstance().registerClassModelMapping(Library.class,
+ modelPackage.getLibraryEClass(), modelPackage);
+ ModelResolver.getInstance().registerClassModelMapping(Asdad.class,
+ modelPackage.getAsdadEClass(), modelPackage);
+
+ ModelResolver.getInstance().registerClassModelMapping(
+ BookCategory.class, modelPackage.getBookCategoryEEnum(),
+ modelPackage);
+
+ // and return ourselves
+ return modelPackage;
+ }
+
+ /**
+ * Returns the {@link ModelFactory} of this ModelPackage. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return the {@link LibraryModelFactory} instance.
+ * @generated
+ */
+ @Override
+ public LibraryModelFactory getModelFactory() {
+ return MODELFACTORY;
+ }
+
+ /**
+ * Returns the nsUri of the {@link EPackage} managed by this Package
+ * instance. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return the nsUri of the EPackage
+ * @generated
+ */
+ @Override
+ public String getNsURI() {
+ return NS_URI;
+ }
+
+ /**
+ * Returns the name of the ecore file containing the ecore model of the
+ * {@link EPackage} managed here. <!-- begin-user-doc --> <!-- end-user-doc
+ * -->
+ *
+ * @return the name of the ecore file
+ * @generated
+ */
+ @Override
+ public String getEcoreFileName() {
+ return "library.ecore";
+ }
+
+ /**
+ * Returns the {@link EClass} '<em><b>Book</b></em>'. <!-- begin-user-doc
+ * --> <!-- end-user-doc -->
+ *
+ * @return an instance of the {@link EClass} '<em><b>Book</b></em>'
+ * @generated
+ */
+ public EClass getBookEClass() {
+ return (EClass) getEPackage().getEClassifiers().get(BOOK_CLASSIFIER_ID);
+ }
+
+ /**
+ * Returns the {@link EStructuralFeature} '<em><b>Book.title</b></em>'. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return an instance of the {@link EStructuralFeature}: '
+ * <em><b>Book.title</b></em>'.
+ * @generated
+ */
+ public EAttribute getBook_Title() {
+ return (EAttribute) getBookEClass().getEAllStructuralFeatures().get(
+ BOOK_TITLE_FEATURE_ID);
+ }
+
+ /**
+ * Returns the {@link EStructuralFeature} '<em><b>Book.pages</b></em>'. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return an instance of the {@link EStructuralFeature}: '
+ * <em><b>Book.pages</b></em>'.
+ * @generated
+ */
+ public EAttribute getBook_Pages() {
+ return (EAttribute) getBookEClass().getEAllStructuralFeatures().get(
+ BOOK_PAGES_FEATURE_ID);
+ }
+
+ /**
+ * Returns the {@link EStructuralFeature} '<em><b>Book.category</b></em>'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return an instance of the {@link EStructuralFeature}: '
+ * <em><b>Book.category</b></em>'.
+ * @generated
+ */
+ public EAttribute getBook_Category() {
+ return (EAttribute) getBookEClass().getEAllStructuralFeatures().get(
+ BOOK_CATEGORY_FEATURE_ID);
+ }
+
+ /**
+ * Returns the {@link EStructuralFeature} '<em><b>Book.author</b></em>'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return an instance of the {@link EStructuralFeature}: '
+ * <em><b>Book.author</b></em>'.
+ * @generated
+ */
+ public EReference getBook_Author() {
+ return (EReference) getBookEClass().getEAllStructuralFeatures().get(
+ BOOK_AUTHOR_FEATURE_ID);
+ }
+
+ /**
+ * Returns the {@link EClass} '<em><b>Writer</b></em>'. <!-- begin-user-doc
+ * --> <!-- end-user-doc -->
+ *
+ * @return an instance of the {@link EClass} '<em><b>Writer</b></em>'
+ * @generated
+ */
+ public EClass getWriterEClass() {
+ return (EClass) getEPackage().getEClassifiers().get(
+ WRITER_CLASSIFIER_ID);
+ }
+
+ /**
+ * Returns the {@link EStructuralFeature} '<em><b>Writer.name</b></em>'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return an instance of the {@link EStructuralFeature}: '
+ * <em><b>Writer.name</b></em>'.
+ * @generated
+ */
+ public EAttribute getWriter_Name() {
+ return (EAttribute) getWriterEClass().getEAllStructuralFeatures().get(
+ WRITER_NAME_FEATURE_ID);
+ }
+
+ /**
+ * Returns the {@link EStructuralFeature} '<em><b>Writer.books</b></em>'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return an instance of the {@link EStructuralFeature}: '
+ * <em><b>Writer.books</b></em>'.
+ * @generated
+ */
+ public EReference getWriter_Books() {
+ return (EReference) getWriterEClass().getEAllStructuralFeatures().get(
+ WRITER_BOOKS_FEATURE_ID);
+ }
+
+ /**
+ * Returns the {@link EClass} '<em><b>Library</b></em>'. <!-- begin-user-doc
+ * --> <!-- end-user-doc -->
+ *
+ * @return an instance of the {@link EClass} '<em><b>Library</b></em>'
+ * @generated
+ */
+ public EClass getLibraryEClass() {
+ return (EClass) getEPackage().getEClassifiers().get(
+ LIBRARY_CLASSIFIER_ID);
+ }
+
+ /**
+ * Returns the {@link EStructuralFeature} '<em><b>Library.name</b></em>'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return an instance of the {@link EStructuralFeature}: '
+ * <em><b>Library.name</b></em>'.
+ * @generated
+ */
+ public EAttribute getLibrary_Name() {
+ return (EAttribute) getLibraryEClass().getEAllStructuralFeatures().get(
+ LIBRARY_NAME_FEATURE_ID);
+ }
+
+ /**
+ * Returns the {@link EStructuralFeature} '<em><b>Library.writers</b></em>'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return an instance of the {@link EStructuralFeature}: '
+ * <em><b>Library.writers</b></em>'.
+ * @generated
+ */
+ public EReference getLibrary_Writers() {
+ return (EReference) getLibraryEClass().getEAllStructuralFeatures().get(
+ LIBRARY_WRITERS_FEATURE_ID);
+ }
+
+ /**
+ * Returns the {@link EStructuralFeature} '<em><b>Library.books</b></em>'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return an instance of the {@link EStructuralFeature}: '
+ * <em><b>Library.books</b></em>'.
+ * @generated
+ */
+ public EReference getLibrary_Books() {
+ return (EReference) getLibraryEClass().getEAllStructuralFeatures().get(
+ LIBRARY_BOOKS_FEATURE_ID);
+ }
+
+ /**
+ * Returns the {@link EClass} '<em><b>asdad</b></em>'. <!-- begin-user-doc
+ * --> <!-- end-user-doc -->
+ *
+ * @return an instance of the {@link EClass} '<em><b>asdad</b></em>'
+ * @generated
+ */
+ public EClass getAsdadEClass() {
+ return (EClass) getEPackage().getEClassifiers()
+ .get(ASDAD_CLASSIFIER_ID);
+ }
+
+ /**
+ * Returns the EEnum '<em><b>BookCategory</b></em>'. <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return an instance of the EEnum representing '
+ * <em><b>BookCategory</b></em>'
+ * @generated
+ */
+ public EEnum getBookCategoryEEnum() {
+ return (EEnum) getEPackage().getEClassifiers().get(
+ BOOKCATEGORY_CLASSIFIER_ID);
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @param eClassifier
+ * the {@link EClassifier}
+ * @return the class implementing a specific {@link EClass}.
+ * @generated
+ */
+ @Override
+ public Class<?> getEClassifierClass(EClassifier eClassifier) {
+ switch (eClassifier.getClassifierID()) {
+ case BOOK_CLASSIFIER_ID:
+ return Book.class;
+ case WRITER_CLASSIFIER_ID:
+ return Writer.class;
+ case LIBRARY_CLASSIFIER_ID:
+ return Library.class;
+ case ASDAD_CLASSIFIER_ID:
+ return Asdad.class;
+ case BOOKCATEGORY_CLASSIFIER_ID:
+ return BookCategory.class;
+ default:
+ throw new IllegalArgumentException("The EClassifier '"
+ + eClassifier + "' is not defined in this EPackage");
+ }
+ }
+}
diff --git a/runtime/org.eclipse.emf.texo.demo/src-gen/org/eclipse/emf/texo/test/model/samples/librarymodelclasses/model/library.ecore b/runtime/org.eclipse.emf.texo.demo/src-gen/org/eclipse/emf/texo/test/model/samples/librarymodelclasses/model/library.ecore
new file mode 100644
index 00000000..2d1c8ef3
--- /dev/null
+++ b/runtime/org.eclipse.emf.texo.demo/src-gen/org/eclipse/emf/texo/test/model/samples/librarymodelclasses/model/library.ecore
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="library" nsURI="http://www.eclipse.org/emf/texo/test/model/samples/library"
+ nsPrefix="library">
+ <eAnnotations source="texo.java.annotation">
+ <details key="type" value="@org.eclipse.emf.texo.test.models.annotations.TestAnnotationOne(&quot;type&quot;)"/>
+ </eAnnotations>
+ <eClassifiers xsi:type="ecore:EClass" name="Book" eSuperTypes="http://www.eclipse.org/emf/texo/test/model/base/identifiable#//Identifiable">
+ <eAnnotations source="texo.java.annotation">
+ <details key="value" value="@org.eclipse.emf.texo.test.models.annotations.TestAnnotationOne(&quot;test&quot;)"/>
+ </eAnnotations>
+ <eAnnotations source="org.eclipse.emf.texo">
+ <details key="title" value="${title} (${pages}) - ${category}"/>
+ </eAnnotations>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="title" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
+ defaultValueLiteral="TEST">
+ <eAnnotations source="texo.java.annotation">
+ <details key="field" value="@org.eclipse.emf.texo.test.models.annotations.TestAnnotationOne(&quot;field&quot;)&#xA;@org.eclipse.emf.texo.test.models.annotations.TestAnnotationTwo(&quot;field&quot;)"/>
+ </eAnnotations>
+ <eAnnotations source="org.eclipse.emf.texo">
+ <details key="id" value="true"/>
+ <details key="java.member" value="title"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="pages" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
+ defaultValueLiteral="100">
+ <eAnnotations source="texo.java.annotation">
+ <details key="getter" value="@org.eclipse.emf.texo.test.models.annotations.TestAnnotationOne(&quot;getter&quot;)"/>
+ </eAnnotations>
+ <eAnnotations source="org.eclipse.emf.texo">
+ <details key="java.member" value="pages"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="category" eType="#//BookCategory"
+ defaultValueLiteral="ScienceFiction">
+ <eAnnotations source="org.eclipse.emf.texo">
+ <details key="java.member" value="category"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="author" lowerBound="1"
+ eType="#//Writer" eOpposite="#//Writer/books">
+ <eAnnotations source="texo.java.annotation">
+ <details key="setter" value="@org.eclipse.emf.texo.test.models.annotations.TestAnnotationOne(&quot;setter&quot;)"/>
+ </eAnnotations>
+ <eAnnotations source="org.eclipse.emf.texo">
+ <details key="java.member" value="author"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Library" eSuperTypes="http://www.eclipse.org/emf/texo/test/model/base/identifiable#//Identifiable">
+ <eAnnotations source="texo.java.annotation">
+ <details key="type" value="@orgeclipseemftexo.OneDotAnnotation(&quot;test&quot;)"/>
+ </eAnnotations>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+ <eAnnotations source="org.eclipse.emf.texo">
+ <details key="java.member" value="name"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="writers" upperBound="-1"
+ eType="#//Writer" containment="true">
+ <eAnnotations source="org.eclipse.emf.texo">
+ <details key="java.member" value="writers"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="books" upperBound="-1"
+ eType="#//Book" containment="true">
+ <eAnnotations source="org.eclipse.emf.texo">
+ <details key="java.member" value="books"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Writer" eSuperTypes="http://www.eclipse.org/emf/texo/test/model/base/identifiable#//Identifiable">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+ <eAnnotations source="org.eclipse.emf.texo">
+ <details key="title" value="true"/>
+ <details key="id" value="true"/>
+ <details key="java.member" value="name"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="books" upperBound="-1"
+ eType="#//Book" eOpposite="#//Book/author">
+ <eAnnotations source="org.eclipse.emf.texo">
+ <details key="java.member" value="books"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="asdad"/>
+ <eClassifiers xsi:type="ecore:EEnum" name="BookCategory">
+ <eAnnotations source="texo.java.annotation">
+ <details key="type" value="@org.eclipse.emf.texo.test.models.annotations.TestAnnotationOne(&quot;enum&quot;)"/>
+ </eAnnotations>
+ <eLiterals name="Mystery"/>
+ <eLiterals name="ScienceFiction" value="1"/>
+ <eLiterals name="Biography" value="2"/>
+ </eClassifiers>
+</ecore:EPackage>
diff --git a/runtime/org.eclipse.emf.texo.jetty/.classpath b/runtime/org.eclipse.emf.texo.jetty/.classpath
index 64c5e31b..098194ca 100644
--- a/runtime/org.eclipse.emf.texo.jetty/.classpath
+++ b/runtime/org.eclipse.emf.texo.jetty/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/runtime/org.eclipse.emf.texo.jetty/.settings/org.eclipse.jdt.core.prefs b/runtime/org.eclipse.emf.texo.jetty/.settings/org.eclipse.jdt.core.prefs
index faf6231c..f42de363 100644
--- a/runtime/org.eclipse.emf.texo.jetty/.settings/org.eclipse.jdt.core.prefs
+++ b/runtime/org.eclipse.emf.texo.jetty/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,7 @@
-#Thu Nov 04 16:04:18 CET 2010
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
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.jdt.core.compiler.source=1.7
diff --git a/runtime/org.eclipse.emf.texo.jetty/META-INF/MANIFEST.MF b/runtime/org.eclipse.emf.texo.jetty/META-INF/MANIFEST.MF
index d5911b26..bfe9a66e 100644
--- a/runtime/org.eclipse.emf.texo.jetty/META-INF/MANIFEST.MF
+++ b/runtime/org.eclipse.emf.texo.jetty/META-INF/MANIFEST.MF
@@ -5,10 +5,10 @@ Bundle-SymbolicName: org.eclipse.emf.texo.jetty
Bundle-Version: 0.1.0.qualifier
Bundle-Activator: org.eclipse.emf.texo.jetty.Activator
Bundle-Vendor: %providerName
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Import-Package: javax.servlet.http;version="2.5.0",
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Import-Package: javax.servlet.http;version="3.1.0",
javax.servlet.jsp.tagext;version="2.1";resolution:=optional,
javax.servlet.jsp;version="2.1";resolution:=optional,
- javax.servlet;version="2.5.0",
+ javax.servlet;version="3.1.0",
org.osgi.framework;version="1.3.0"
Web-ContextPath: /texo
diff --git a/runtime/org.eclipse.emf.texo.server/.classpath b/runtime/org.eclipse.emf.texo.server/.classpath
index 64c5e31b..91659e04 100644
--- a/runtime/org.eclipse.emf.texo.server/.classpath
+++ b/runtime/org.eclipse.emf.texo.server/.classpath
@@ -1,7 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
+ <attributes>
+ <attribute name="org.eclipse.jst.component.nondependency" value=""/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.7.0">
+ <attributes>
+ <attribute name="owner.project.facets" value="java"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/runtime/org.eclipse.emf.texo.server/.settings/org.eclipse.jdt.core.prefs b/runtime/org.eclipse.emf.texo.server/.settings/org.eclipse.jdt.core.prefs
index f578e6d5..d452002b 100644
--- a/runtime/org.eclipse.emf.texo.server/.settings/org.eclipse.jdt.core.prefs
+++ b/runtime/org.eclipse.emf.texo.server/.settings/org.eclipse.jdt.core.prefs
@@ -1,9 +1,8 @@
-#Thu Mar 29 22:20:19 CEST 2012
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.targetPlatform=1.7
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -72,7 +71,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
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.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.7
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff --git a/runtime/org.eclipse.emf.texo.server/.settings/org.eclipse.wst.common.project.facet.core.xml b/runtime/org.eclipse.emf.texo.server/.settings/org.eclipse.wst.common.project.facet.core.xml
index 7a1c5688..77fedc87 100644
--- a/runtime/org.eclipse.emf.texo.server/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/runtime/org.eclipse.emf.texo.server/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -3,6 +3,6 @@
<runtime name="Apache Tomcat v7.0"/>
<fixed facet="java"/>
<fixed facet="jst.utility"/>
- <installed facet="java" version="1.5"/>
<installed facet="jst.utility" version="1.0"/>
+ <installed facet="java" version="1.7"/>
</faceted-project>
diff --git a/runtime/org.eclipse.emf.texo.server/META-INF/MANIFEST.MF b/runtime/org.eclipse.emf.texo.server/META-INF/MANIFEST.MF
index 037c4d23..00575815 100644
--- a/runtime/org.eclipse.emf.texo.server/META-INF/MANIFEST.MF
+++ b/runtime/org.eclipse.emf.texo.server/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.emf.texo.server
Bundle-Version: 0.1.0.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)",
org.eclipse.emf.texo;bundle-version="[0.1.0,1.1.0)",
org.eclipse.emf.texo.xml;bundle-version="[0.1.0,1.1.0)",
@@ -19,5 +19,5 @@ Export-Package: org.eclipse.emf.texo.server.model.request;version="0.1.0",
org.eclipse.emf.texo.server.service.xml;version="0.1.0",
org.eclipse.emf.texo.server.store;version="0.1.0",
org.eclipse.emf.texo.server.web;version="0.1.0"
-Import-Package: javax.servlet;version="[3.0.0,4.0.0)",
- javax.servlet.http;version="[3.0.0,4.0.0)"
+Import-Package: javax.servlet;version="[3.1.0,4.0.0)",
+ javax.servlet.http;version="[3.1.0,4.0.0)"
diff --git a/tests/org.eclipse.emf.texo.datagenerator.test/.classpath b/tests/org.eclipse.emf.texo.datagenerator.test/.classpath
index 64c5e31b..098194ca 100644
--- a/tests/org.eclipse.emf.texo.datagenerator.test/.classpath
+++ b/tests/org.eclipse.emf.texo.datagenerator.test/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/tests/org.eclipse.emf.texo.datagenerator.test/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.emf.texo.datagenerator.test/.settings/org.eclipse.jdt.core.prefs
index 637dd191..d452002b 100644
--- a/tests/org.eclipse.emf.texo.datagenerator.test/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.emf.texo.datagenerator.test/.settings/org.eclipse.jdt.core.prefs
@@ -1,9 +1,8 @@
-#Thu Jun 07 19:40:27 CEST 2012
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.targetPlatform=1.7
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -72,7 +71,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
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.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.7
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff --git a/tests/org.eclipse.emf.texo.datagenerator.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.texo.datagenerator.test/META-INF/MANIFEST.MF
index 590b84c8..b900b89d 100644
--- a/tests/org.eclipse.emf.texo.datagenerator.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.texo.datagenerator.test/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 0.1.0.qualifier
Bundle-Vendor: %providerName
Bundle-ClassPath: .
Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Require-Bundle: org.eclipse.emf.texo;bundle-version="[0.1.0,1.1.0)",
org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)",
org.eclipse.emf.texo.test.model;bundle-version="[0.1.0,1.1.0)",
diff --git a/tests/org.eclipse.emf.texo.json.test/.classpath b/tests/org.eclipse.emf.texo.json.test/.classpath
index 64c5e31b..098194ca 100644
--- a/tests/org.eclipse.emf.texo.json.test/.classpath
+++ b/tests/org.eclipse.emf.texo.json.test/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/tests/org.eclipse.emf.texo.json.test/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.emf.texo.json.test/.settings/org.eclipse.jdt.core.prefs
index 158e58d2..bbfb86de 100644
--- a/tests/org.eclipse.emf.texo.json.test/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.emf.texo.json.test/.settings/org.eclipse.jdt.core.prefs
@@ -1,11 +1,15 @@
-#Fri Mar 30 04:11:57 CEST 2012
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.7
+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.jdt.core.compiler.source=1.7
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff --git a/tests/org.eclipse.emf.texo.json.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.texo.json.test/META-INF/MANIFEST.MF
index 30ce153f..d4455ab8 100644
--- a/tests/org.eclipse.emf.texo.json.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.texo.json.test/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.texo.json.test
Bundle-Version: 0.1.0.qualifier
Bundle-Vendor: %pluginProvider
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Require-Bundle: org.json;bundle-version="[1.0.0,2.0.0)",
org.eclipse.emf.texo;bundle-version="[0.1.0,1.1.0)",
org.eclipse.emf.texo.json;bundle-version="[0.1.0,1.1.0)",
diff --git a/tests/org.eclipse.emf.texo.modelgenerator.test/.classpath b/tests/org.eclipse.emf.texo.modelgenerator.test/.classpath
index 16057af7..6a42377b 100644
--- a/tests/org.eclipse.emf.texo.modelgenerator.test/.classpath
+++ b/tests/org.eclipse.emf.texo.modelgenerator.test/.classpath
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="src-gen/"/>
+ <classpathentry kind="src" path="src-gen"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/tests/org.eclipse.emf.texo.modelgenerator.test/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.emf.texo.modelgenerator.test/.settings/org.eclipse.jdt.core.prefs
index 637dd191..d452002b 100644
--- a/tests/org.eclipse.emf.texo.modelgenerator.test/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.emf.texo.modelgenerator.test/.settings/org.eclipse.jdt.core.prefs
@@ -1,9 +1,8 @@
-#Thu Jun 07 19:40:27 CEST 2012
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.targetPlatform=1.7
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -72,7 +71,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
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.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.7
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff --git a/tests/org.eclipse.emf.texo.modelgenerator.test/EclipseModelGeneratorSingleModelTest.launch b/tests/org.eclipse.emf.texo.modelgenerator.test/EclipseModelGeneratorSingleModelTest.launch
index 4c220640..fe5a63aa 100755
--- a/tests/org.eclipse.emf.texo.modelgenerator.test/EclipseModelGeneratorSingleModelTest.launch
+++ b/tests/org.eclipse.emf.texo.modelgenerator.test/EclipseModelGeneratorSingleModelTest.launch
@@ -11,7 +11,7 @@
<booleanAttribute key="clearws" value="true"/>
<booleanAttribute key="clearwslog" value="true"/>
<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
-<booleanAttribute key="default" value="false"/>
+<booleanAttribute key="default" value="true"/>
<booleanAttribute key="includeOptional" value="false"/>
<stringAttribute key="location" value="${workspace_loc}/../texo-gen-workspace"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
@@ -33,7 +33,7 @@
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
<booleanAttribute key="run_in_ui_thread" value="true"/>
-<stringAttribute key="selected_target_plugins" value="com.google.guava@default:default,com.google.inject@default:default,com.ibm.icu@default:default,javax.annotation@default:default,javax.inject@default:default,javax.transaction@default:false,javax.xml@default:default,org.antlr.runtime@default:default,org.apache.batik.css@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.commons.cli@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging@default:default,org.apache.log4j@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.beans@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.java7@default:false,org.eclipse.core.filesystem.linux.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.debug.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.emf.codegen.ecore.ui@default:default,org.eclipse.emf.codegen.ecore.xtext.ui@default:default,org.eclipse.emf.codegen.ecore.xtext@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.emf.codegen@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.editor@default:default,org.eclipse.emf.ecore.xcore.lib@default:default,org.eclipse.emf.ecore.xcore.ui@default:default,org.eclipse.emf.ecore.xcore@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.emf.mwe.core@default:default,org.eclipse.emf.mwe2.runtime@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.bidi@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,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@default:default,org.eclipse.equinox.util@default:default,org.eclipse.help@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jetty.osgi.npn.fragment@default:false,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.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.eclipse.search@default:default,org.eclipse.swt.gtk.linux.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.console@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.xpand@default:default,org.eclipse.xsd@default:default,org.eclipse.xtend.lib@default:default,org.eclipse.xtend@default:default,org.eclipse.xtext.builder@default:default,org.eclipse.xtext.common.types.ui@default:default,org.eclipse.xtext.common.types@default:default,org.eclipse.xtext.ecore@default:default,org.eclipse.xtext.logging@default:false,org.eclipse.xtext.ui.codetemplates.ui@default:default,org.eclipse.xtext.ui.codetemplates@default:default,org.eclipse.xtext.ui.ecore@default:default,org.eclipse.xtext.ui.shared@default:default,org.eclipse.xtext.ui@default:default,org.eclipse.xtext.util@default:default,org.eclipse.xtext.xbase.lib@default:default,org.eclipse.xtext.xbase.ui@default:default,org.eclipse.xtext.xbase@default:default,org.eclipse.xtext.xtext.ui@default:default,org.eclipse.xtext@default:default,org.hamcrest.core@default:default,org.junit*4.11.0.v201303080030@default:default,org.objectweb.asm*3.3.1.v201105211655@default:default,org.objectweb.asm*5.0.1.v201404251740@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
+<stringAttribute key="selected_target_plugins" value="com.google.guava@default:default,com.google.inject@default:default,com.ibm.icu@default:default,javax.annotation@default:default,javax.inject@default:default,javax.transaction@default:false,javax.xml@default:default,org.antlr.runtime@default:default,org.apache.batik.css@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.commons.cli@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging*1.0.4.v201101211617@default:default,org.apache.commons.logging*1.1.1.v201101211721@default:default,org.apache.log4j*1.2.15.v201012070815@default:default,org.apache.log4j*1.2.16.201310261216@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.beans@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.java7@default:false,org.eclipse.core.filesystem.linux.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.debug.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.emf.codegen.ecore.ui@default:default,org.eclipse.emf.codegen.ecore.xtext.ui@default:default,org.eclipse.emf.codegen.ecore.xtext@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.emf.codegen@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.editor@default:default,org.eclipse.emf.ecore.xcore.lib@default:default,org.eclipse.emf.ecore.xcore.ui@default:default,org.eclipse.emf.ecore.xcore@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.emf.mwe.core@default:default,org.eclipse.emf.mwe2.runtime@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.bidi@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,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@default:default,org.eclipse.equinox.util@default:default,org.eclipse.help@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jetty.osgi.npn.fragment@default:false,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.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.eclipse.search@default:default,org.eclipse.swt.gtk.linux.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.console@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.xpand@default:default,org.eclipse.xsd@default:default,org.eclipse.xtend.lib.macro@default:default,org.eclipse.xtend.lib@default:default,org.eclipse.xtend@default:default,org.eclipse.xtext.builder@default:default,org.eclipse.xtext.common.types.ui@default:default,org.eclipse.xtext.common.types@default:default,org.eclipse.xtext.ecore@default:default,org.eclipse.xtext.logging@default:false,org.eclipse.xtext.ui.codetemplates.ui@default:default,org.eclipse.xtext.ui.codetemplates@default:default,org.eclipse.xtext.ui.ecore@default:default,org.eclipse.xtext.ui.shared@default:default,org.eclipse.xtext.ui@default:default,org.eclipse.xtext.util@default:default,org.eclipse.xtext.xbase.lib@default:default,org.eclipse.xtext.xbase.ui@default:default,org.eclipse.xtext.xbase@default:default,org.eclipse.xtext.xtext.ui@default:default,org.eclipse.xtext@default:default,org.hamcrest.core@default:default,org.junit*4.11.0.v201303080030@default:default,org.objectweb.asm*3.3.1.v201105211655@default:default,org.objectweb.asm*5.0.1.v201404251740@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.texo.annotations.model@default:default,org.eclipse.emf.texo.eclipse@default:default,org.eclipse.emf.texo.generator@default:default,org.eclipse.emf.texo.modelgenerator.test@default:default,org.eclipse.emf.texo.modelgenerator@default:default,org.eclipse.emf.texo.orm@default:default,org.eclipse.emf.texo@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<booleanAttribute key="tracing" value="false"/>
diff --git a/tests/org.eclipse.emf.texo.modelgenerator.test/HudsonModelGeneratorTest.launch b/tests/org.eclipse.emf.texo.modelgenerator.test/HudsonModelGeneratorTest.launch
index 81710e40..5d27881a 100644
--- a/tests/org.eclipse.emf.texo.modelgenerator.test/HudsonModelGeneratorTest.launch
+++ b/tests/org.eclipse.emf.texo.modelgenerator.test/HudsonModelGeneratorTest.launch
@@ -24,7 +24,7 @@
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<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.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.texo.modelgenerator.test.EclipseModelGeneratorTest"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.emf.texo.modelgenerator.test"/>
diff --git a/tests/org.eclipse.emf.texo.modelgenerator.test/bin/org/eclipse/emf/texo/modelgenerator/test/test_gen_model.oaw b/tests/org.eclipse.emf.texo.modelgenerator.test/bin/org/eclipse/emf/texo/modelgenerator/test/test_gen_model.oaw
deleted file mode 100644
index 72a68891..00000000
--- a/tests/org.eclipse.emf.texo.modelgenerator.test/bin/org/eclipse/emf/texo/modelgenerator/test/test_gen_model.oaw
+++ /dev/null
@@ -1,10 +0,0 @@
-<workflow>
- <component class="org.eclipse.xpand2.Generator">
- <fileEncoding value="UTF-8"/>
- <metaModel class="org.eclipse.xtend.type.impl.java.JavaMetaModel"/>
- <expand value="org::eclipse::emf::texo::modelgenerator::templates::model::root(modelContext) FOREACH modelContext.EPackages"/>
- <outlet path='/home/mtaal/mydata/dev/workspaces/texo/org.eclipse.emf.texo.test.model/src-test-gen'/>
- <outlet name="java" path='/home/mtaal/mydata/dev/workspaces/texo/org.eclipse.emf.texo.test.model/src-test-gen'/>
- <beautifier class="org.eclipse.xpand2.output.JavaBeautifier" configFile="org/eclipse/emf/texo/modelgenerator/test/formatter.prefs"/>
- </component>
-</workflow>
diff --git a/tests/org.eclipse.emf.texo.modelgenerator.test/src/org/eclipse/emf/texo/modelgenerator/test/EclipseModelGeneratorSingleModelTest.java b/tests/org.eclipse.emf.texo.modelgenerator.test/src/org/eclipse/emf/texo/modelgenerator/test/EclipseModelGeneratorSingleModelTest.java
index 52a8d63c..7fabd15d 100755
--- a/tests/org.eclipse.emf.texo.modelgenerator.test/src/org/eclipse/emf/texo/modelgenerator/test/EclipseModelGeneratorSingleModelTest.java
+++ b/tests/org.eclipse.emf.texo.modelgenerator.test/src/org/eclipse/emf/texo/modelgenerator/test/EclipseModelGeneratorSingleModelTest.java
@@ -46,9 +46,9 @@ public class EclipseModelGeneratorSingleModelTest extends EclipseModelGeneratorT
// modelFiles.add("samples/library.ecore"); //$NON-NLS-1$
// modelFiles.add("issues/bz393240.xsd"); //$NON-NLS-1$
// modelFiles.add("samples/employee.xsd"); //$NON-NLS-1$
- modelFiles.add("samples/library.ecore"); //$NON-NLS-1$
- // modelFiles.add("samples/sport-society.xcore"); //$NON-NLS-1$
- // modelFiles.add("samples/sport-club.xcore"); //$NON-NLS-1$
+ // modelFiles.add("samples/library.ecore"); //$NON-NLS-1$
+ modelFiles.add("samples/sport-society.xcore"); //$NON-NLS-1$
+ modelFiles.add("samples/sport-club.xcore"); //$NON-NLS-1$
// modelFiles.add("samples/sport-competition.xcore"); //$NON-NLS-1$
// modelFiles.add("issues/bz423760.ecore"); //$NON-NLS-1$
// modelFiles.add("texo/TexoDataRequest.xsd"); //$NON-NLS-1$
diff --git a/tests/org.eclipse.emf.texo.modelgenerator.test/src/org/eclipse/emf/texo/modelgenerator/test/test_gen_model.oaw b/tests/org.eclipse.emf.texo.modelgenerator.test/src/org/eclipse/emf/texo/modelgenerator/test/test_gen_model.oaw
deleted file mode 100644
index 72a68891..00000000
--- a/tests/org.eclipse.emf.texo.modelgenerator.test/src/org/eclipse/emf/texo/modelgenerator/test/test_gen_model.oaw
+++ /dev/null
@@ -1,10 +0,0 @@
-<workflow>
- <component class="org.eclipse.xpand2.Generator">
- <fileEncoding value="UTF-8"/>
- <metaModel class="org.eclipse.xtend.type.impl.java.JavaMetaModel"/>
- <expand value="org::eclipse::emf::texo::modelgenerator::templates::model::root(modelContext) FOREACH modelContext.EPackages"/>
- <outlet path='/home/mtaal/mydata/dev/workspaces/texo/org.eclipse.emf.texo.test.model/src-test-gen'/>
- <outlet name="java" path='/home/mtaal/mydata/dev/workspaces/texo/org.eclipse.emf.texo.test.model/src-test-gen'/>
- <beautifier class="org.eclipse.xpand2.output.JavaBeautifier" configFile="org/eclipse/emf/texo/modelgenerator/test/formatter.prefs"/>
- </component>
-</workflow>
diff --git a/tests/org.eclipse.emf.texo.orm.test/.classpath b/tests/org.eclipse.emf.texo.orm.test/.classpath
index 64c5e31b..098194ca 100644
--- a/tests/org.eclipse.emf.texo.orm.test/.classpath
+++ b/tests/org.eclipse.emf.texo.orm.test/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/tests/org.eclipse.emf.texo.orm.test/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.emf.texo.orm.test/.settings/org.eclipse.jdt.core.prefs
index 0858b9dc..19212765 100644
--- a/tests/org.eclipse.emf.texo.orm.test/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.emf.texo.orm.test/.settings/org.eclipse.jdt.core.prefs
@@ -1,11 +1,10 @@
-#Thu Jun 07 19:40:27 CEST 2012
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
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.jdt.core.compiler.source=1.7
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff --git a/tests/org.eclipse.emf.texo.orm.test/HudsonORMGeneratorTest.launch b/tests/org.eclipse.emf.texo.orm.test/HudsonORMGeneratorTest.launch
index 5627ddf4..34ef5c87 100644
--- a/tests/org.eclipse.emf.texo.orm.test/HudsonORMGeneratorTest.launch
+++ b/tests/org.eclipse.emf.texo.orm.test/HudsonORMGeneratorTest.launch
@@ -24,7 +24,7 @@
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.texo.orm.test.ORMGeneratorTest"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.emf.texo.orm.test"/>
diff --git a/tests/org.eclipse.emf.texo.orm.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.texo.orm.test/META-INF/MANIFEST.MF
index e5caea83..c70cd103 100755
--- a/tests/org.eclipse.emf.texo.orm.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.texo.orm.test/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.texo.orm.test
Bundle-Version: 0.1.0.qualifier
Bundle-Vendor: %pluginProvider
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.emf.texo.test.model;bundle-version="[0.1.0,1.0.1)",
javax.persistence;bundle-version="[1.0.0.0,3.0.0)",
diff --git a/tests/org.eclipse.emf.texo.orm.test/ORMGeneratorTest.launch b/tests/org.eclipse.emf.texo.orm.test/ORMGeneratorTest.launch
index 8329782e..09eb23f9 100644
--- a/tests/org.eclipse.emf.texo.orm.test/ORMGeneratorTest.launch
+++ b/tests/org.eclipse.emf.texo.orm.test/ORMGeneratorTest.launch
@@ -25,7 +25,7 @@
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.7.0"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.texo.orm.test.ORMGeneratorTest"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.emf.texo.orm.test"/>
diff --git a/tests/org.eclipse.emf.texo.server.test/.classpath b/tests/org.eclipse.emf.texo.server.test/.classpath
index 64c5e31b..098194ca 100644
--- a/tests/org.eclipse.emf.texo.server.test/.classpath
+++ b/tests/org.eclipse.emf.texo.server.test/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/tests/org.eclipse.emf.texo.server.test/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.emf.texo.server.test/.settings/org.eclipse.jdt.core.prefs
index 0858b9dc..19212765 100644
--- a/tests/org.eclipse.emf.texo.server.test/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.emf.texo.server.test/.settings/org.eclipse.jdt.core.prefs
@@ -1,11 +1,10 @@
-#Thu Jun 07 19:40:27 CEST 2012
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
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.jdt.core.compiler.source=1.7
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff --git a/tests/org.eclipse.emf.texo.server.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.texo.server.test/META-INF/MANIFEST.MF
index 6c53ceff..3ab7c6b7 100644
--- a/tests/org.eclipse.emf.texo.server.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.texo.server.test/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.texo.server.test;singleton:=true
Bundle-Version: 0.1.0.qualifier
Bundle-Vendor: %providerName
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
Require-Bundle: org.eclipse.emf.texo.xml;bundle-version="[0.1.0,1.1.0)",
@@ -23,13 +23,12 @@ Require-Bundle: org.eclipse.emf.texo.xml;bundle-version="[0.1.0,1.1.0)",
org.eclipse.jetty.server;bundle-version="[9.0.0,10.0.0)",
org.eclipse.jetty.util;bundle-version="[9.0.0,10.0.0)",
org.eclipse.jetty.servlet;bundle-version="[9.0.0,10.0.0)",
- javax.servlet;bundle-version="[3.0.0,4.0.0)",
+ javax.servlet;bundle-version="[3.1.0,4.0.0)",
org.eclipse.jetty.client;bundle-version="[9.0.0,10.0.0)",
org.eclipse.jetty.http;bundle-version="[9.0.0,10.0.0)",
org.eclipse.jetty.io;bundle-version="[9.0.0,10.0.0)",
org.eclipse.jetty.security;bundle-version="[9.0.0,10.0.0)",
org.eclipse.jetty.server;bundle-version="[9.0.0,10.0.0)",
- org.eclipse.jetty.continuation;bundle-version="[9.0.0,10.0.0)",
org.json;bundle-version="[1.0.0,2.1.0)",
org.eclipse.emf.texo.json;bundle-version="[0.1.0,1.1.0)",
org.eclipse.emf.texo.test.emfmodel;bundle-version="[0.1.0,1.1.0)",
diff --git a/tests/org.eclipse.emf.texo.test.all/.classpath b/tests/org.eclipse.emf.texo.test.all/.classpath
index 64c5e31b..098194ca 100644
--- a/tests/org.eclipse.emf.texo.test.all/.classpath
+++ b/tests/org.eclipse.emf.texo.test.all/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/tests/org.eclipse.emf.texo.test.all/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.emf.texo.test.all/.settings/org.eclipse.jdt.core.prefs
index 0858b9dc..19212765 100644
--- a/tests/org.eclipse.emf.texo.test.all/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.emf.texo.test.all/.settings/org.eclipse.jdt.core.prefs
@@ -1,11 +1,10 @@
-#Thu Jun 07 19:40:27 CEST 2012
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
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.jdt.core.compiler.source=1.7
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff --git a/tests/org.eclipse.emf.texo.test.all/LocalTexoAllTests.launch b/tests/org.eclipse.emf.texo.test.all/LocalTexoAllTests.launch
index d9fb2fa9..8ba62baa 100644
--- a/tests/org.eclipse.emf.texo.test.all/LocalTexoAllTests.launch
+++ b/tests/org.eclipse.emf.texo.test.all/LocalTexoAllTests.launch
@@ -11,7 +11,7 @@
<booleanAttribute key="clearws" value="true"/>
<booleanAttribute key="clearwslog" value="false"/>
<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
-<booleanAttribute key="default" value="false"/>
+<booleanAttribute key="default" value="true"/>
<booleanAttribute key="includeOptional" value="true"/>
<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
@@ -24,7 +24,7 @@
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.texo.test.all.CombinedTestSuiteJunit4"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.emf.texo.test.all"/>
@@ -33,7 +33,7 @@
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.epp.package.jee.product"/>
<booleanAttribute key="run_in_ui_thread" value="true"/>
-<stringAttribute key="selected_target_plugins" value="com.google.guava@default:default,com.google.inject@default:default,com.ibm.icu@default:default,com.mysql.jdbc@default:default,javax.activation@default:default,javax.annotation@default:default,javax.inject@default:default,javax.mail@default:default,javax.persistence@default:default,javax.servlet*3.0.0.v201112011016@default:default,javax.transaction@default:false,javax.xml@default:default,org.antlr.runtime@default:default,org.apache.ant@default:default,org.apache.batik.css@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.commons.cli@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging@default:default,org.apache.log4j@default:default,org.apache.lucene.analysis@default:default,org.apache.lucene.core@default:default,org.eclipse.ant.core@default:default,org.eclipse.ant.launching@default:default,org.eclipse.ant.ui@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.externaltools@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem.linux.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.compatibility@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.debug.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.emf.codegen.ecore.ui@default:default,org.eclipse.emf.codegen.ecore.xtext.ui@default:default,org.eclipse.emf.codegen.ecore.xtext@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.compare@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.ecore.editor@default:default,org.eclipse.emf.ecore.xcore.lib@default:default,org.eclipse.emf.ecore.xcore.ui@default:default,org.eclipse.emf.ecore.xcore@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.emf.mwe.core@default:default,org.eclipse.emf.mwe.utils@default:default,org.eclipse.emf.mwe2.language@default:default,org.eclipse.emf.mwe2.launch@default:default,org.eclipse.emf.mwe2.lib@default:default,org.eclipse.emf.mwe2.runtime@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.bidi@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.equinox.p2.publisher.eclipse@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.help.base@default:default,org.eclipse.help.ui@default:default,org.eclipse.help@default:default,org.eclipse.jdt.annotation*1.1.0.v20140129-1625@default:default,org.eclipse.jdt.annotation*2.0.0.v20140415-1436@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jetty.client@default:default,org.eclipse.jetty.jmx@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.orbit.mongodb@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.pde.build@default:default,org.eclipse.pde.core@default:default,org.eclipse.pde.launching@default:default,org.eclipse.pde.ui@default:default,org.eclipse.persistence.antlr@default:default,org.eclipse.persistence.asm@default:default,org.eclipse.persistence.core@default:default,org.eclipse.persistence.jpa.jpql@default:default,org.eclipse.persistence.jpa@default:default,org.eclipse.persistence.nosql@default:false,org.eclipse.persistence.oracle.nosql@default:false,org.eclipse.persistence.oracle@default:false,org.eclipse.search@default:default,org.eclipse.swt.gtk.linux.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.console@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.ui.forms@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.trace@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.update.configurator@3:true,org.eclipse.xpand@default:default,org.eclipse.xsd@default:default,org.eclipse.xtend.lib@default:default,org.eclipse.xtend.typesystem.emf@default:default,org.eclipse.xtend@default:default,org.eclipse.xtext.builder@default:default,org.eclipse.xtext.common.types.edit@default:default,org.eclipse.xtext.common.types.ui@default:default,org.eclipse.xtext.common.types@default:default,org.eclipse.xtext.ecore@default:default,org.eclipse.xtext.generator@default:default,org.eclipse.xtext.logging@default:false,org.eclipse.xtext.smap@default:default,org.eclipse.xtext.ui.codetemplates.ui@default:default,org.eclipse.xtext.ui.codetemplates@default:default,org.eclipse.xtext.ui.shared@default:default,org.eclipse.xtext.ui@default:default,org.eclipse.xtext.util@default:default,org.eclipse.xtext.xbase.lib@default:default,org.eclipse.xtext.xbase.ui@default:default,org.eclipse.xtext.xbase@default:default,org.eclipse.xtext@default:default,org.hamcrest.core@default:default,org.hsqldb@default:default,org.json@default:default,org.junit*4.11.0.v201303080030@default:default,org.objectweb.asm*3.3.1.v201105211655@default:default,org.objectweb.asm*5.0.1.v201404251740@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.w3c.css.sac@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
+<stringAttribute key="selected_target_plugins" value="ch.qos.logback.classic@default:default,ch.qos.logback.core@default:default,ch.qos.logback.slf4j@default:default,com.google.guava@default:default,com.google.inject@default:default,com.ibm.icu@default:default,com.mysql.jdbc@default:default,javax.activation*1.1.0.v201108011116@default:default,javax.activation*1.1.0.v201211130549@default:default,javax.annotation@default:default,javax.inject@default:default,javax.mail@default:default,javax.persistence*2.1.0.v201304241213@default:default,javax.persistence*2.1.0@default:default,javax.servlet*3.0.0.v201112011016@default:default,javax.transaction@default:false,javax.xml@default:default,org.antlr.runtime@default:default,org.apache.ant@default:default,org.apache.batik.css@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.commons.cli@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging*1.0.4.v201101211617@default:default,org.apache.commons.logging*1.1.1.v201101211721@default:default,org.apache.log4j*1.2.15.v201012070815@default:default,org.apache.log4j*1.2.16.201310261216@default:default,org.apache.lucene.analysis@default:default,org.apache.lucene.core@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.ant.core@default:default,org.eclipse.ant.launching@default:default,org.eclipse.ant.ui@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.externaltools@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem.java7@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net.linux.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.compatibility@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.debug.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.emf.codegen.ecore.ui@default:default,org.eclipse.emf.codegen.ecore.xtext.ui@default:default,org.eclipse.emf.codegen.ecore.xtext@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.compare@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.ecore.editor@default:default,org.eclipse.emf.ecore.xcore.lib@default:default,org.eclipse.emf.ecore.xcore.ui@default:default,org.eclipse.emf.ecore.xcore@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.emf.mwe.core@default:default,org.eclipse.emf.mwe.utils@default:default,org.eclipse.emf.mwe2.language@default:default,org.eclipse.emf.mwe2.launch@default:default,org.eclipse.emf.mwe2.lib@default:default,org.eclipse.emf.mwe2.runtime@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.bidi@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.equinox.p2.publisher.eclipse@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.help.base@default:default,org.eclipse.help.ui@default:default,org.eclipse.help@default:default,org.eclipse.jdt.annotation*1.1.0.v20140129-1625@default:default,org.eclipse.jdt.annotation*2.0.0.v20140415-1436@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jem.util@default:default,org.eclipse.jetty.client@default:default,org.eclipse.jetty.continuation*9.0.2.v20130417@default:default,org.eclipse.jetty.http*9.0.2.v20130417@default:default,org.eclipse.jetty.io*9.0.2.v20130417@default:default,org.eclipse.jetty.jmx@default:default,org.eclipse.jetty.osgi.npn.fragment@default:default,org.eclipse.jetty.security*9.0.2.v20130417@default:default,org.eclipse.jetty.server*9.0.2.v20130417@default:default,org.eclipse.jetty.servlet*9.0.2.v20130417@default:default,org.eclipse.jetty.util*9.0.2.v20130417@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.m2e.archetype.common@default:default,org.eclipse.m2e.core.ui@default:default,org.eclipse.m2e.core@default:default,org.eclipse.m2e.logback.appender@default:default,org.eclipse.m2e.maven.indexer@default:default,org.eclipse.m2e.maven.runtime.slf4j.simple@default:default,org.eclipse.m2e.maven.runtime@default:default,org.eclipse.m2e.model.edit@default:default,org.eclipse.orbit.mongodb@default:default,org.eclipse.osgi.compatibility.state@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.pde.build@default:default,org.eclipse.pde.core@default:default,org.eclipse.pde.launching@default:default,org.eclipse.pde.ui@default:default,org.eclipse.persistence.antlr@default:default,org.eclipse.persistence.asm@default:default,org.eclipse.persistence.core@default:default,org.eclipse.persistence.jpa.jpql@default:default,org.eclipse.persistence.jpa@default:default,org.eclipse.persistence.nosql@default:false,org.eclipse.persistence.oracle.nosql@default:false,org.eclipse.persistence.oracle@default:false,org.eclipse.search@default:default,org.eclipse.swt.gtk.linux.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.console@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.ui.forms@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.trace@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.update.configurator@3:true,org.eclipse.wst.common.core@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.wst.validation@default:default,org.eclipse.wst.xml.core@default:default,org.eclipse.wst.xsd.core@default:default,org.eclipse.xpand@default:default,org.eclipse.xsd@default:default,org.eclipse.xtend.lib.macro@default:default,org.eclipse.xtend.lib@default:default,org.eclipse.xtend.typesystem.emf@default:default,org.eclipse.xtend@default:default,org.eclipse.xtext.builder@default:default,org.eclipse.xtext.common.types.edit@default:default,org.eclipse.xtext.common.types.ui@default:default,org.eclipse.xtext.common.types@default:default,org.eclipse.xtext.ecore@default:default,org.eclipse.xtext.generator@default:default,org.eclipse.xtext.logging@default:false,org.eclipse.xtext.smap@default:default,org.eclipse.xtext.ui.codetemplates.ui@default:default,org.eclipse.xtext.ui.codetemplates@default:default,org.eclipse.xtext.ui.shared@default:default,org.eclipse.xtext.ui@default:default,org.eclipse.xtext.util@default:default,org.eclipse.xtext.xbase.lib@default:default,org.eclipse.xtext.xbase.ui@default:default,org.eclipse.xtext.xbase@default:default,org.eclipse.xtext@default:default,org.hamcrest.core@default:default,org.hsqldb@default:default,org.json@default:default,org.junit*4.11.0.v201303080030@default:default,org.objectweb.asm*3.3.1.v201105211655@default:default,org.objectweb.asm*5.0.1.v201404251740@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.texo.annotations.model@default:default,org.eclipse.emf.texo.datagenerator.test@default:default,org.eclipse.emf.texo.datagenerator@default:default,org.eclipse.emf.texo.eclipse@default:default,org.eclipse.emf.texo.generator@default:default,org.eclipse.emf.texo.json.test@default:default,org.eclipse.emf.texo.json@default:default,org.eclipse.emf.texo.modelgenerator.test@default:default,org.eclipse.emf.texo.modelgenerator@default:default,org.eclipse.emf.texo.orm.test@default:default,org.eclipse.emf.texo.orm@default:default,org.eclipse.emf.texo.server.test@default:default,org.eclipse.emf.texo.server@default:default,org.eclipse.emf.texo.test.all@default:default,org.eclipse.emf.texo.test.emfmodel@default:default,org.eclipse.emf.texo.test.model@default:default,org.eclipse.emf.texo.test@default:default,org.eclipse.emf.texo.xml.test@default:default,org.eclipse.emf.texo.xml@default:default,org.eclipse.emf.texo@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<booleanAttribute key="tracing" value="false"/>
diff --git a/tests/org.eclipse.emf.texo.test.all/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.texo.test.all/META-INF/MANIFEST.MF
index d8fc3a45..a13c793d 100644
--- a/tests/org.eclipse.emf.texo.test.all/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.texo.test.all/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.emf.texo.test.all;singleton:=true
Bundle-Version: 0.1.0.qualifier
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Require-Bundle: org.eclipse.emf.texo.test;bundle-version="[0.1.0,1.1.0)",
org.eclipse.emf.texo.datagenerator.test;bundle-version="[0.1.0,1.1.0)",
org.eclipse.emf.texo.xml.test;bundle-version="[0.1.0,1.1.0)",
diff --git a/tests/org.eclipse.emf.texo.test.all/TexoAllTests.launch b/tests/org.eclipse.emf.texo.test.all/TexoAllTests.launch
index ad728914..6dec7a95 100644
--- a/tests/org.eclipse.emf.texo.test.all/TexoAllTests.launch
+++ b/tests/org.eclipse.emf.texo.test.all/TexoAllTests.launch
@@ -24,7 +24,7 @@
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.texo.test.all.CombinedTestSuiteJunit4"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.emf.texo.test.all"/>
diff --git a/tests/org.eclipse.emf.texo.test.emfmodel/.classpath b/tests/org.eclipse.emf.texo.test.emfmodel/.classpath
index 64c5e31b..098194ca 100644
--- a/tests/org.eclipse.emf.texo.test.emfmodel/.classpath
+++ b/tests/org.eclipse.emf.texo.test.emfmodel/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/tests/org.eclipse.emf.texo.test.emfmodel/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.emf.texo.test.emfmodel/.settings/org.eclipse.jdt.core.prefs
index a4af2f96..f42de363 100644
--- a/tests/org.eclipse.emf.texo.test.emfmodel/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.emf.texo.test.emfmodel/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,7 @@
-#Mon May 07 14:50:50 CEST 2012
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
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.jdt.core.compiler.source=1.7
diff --git a/tests/org.eclipse.emf.texo.test.emfmodel/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.texo.test.emfmodel/META-INF/MANIFEST.MF
index 0a11df65..4e318f17 100644
--- a/tests/org.eclipse.emf.texo.test.emfmodel/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.texo.test.emfmodel/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 0.1.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Export-Package: org.eclipse.emf.texo.test.emfmodel.bz391624;version="0.1.0",
org.eclipse.emf.texo.test.emfmodel.bz391624.impl;version="0.1.0",
org.eclipse.emf.texo.test.emfmodel.bz391624.util;version="0.1.0",
diff --git a/tests/org.eclipse.emf.texo.test.model/.classpath b/tests/org.eclipse.emf.texo.test.model/.classpath
index 76408b96..f5981706 100644
--- a/tests/org.eclipse.emf.texo.test.model/.classpath
+++ b/tests/org.eclipse.emf.texo.test.model/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="src-test-gen"/>
diff --git a/tests/org.eclipse.emf.texo.test.model/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.emf.texo.test.model/.settings/org.eclipse.jdt.core.prefs
index 6b02320b..b74215fa 100644
--- a/tests/org.eclipse.emf.texo.test.model/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.emf.texo.test.model/.settings/org.eclipse.jdt.core.prefs
@@ -5,9 +5,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -106,7 +106,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
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.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.7
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff --git a/tests/org.eclipse.emf.texo.test.model/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.texo.test.model/META-INF/MANIFEST.MF
index 7428944d..b632c87a 100644
--- a/tests/org.eclipse.emf.texo.test.model/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.texo.test.model/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 0.1.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Eclipse-BuddyPolicy: dependent
Export-Package: org.eclipse.emf.texo.server.model.request;version="0.1.0",
org.eclipse.emf.texo.server.model.response;version="0.1.0",
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/club-orm.xml b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/club-orm.xml
index f8149b3d..b03830b6 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/club-orm.xml
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/club-orm.xml
@@ -27,7 +27,6 @@
<orm:attributes>
<orm:basic name="name">
<orm:column name="name"/>
- <orm:convert>TexoTestObjectConverter</orm:convert>
</orm:basic>
<orm:many-to-many name="members">
<orm:order-column name="club_Team_members_ind"/>
@@ -51,15 +50,12 @@
<orm:attributes>
<orm:basic name="name">
<orm:column name="name"/>
- <orm:convert>TexoTestObjectConverter</orm:convert>
</orm:basic>
<orm:basic name="lastName">
<orm:column name="lastName"/>
- <orm:convert>TexoTestObjectConverter</orm:convert>
</orm:basic>
<orm:basic name="age">
<orm:column name="age"/>
- <orm:convert>TexoTestObjectConverter</orm:convert>
</orm:basic>
<orm:basic name="gender">
<orm:column name="gender"/>
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/competition-orm.xml b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/competition-orm.xml
index ea12c68b..18ce0761 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/competition-orm.xml
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/competition-orm.xml
@@ -14,7 +14,6 @@
<orm:attributes>
<orm:basic name="name">
<orm:column name="name"/>
- <orm:convert>TexoTestObjectConverter</orm:convert>
</orm:basic>
<orm:many-to-many name="teams">
<orm:order-column name="competition_Competition_teams_ind"/>
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/society-orm.xml b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/society-orm.xml
index 1270af99..fa94f835 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/society-orm.xml
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/society-orm.xml
@@ -14,7 +14,6 @@
<orm:attributes>
<orm:basic name="name">
<orm:column name="name"/>
- <orm:convert>TexoTestObjectConverter</orm:convert>
</orm:basic>
</orm:attributes>
</orm:entity>
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/travel-orm.xml b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/travel-orm.xml
index 54b72a63..1beadecd 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/travel-orm.xml
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/travel-orm.xml
@@ -14,7 +14,6 @@
<orm:attributes>
<orm:basic name="name">
<orm:column name="name"/>
- <orm:convert>TexoTestObjectConverter</orm:convert>
</orm:basic>
<orm:one-to-many name="trips">
<orm:order-column name="travel_Journey_trips_ind"/>
@@ -33,7 +32,6 @@
<orm:attributes>
<orm:basic name="name2">
<orm:column name="name2"/>
- <orm:convert>TexoTestObjectConverter</orm:convert>
</orm:basic>
<orm:many-to-one name="destination">
<orm:join-column name="travel_Trip_destination"/>
@@ -53,11 +51,9 @@
<orm:attributes>
<orm:basic name="name">
<orm:column name="name"/>
- <orm:convert>TexoTestObjectConverter</orm:convert>
</orm:basic>
<orm:basic name="reis">
<orm:column name="reis"/>
- <orm:convert>TexoTestObjectConverter</orm:convert>
</orm:basic>
</orm:attributes>
</orm:entity>
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/sport/club/Club.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/sport/club/Club.java
index 6edae44b..1c49b169 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/sport/club/Club.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/sport/club/Club.java
@@ -6,9 +6,9 @@ import javax.persistence.CascadeType;
import javax.persistence.Entity;
import javax.persistence.OneToMany;
import javax.persistence.OrderColumn;
-import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
import org.eclipse.emf.texo.test.TexoTestQNameConverter;
+import org.eclipse.emf.texo.test.model.samples.sport.society.Society;
import org.eclipse.persistence.annotations.Converter;
import org.eclipse.persistence.annotations.Converters;
@@ -20,7 +20,7 @@ import org.eclipse.persistence.annotations.Converters;
@Entity(name = "club_Club")
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter"),
@Converter(converterClass = TexoTestQNameConverter.class, name = "TexoTestQNameConverter") })
-public class Club extends EObject {
+public class Club extends Society {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/sport/club/ClubModelFactory.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/sport/club/ClubModelFactory.java
index 6e08e7a8..afe1882d 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/sport/club/ClubModelFactory.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/sport/club/ClubModelFactory.java
@@ -1,7 +1,6 @@
package org.eclipse.emf.texo.test.model.samples.sport.club;
import java.util.List;
-import org.eclipse.emf._2002.ecore.EcoreModelFactory;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EDataType;
import org.eclipse.emf.ecore.EStructuralFeature;
@@ -11,6 +10,7 @@ import org.eclipse.emf.texo.model.ModelFeatureMapEntry;
import org.eclipse.emf.texo.model.ModelObject;
import org.eclipse.emf.texo.model.ModelPackage;
import org.eclipse.emf.texo.test.model.base.identifiable.IdentifiableModelFactory;
+import org.eclipse.emf.texo.test.model.samples.sport.society.SocietyModelFactory;
/**
* The <b>{@link ModelFactory}</b> for the types of this model: club. It contains code to create instances
@@ -208,7 +208,7 @@ public class ClubModelFactory implements ModelFactory {
*
* @generated
*/
- public static class ClubModelObject<E extends Club> extends EcoreModelFactory.EObjectModelObject<E> {
+ public static class ClubModelObject<E extends Club> extends SocietyModelFactory.SocietyModelObject<E> {
/**
* @generated
*/
@@ -236,6 +236,8 @@ public class ClubModelFactory implements ModelFactory {
return getTarget().getDb_Id();
case ClubModelPackage.CLUB_DB_VERSION_FEATURE_ID:
return getTarget().getDb_version();
+ case ClubModelPackage.CLUB_NAME_FEATURE_ID:
+ return getTarget().getName();
case ClubModelPackage.CLUB_TEAMS_FEATURE_ID:
return getTarget().getTeams();
default:
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/sport/club/ClubModelPackage.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/sport/club/ClubModelPackage.java
index 8acb8803..cee1116e 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/sport/club/ClubModelPackage.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/sport/club/ClubModelPackage.java
@@ -15,6 +15,7 @@ import org.eclipse.emf.texo.test.model.base.identifiable.IdentifiableModelPackag
import org.eclipse.emf.texo.test.model.samples.sport.club.dao.ClubDao;
import org.eclipse.emf.texo.test.model.samples.sport.club.dao.MemberDao;
import org.eclipse.emf.texo.test.model.samples.sport.club.dao.TeamDao;
+import org.eclipse.emf.texo.test.model.samples.sport.society.SocietyModelPackage;
import org.eclipse.emf.texo.utils.ModelUtils;
/**
@@ -67,21 +68,28 @@ public class ClubModelPackage extends ModelPackage {
*
* @generated
*/
- public static final int CLUB_DB_ID_FEATURE_ID = -1;
+ public static final int CLUB_DB_ID_FEATURE_ID = 0;
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @generated
*/
- public static final int CLUB_DB_VERSION_FEATURE_ID = -1;
+ public static final int CLUB_DB_VERSION_FEATURE_ID = 1;
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @generated
*/
- public static final int CLUB_TEAMS_FEATURE_ID = 0;
+ public static final int CLUB_NAME_FEATURE_ID = 2;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public static final int CLUB_TEAMS_FEATURE_ID = 3;
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -197,6 +205,7 @@ public class ClubModelPackage extends ModelPackage {
isInitialized = true;
+ SocietyModelPackage.initialize();
IdentifiableModelPackage.initialize();
// force the initialization of the EFactory proxy
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/sport/club/club.ecore b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/sport/club/club.ecore
index ec9afb2b..5ce06a41 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/sport/club/club.ecore
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/sport/club/club.ecore
@@ -5,7 +5,7 @@
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="basePackage" value="org.eclipse.emf.texo.test.model.samples.sport"/>
</eAnnotations>
- <eClassifiers xsi:type="ecore:EClass" name="Club" eSuperTypes="http://www.eclipse.org/emf/2002/Ecore#//EObject">
+ <eClassifiers xsi:type="ecore:EClass" name="Club" eSuperTypes="org.eclipse.emf.texo.test.model.samples.sport.society#//Society">
<eStructuralFeatures xsi:type="ecore:EReference" name="teams" upperBound="-1"
eType="#//Team" containment="true" resolveProxies="false">
<eAnnotations source="org.eclipse.emf.texo">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/sport/competition/Competition.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/sport/competition/Competition.java
index b01e6981..3ac9eb36 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/sport/competition/Competition.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/sport/competition/Competition.java
@@ -45,7 +45,7 @@ public class Competition extends Identifiable {
/**
* Returns the value of '<em><b>name</b></em>' feature.
- *
+ *
* <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @return the value of '<em><b>name</b></em>' feature
@@ -57,7 +57,7 @@ public class Competition extends Identifiable {
/**
* Sets the '{@link Competition#getName() <em>name</em>}' feature.
- *
+ *
* <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @param newName
@@ -70,7 +70,7 @@ public class Competition extends Identifiable {
/**
* Returns the value of '<em><b>teams</b></em>' feature.
- *
+ *
* <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @return the value of '<em><b>teams</b></em>' feature
@@ -127,7 +127,7 @@ public class Competition extends Identifiable {
/**
* Sets the '{@link Competition#getTeams() <em>teams</em>}' feature.
- *
+ *
* <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @param newTeams
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/sport/competition/CompetitionModelFactory.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/sport/competition/CompetitionModelFactory.java
index 45d62ee7..2fe33019 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/sport/competition/CompetitionModelFactory.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/sport/competition/CompetitionModelFactory.java
@@ -41,7 +41,7 @@ public class CompetitionModelFactory implements ModelFactory {
/**
* Wraps an object in a {@link ModelObject}. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @param eClass
* the EClass of the object
* @param adaptee
@@ -79,7 +79,7 @@ public class CompetitionModelFactory implements ModelFactory {
/**
* Wraps a feature map entry pojo in a {@link AbstractModelFeatureMapEntry}. If the feature map entry is null then a
* new one is created and <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @param eFeature
* the feature map feature of the object
* @param adaptee
@@ -136,12 +136,12 @@ public class CompetitionModelFactory implements ModelFactory {
/**
* The adapter/wrapper for the EClass '<em><b>Competition</b></em>'.
- *
+ *
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @param <E>
* the domain model java class
- *
+ *
* @generated
*/
public static class CompetitionModelObject<E extends Competition> extends
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/sport/competition/CompetitionModelPackage.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/sport/competition/CompetitionModelPackage.java
index 8908b9e3..fb20a26a 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/sport/competition/CompetitionModelPackage.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/sport/competition/CompetitionModelPackage.java
@@ -18,7 +18,7 @@ import org.eclipse.emf.texo.utils.ModelUtils;
/**
* The <b>Package</b> for the model '<em><b>competition</b></em>'. It contains initialization code and access to the
* Factory to instantiate types of this package.
- *
+ *
* <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @generated
@@ -90,9 +90,9 @@ public class CompetitionModelPackage extends ModelPackage {
/**
* Initializes this {@link ModelPackage}. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @return an initialized instance of this class
- *
+ *
* @generated
*/
public static CompetitionModelPackage initialize() {
@@ -129,7 +129,7 @@ public class CompetitionModelPackage extends ModelPackage {
/**
* Returns the {@link ModelFactory} of this ModelPackage. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @return the {@link CompetitionModelFactory} instance.
* @generated
*/
@@ -141,7 +141,7 @@ public class CompetitionModelPackage extends ModelPackage {
/**
* Returns the nsUri of the {@link EPackage} managed by this Package instance. <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
+ *
* @return the nsUri of the EPackage
* @generated
*/
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/travel/City.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/travel/City.java
index ac83b929..6b185d91 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/travel/City.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/travel/City.java
@@ -38,7 +38,7 @@ public class City extends Identifiable {
/**
* Returns the value of '<em><b>name</b></em>' feature.
- *
+ *
* <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @return the value of '<em><b>name</b></em>' feature
@@ -50,7 +50,7 @@ public class City extends Identifiable {
/**
* Sets the '{@link City#getName() <em>name</em>}' feature.
- *
+ *
* <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @param newName
@@ -63,7 +63,7 @@ public class City extends Identifiable {
/**
* Returns the value of '<em><b>reis</b></em>' feature.
- *
+ *
* <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @return the value of '<em><b>reis</b></em>' feature
@@ -75,7 +75,7 @@ public class City extends Identifiable {
/**
* Sets the '{@link City#getReis() <em>reis</em>}' feature.
- *
+ *
* <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @param newReis
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/travel/Journey.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/travel/Journey.java
index e299e588..63b8384a 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/travel/Journey.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/travel/Journey.java
@@ -44,7 +44,7 @@ public class Journey extends Identifiable {
/**
* Returns the value of '<em><b>name</b></em>' feature.
- *
+ *
* <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @return the value of '<em><b>name</b></em>' feature
@@ -56,7 +56,7 @@ public class Journey extends Identifiable {
/**
* Sets the '{@link Journey#getName() <em>name</em>}' feature.
- *
+ *
* <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @param newName
@@ -69,7 +69,7 @@ public class Journey extends Identifiable {
/**
* Returns the value of '<em><b>trips</b></em>' feature.
- *
+ *
* <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @return the value of '<em><b>trips</b></em>' feature
@@ -126,7 +126,7 @@ public class Journey extends Identifiable {
/**
* Sets the '{@link Journey#getTrips() <em>trips</em>}' feature.
- *
+ *
* <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @param newTrips
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/travel/TravelModelFactory.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/travel/TravelModelFactory.java
index 045b82e5..8d5f8754 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/travel/TravelModelFactory.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/travel/TravelModelFactory.java
@@ -44,7 +44,7 @@ public class TravelModelFactory implements ModelFactory {
/**
* Wraps an object in a {@link ModelObject}. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @param eClass
* the EClass of the object
* @param adaptee
@@ -88,7 +88,7 @@ public class TravelModelFactory implements ModelFactory {
/**
* Wraps a feature map entry pojo in a {@link AbstractModelFeatureMapEntry}. If the feature map entry is null then a
* new one is created and <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @param eFeature
* the feature map feature of the object
* @param adaptee
@@ -165,12 +165,12 @@ public class TravelModelFactory implements ModelFactory {
/**
* The adapter/wrapper for the EClass '<em><b>Journey</b></em>'.
- *
+ *
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @param <E>
* the domain model java class
- *
+ *
* @generated
*/
public static class JourneyModelObject<E extends Journey> extends IdentifiableModelFactory.IdentifiableModelObject<E> {
@@ -262,12 +262,12 @@ public class TravelModelFactory implements ModelFactory {
/**
* The adapter/wrapper for the EClass '<em><b>Trip</b></em>'.
- *
+ *
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @param <E>
* the domain model java class
- *
+ *
* @generated
*/
public static class TripModelObject<E extends Trip> extends IdentifiableModelFactory.IdentifiableModelObject<E> {
@@ -354,12 +354,12 @@ public class TravelModelFactory implements ModelFactory {
/**
* The adapter/wrapper for the EClass '<em><b>City</b></em>'.
- *
+ *
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @param <E>
* the domain model java class
- *
+ *
* @generated
*/
public static class CityModelObject<E extends City> extends IdentifiableModelFactory.IdentifiableModelObject<E> {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/travel/TravelModelPackage.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/travel/TravelModelPackage.java
index 441da52f..503496c5 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/travel/TravelModelPackage.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/travel/TravelModelPackage.java
@@ -19,7 +19,7 @@ import org.eclipse.emf.texo.utils.ModelUtils;
/**
* The <b>Package</b> for the model '<em><b>travel</b></em>'. It contains initialization code and access to the Factory
* to instantiate types of this package.
- *
+ *
* <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @generated
@@ -161,9 +161,9 @@ public class TravelModelPackage extends ModelPackage {
/**
* Initializes this {@link ModelPackage}. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @return an initialized instance of this class
- *
+ *
* @generated
*/
public static TravelModelPackage initialize() {
@@ -202,7 +202,7 @@ public class TravelModelPackage extends ModelPackage {
/**
* Returns the {@link ModelFactory} of this ModelPackage. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @return the {@link TravelModelFactory} instance.
* @generated
*/
@@ -214,7 +214,7 @@ public class TravelModelPackage extends ModelPackage {
/**
* Returns the nsUri of the {@link EPackage} managed by this Package instance. <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
+ *
* @return the nsUri of the EPackage
* @generated
*/
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/travel/Trip.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/travel/Trip.java
index b849dfdb..fa302151 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/travel/Trip.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/travel/Trip.java
@@ -40,7 +40,7 @@ public class Trip extends Identifiable {
/**
* Returns the value of '<em><b>name2</b></em>' feature.
- *
+ *
* <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @return the value of '<em><b>name2</b></em>' feature
@@ -52,7 +52,7 @@ public class Trip extends Identifiable {
/**
* Sets the '{@link Trip#getName2() <em>name2</em>}' feature.
- *
+ *
* <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @param newName2
@@ -65,7 +65,7 @@ public class Trip extends Identifiable {
/**
* Returns the value of '<em><b>destination</b></em>' feature.
- *
+ *
* <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @return the value of '<em><b>destination</b></em>' feature
@@ -77,7 +77,7 @@ public class Trip extends Identifiable {
/**
* Sets the '{@link Trip#getDestination() <em>destination</em>}' feature.
- *
+ *
* <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @param newDestination
diff --git a/tests/org.eclipse.emf.texo.test/.classpath b/tests/org.eclipse.emf.texo.test/.classpath
index 64c5e31b..098194ca 100644
--- a/tests/org.eclipse.emf.texo.test/.classpath
+++ b/tests/org.eclipse.emf.texo.test/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/tests/org.eclipse.emf.texo.test/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.emf.texo.test/.settings/org.eclipse.jdt.core.prefs
index 637dd191..d452002b 100644
--- a/tests/org.eclipse.emf.texo.test/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.emf.texo.test/.settings/org.eclipse.jdt.core.prefs
@@ -1,9 +1,8 @@
-#Thu Jun 07 19:40:27 CEST 2012
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.targetPlatform=1.7
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -72,7 +71,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
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.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.7
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff --git a/tests/org.eclipse.emf.texo.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.texo.test/META-INF/MANIFEST.MF
index 16b9bf7d..99239482 100644
--- a/tests/org.eclipse.emf.texo.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.texo.test/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.texo.test
Bundle-Version: 0.1.0.qualifier
Bundle-Vendor: %providerName
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-ClassPath: .
Bundle-Localization: plugin
Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.texo.xml.test/.classpath b/tests/org.eclipse.emf.texo.xml.test/.classpath
index 64c5e31b..098194ca 100644
--- a/tests/org.eclipse.emf.texo.xml.test/.classpath
+++ b/tests/org.eclipse.emf.texo.xml.test/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/tests/org.eclipse.emf.texo.xml.test/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.emf.texo.xml.test/.settings/org.eclipse.jdt.core.prefs
index 637dd191..d452002b 100644
--- a/tests/org.eclipse.emf.texo.xml.test/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.emf.texo.xml.test/.settings/org.eclipse.jdt.core.prefs
@@ -1,9 +1,8 @@
-#Thu Jun 07 19:40:27 CEST 2012
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.targetPlatform=1.7
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -72,7 +71,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
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.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.7
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff --git a/tests/org.eclipse.emf.texo.xml.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.texo.xml.test/META-INF/MANIFEST.MF
index bb4fe76a..afbf9092 100644
--- a/tests/org.eclipse.emf.texo.xml.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.texo.xml.test/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.texo.xml.test
Bundle-Version: 0.1.0.qualifier
Bundle-Vendor: %pluginProvider
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-Localization: plugin
Require-Bundle: org.eclipse.emf.texo.xml;bundle-version="[0.1.0,1.1.0)",
org.eclipse.emf.texo;bundle-version="[0.1.0,1.1.0)",

Back to the top