Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2012-05-01 02:34:16 -0400
committerEike Stepper2012-05-01 02:34:16 -0400
commit16ea94994536ee97ada5318f174a08f5108d0b07 (patch)
treee9e44376958acfe5c2e4040d7c29456883726b22
parentd57f1d7713c7fbfbc023df2fae808bf50af3e857 (diff)
downloadcdo-16ea94994536ee97ada5318f174a08f5108d0b07.tar.gz
cdo-16ea94994536ee97ada5318f174a08f5108d0b07.tar.xz
cdo-16ea94994536ee97ada5318f174a08f5108d0b07.zip
Fix test launches
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.db/build.properties65
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.db4o/build.properties43
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/META-INF/MANIFEST.MF3
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/build.properties88
4 files changed, 97 insertions, 102 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/build.properties b/plugins/org.eclipse.emf.cdo.tests.db/build.properties
index 65455211eb..d3d1d56ff7 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/build.properties
+++ b/plugins/org.eclipse.emf.cdo.tests.db/build.properties
@@ -1,31 +1,34 @@
-# Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Eike Stepper - initial API and implementation
-
-bin.includes = .,\
- META-INF/,\
- plugin.properties,\
- copyright.txt,\
- about.html,\
- .options
-jars.compile.order = .
-source.. = src/
-output.. = bin/
-src.includes = about.html,\
- copyright.txt,\
- CDO AllTests (DB2 non-audit).launch,\
- CDO AllTests (Derby).launch,\
- CDO AllTests (H2 audit).launch,\
- CDO AllTests (H2 branching).launch,\
- CDO AllTests (H2 non-audit).launch,\
- CDO AllTests (H2 offline).launch,\
- CDO AllTests (Hsqldb audit).launch,\
- CDO AllTests (Hsqldb non-audit).launch,\
- CDO AllTests (Mysql).launch,\
- CDO AllTests (PostgreSQL non-audit).launch,\
- CDO AllTests (DBStore).launch
+# Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# Eike Stepper - initial API and implementation
+
+bin.includes = .,\
+ META-INF/,\
+ plugin.properties,\
+ copyright.txt,\
+ about.html,\
+ .options
+jars.compile.order = .
+source.. = src/
+output.. = bin/
+src.includes = about.html,\
+ copyright.txt,\
+ CDO AllTests (DB2 non-audit).launch,\
+ CDO AllTests (Derby).launch,\
+ CDO AllTests (H2 audit).launch,\
+ CDO AllTests (H2 branching).launch,\
+ CDO AllTests (H2 non-audit).launch,\
+ CDO AllTests (H2 offline).launch,\
+ CDO AllTests (Hsqldb audit).launch,\
+ CDO AllTests (Hsqldb non-audit).launch,\
+ CDO AllTests (Mysql).launch,\
+ CDO AllTests (PostgreSQL non-audit).launch,\
+ CDO AllTests (DBStore).launch,\
+ CDO AllTests (H2 ALL).launch,\
+ CDO AllTests (H2 UUIDs).launch,\
+ CDO Performance Tests (H2 non-audit).launch
diff --git a/plugins/org.eclipse.emf.cdo.tests.db4o/build.properties b/plugins/org.eclipse.emf.cdo.tests.db4o/build.properties
index 5f4117fa8e..54175284a4 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db4o/build.properties
+++ b/plugins/org.eclipse.emf.cdo.tests.db4o/build.properties
@@ -1,21 +1,22 @@
-# Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Eike Stepper - initial API and implementation
-
-# NLS_MESSAGEFORMAT_VAR
-
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- copyright.txt,\
- about.html,\
- plugin.properties
-src.includes = about.html,\
- CDO AllTests (DB4O).launch,\
- copyright.txt
+# Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# Eike Stepper - initial API and implementation
+
+# NLS_MESSAGEFORMAT_VAR
+
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .,\
+ copyright.txt,\
+ about.html,\
+ plugin.properties
+src.includes = about.html,\
+ CDO AllTests (DB4O).launch,\
+ copyright.txt,\
+ CDO AllTests (MEMDB4O).launch
diff --git a/plugins/org.eclipse.emf.cdo.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests/META-INF/MANIFEST.MF
index aaf6b433e7..c94d9103c0 100644
--- a/plugins/org.eclipse.emf.cdo.tests/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.tests/META-INF/MANIFEST.MF
@@ -33,7 +33,8 @@ Require-Bundle: org.eclipse.net4j.tests;bundle-version="[4.0.0,5.0.0)";visibilit
org.eclipse.emf.cdo.defs;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
org.eclipse.emf.cdo.server.ocl;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
org.eclipse.emf.cdo.workspace;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
- org.eclipse.gmf.runtime.notation;bundle-version="[1.5.0,2.0.0)";visibility:=reexport
+ org.eclipse.gmf.runtime.notation;bundle-version="[1.5.0,2.0.0)";visibility:=reexport,
+ org.eclipse.ocl.ecore;bundle-version="[3.0.0,4.0.0)"
Import-Package: org.apache.derby.jdbc;version="[10.0.0,11.0.0)",
org.h2.jdbcx;version="[1.0.0,2.0.0)"
Export-Package: base;version="4.0.100";
diff --git a/plugins/org.eclipse.emf.cdo.tests/build.properties b/plugins/org.eclipse.emf.cdo.tests/build.properties
index ab8efcc53c..900c2988b8 100644
--- a/plugins/org.eclipse.emf.cdo.tests/build.properties
+++ b/plugins/org.eclipse.emf.cdo.tests/build.properties
@@ -1,49 +1,39 @@
-# Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Eike Stepper - initial API and implementation
-
-bin.includes = .,\
- model/,\
- META-INF/,\
- plugin.xml,\
- plugin.properties,\
- copyright.txt,\
- about.html,\
- about.ini,\
- about.mappings,\
- about.properties,\
- defs/,\
- ecore/,\
- model1.ecore,\
- modeling32.png,\
- model2.ecore,\
- test.xml,\
- uml2/,\
- My.ecore,\
- .options,\
- sslKey/,\
- SubclassTest1.ecore,\
- SubclassTest2.ecore,\
- logic/
-jars.compile.order = .
-source.. = src/,\
- model/
-output.. = bin/
-src.includes = about.html,\
- copyright.txt,\
- launches/CDO AllTests (MEM audit).launch,\
- launches/CDO AllTests (MEM branching SSL).launch,\
- launches/CDO AllTests (MEM branching TCP).launch,\
- launches/CDO AllTests (MEM branching UUIDs).launch,\
- launches/CDO AllTests (MEM branching).launch,\
- launches/CDO AllTests (MEM embedded).launch,\
- launches/CDO AllTests (MEM legacy).launch,\
- launches/CDO AllTests (MEM non-audit).launch,\
- launches/CDO AllTests (MEM offline).launch,\
- launches/CDO AllTests.launch,\
- launches/CDO PerformanceTests.launch
+# Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# Eike Stepper - initial API and implementation
+
+bin.includes = .,\
+ model/,\
+ META-INF/,\
+ plugin.xml,\
+ plugin.properties,\
+ copyright.txt,\
+ about.html,\
+ about.ini,\
+ about.mappings,\
+ about.properties,\
+ defs/,\
+ ecore/,\
+ model1.ecore,\
+ modeling32.png,\
+ model2.ecore,\
+ test.xml,\
+ uml2/,\
+ My.ecore,\
+ .options,\
+ sslKey/,\
+ SubclassTest1.ecore,\
+ SubclassTest2.ecore,\
+ logic/
+jars.compile.order = .
+source.. = src/,\
+ model/
+output.. = bin/
+src.includes = about.html,\
+ copyright.txt,\
+ launches/

Back to the top