summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Boldt2006-05-29 19:06:29 (EDT)
committerNick Boldt2006-05-29 19:06:29 (EDT)
commit22290e1256ba655146f31d475a33038936403ff0 (patch)
treefe8f4ec7c234f9e60d71ac9273e94127903e0396
parent2404ce14cebaaf8f9ad40772dcc69cda40856c3d (diff)
downloadcdo-22290e1256ba655146f31d475a33038936403ff0.zip
cdo-22290e1256ba655146f31d475a33038936403ff0.tar.gz
cdo-22290e1256ba655146f31d475a33038936403ff0.tar.bz2
[144269] refactor for consistency
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.server/.project2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.server/META-INF/MANIFEST.MF6
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.server/launches/CDO Server.launch4
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.server/plugin.xml2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.server/src/org/eclipse/emf/cdo/examples/server/internal/ExampleServerApplication.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.server/src/org/eclipse/emf/cdo/examples/server/internal/ExampleServerPlugin.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/.classpath2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/META-INF/MANIFEST.MF4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllSuites.java61
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTests.java16
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/CDOTestPlugin.java36
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/SampleTest.java10
12 files changed, 134 insertions, 13 deletions
diff --git a/plugins/org.eclipse.emf.cdo.examples.server/.project b/plugins/org.eclipse.emf.cdo.examples.server/.project
index 5eac849..47a904e 100644
--- a/plugins/org.eclipse.emf.cdo.examples.server/.project
+++ b/plugins/org.eclipse.emf.cdo.examples.server/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.emf.cdo.example.server.internal</name>
+ <name>org.eclipse.emf.cdo.examples.server.internal</name>
<comment></comment>
<projects>
</projects>
diff --git a/plugins/org.eclipse.emf.cdo.examples.server/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.server/META-INF/MANIFEST.MF
index 7c2ca13..3c5fb6e 100644
--- a/plugins/org.eclipse.emf.cdo.examples.server/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.examples.server/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.emf.cdo.example.server;singleton:=true
+Bundle-SymbolicName: org.eclipse.emf.cdo.examples.server;singleton:=true
Bundle-Version: 1.0.0
Bundle-ClassPath: net4j.cdo.test.serverapp.jar
Bundle-Vendor: %providerName
@@ -9,5 +9,5 @@ Bundle-Localization: plugin
Eclipse-LazyStart: true
Require-Bundle: org.eclipse.emf.cdo.server,
org.eclipse.net4j.socket
-Export-Package: org.eclipse.emf.cdo.example.server.internal
-Bundle-Activator: org.eclipse.emf.cdo.example.server.internal.ExampleServerPlugin
+Export-Package: org.eclipse.emf.cdo.examples.server.internal
+Bundle-Activator: org.eclipse.emf.cdo.examples.server.internal.ExampleServerPlugin
diff --git a/plugins/org.eclipse.emf.cdo.examples.server/launches/CDO Server.launch b/plugins/org.eclipse.emf.cdo.examples.server/launches/CDO Server.launch
index 5a15182..d923f0e 100644
--- a/plugins/org.eclipse.emf.cdo.examples.server/launches/CDO Server.launch
+++ b/plugins/org.eclipse.emf.cdo.examples.server/launches/CDO Server.launch
@@ -315,10 +315,10 @@
<booleanAttribute key="includeFragments" value="true"/>
<booleanAttribute key="org.eclipse.hyades.trace.ui.ATTR_PROFILE_TO_FILE" value="false"/>
<stringAttribute key="location" value="/ws.rt/cdo.server"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.cdo.jdbc,org.eclipse.net4j.spring,org.eclipse.net4j.socket,org.eclipse.net4j.core,org.eclipse.net4j.spring.db,org.eclipse.emf.cdo.core,org.eclipse.net4j.util,org.eclipse.emf.cdo.example.server,org.eclipse.emf.cdo.dbgen,org.eclipse.emf.cdo.server,org.eclipse.emf.cdo.dbgen.oracle,org.eclipse.emf.cdo.jdbc.mysql,org.eclipse.emf.cdo.dbgen.ansi92,org.eclipse.emf.cdo.dbgen.mysql,org.eclipse.emf.cdo.dbgen.hsqldb"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.cdo.jdbc,org.eclipse.net4j.spring,org.eclipse.net4j.socket,org.eclipse.net4j.core,org.eclipse.net4j.spring.db,org.eclipse.emf.cdo.core,org.eclipse.net4j.util,org.eclipse.emf.cdo.examples.server,org.eclipse.emf.cdo.dbgen,org.eclipse.emf.cdo.server,org.eclipse.emf.cdo.dbgen.oracle,org.eclipse.emf.cdo.jdbc.mysql,org.eclipse.emf.cdo.dbgen.ansi92,org.eclipse.emf.cdo.dbgen.mysql,org.eclipse.emf.cdo.dbgen.hsqldb"/>
<stringAttribute key="location4" value="C:\workspaces\runtime-workspace"/>
<booleanAttribute key="org.eclipse.hyades.trace.ui.ATTR_SHOW_EXEC_INSTANCES" value="false"/>
-<stringAttribute key="application" value="org.eclipse.emf.cdo.example.server.application"/>
+<stringAttribute key="application" value="org.eclipse.emf.cdo.examples.server.application"/>
<stringAttribute key="configLocation" value=""/>
<stringAttribute key="org.eclipse.hyades.trace.ui.ATTR_DESTINATION_MONITOR" value="DefaultMonitor"/>
<booleanAttribute key="org.eclipse.hyades.trace.ui.ATTR_EXEC_POLLING_FREQ_MODE" value="true"/>
diff --git a/plugins/org.eclipse.emf.cdo.examples.server/plugin.xml b/plugins/org.eclipse.emf.cdo.examples.server/plugin.xml
index 8877eca..0a09824 100644
--- a/plugins/org.eclipse.emf.cdo.examples.server/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.examples.server/plugin.xml
@@ -7,7 +7,7 @@
name="CDO Example Server Application"
point="org.eclipse.core.runtime.applications">
<application>
- <run class="org.eclipse.emf.cdo.example.server.internal.ExampleServerApplication"/>
+ <run class="org.eclipse.emf.cdo.examples.server.internal.ExampleServerApplication"/>
</application>
</extension>
diff --git a/plugins/org.eclipse.emf.cdo.examples.server/src/org/eclipse/emf/cdo/examples/server/internal/ExampleServerApplication.java b/plugins/org.eclipse.emf.cdo.examples.server/src/org/eclipse/emf/cdo/examples/server/internal/ExampleServerApplication.java
index 5ccf85f..578ef78 100644
--- a/plugins/org.eclipse.emf.cdo.examples.server/src/org/eclipse/emf/cdo/examples/server/internal/ExampleServerApplication.java
+++ b/plugins/org.eclipse.emf.cdo.examples.server/src/org/eclipse/emf/cdo/examples/server/internal/ExampleServerApplication.java
@@ -8,7 +8,7 @@
* Contributors:
* Eike Stepper - initial API and implementation
**************************************************************************/
-package org.eclipse.emf.cdo.example.server.internal;
+package org.eclipse.emf.cdo.examples.server.internal;
import org.eclipse.net4j.util.thread.DeadlockDetector;
diff --git a/plugins/org.eclipse.emf.cdo.examples.server/src/org/eclipse/emf/cdo/examples/server/internal/ExampleServerPlugin.java b/plugins/org.eclipse.emf.cdo.examples.server/src/org/eclipse/emf/cdo/examples/server/internal/ExampleServerPlugin.java
index df57b75..0815934 100644
--- a/plugins/org.eclipse.emf.cdo.examples.server/src/org/eclipse/emf/cdo/examples/server/internal/ExampleServerPlugin.java
+++ b/plugins/org.eclipse.emf.cdo.examples.server/src/org/eclipse/emf/cdo/examples/server/internal/ExampleServerPlugin.java
@@ -8,7 +8,7 @@
* Contributors:
* Eike Stepper - initial API and implementation
**************************************************************************/
-package org.eclipse.emf.cdo.example.server.internal;
+package org.eclipse.emf.cdo.examples.server.internal;
import org.eclipse.net4j.spring.Container;
diff --git a/plugins/org.eclipse.emf.cdo.tests/.classpath b/plugins/org.eclipse.emf.cdo.tests/.classpath
index 4644f77..065ac06 100644
--- a/plugins/org.eclipse.emf.cdo.tests/.classpath
+++ b/plugins/org.eclipse.emf.cdo.tests/.classpath
@@ -3,7 +3,5 @@
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="lib/easymock.jar"/>
- <classpathentry kind="lib" path="lib/easymockclassextension.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
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 865c918..5081e0b 100644
--- a/plugins/org.eclipse.emf.cdo.tests/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.tests/META-INF/MANIFEST.MF
@@ -11,5 +11,5 @@ Eclipse-LazyStart: false
Export-Package: org.eclipse.emf.cdo.tests
Require-Bundle: org.eclipse.core.runtime,
org.junit,
- org.eclipse.emf.cdo
- org.eclipse.net4j
+ org.eclipse.emf.cdo.core,
+ org.eclipse.net4j.core
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllSuites.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllSuites.java
new file mode 100644
index 0000000..96cecc3
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllSuites.java
@@ -0,0 +1,61 @@
+/**
+ * <copyright>
+ *
+ * Copyright (c) 2006 IBM Corporation 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:
+ * IBM - Initial API and implementation
+ *
+ * </copyright>
+ *
+ * $Id: AllSuites.java,v 1.1 2006-05-29 23:06:29 nickb Exp $
+ */
+
+package org.eclipse.emf.cdo.tests;
+
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class AllSuites extends TestSuite
+{
+ private static Test[] suites = new Test []{
+ // list all test suites here
+ org.eclipse.emf.cdo.tests.AllTests.suite()
+ };
+
+ public static Test suite()
+ {
+ return new AllSuites("cdo Build JUnit Test Suite");
+ }
+
+ public AllSuites()
+ {
+ super();
+ populateSuite();
+ }
+
+ public AllSuites(Class theClass)
+ {
+ super(theClass);
+ populateSuite();
+ }
+
+ public AllSuites(String name)
+ {
+ super(name);
+ populateSuite();
+ }
+
+ protected void populateSuite()
+ {
+ for (int i = 0; i < suites.length; i++)
+ {
+ addTest(suites[i]);
+ }
+ }
+} \ No newline at end of file
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTests.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTests.java
new file mode 100644
index 0000000..5defe0c
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTests.java
@@ -0,0 +1,16 @@
+package org.eclipse.emf.cdo.tests;
+
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class AllTests {
+
+ public static Test suite() {
+ TestSuite suite = new TestSuite("Test for org.eclipse.emf.cdo.tests");
+// TODO: add real JUnit tests here
+ suite.addTestSuite(SampleTest.class);
+ return suite;
+ }
+
+}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/CDOTestPlugin.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/CDOTestPlugin.java
new file mode 100644
index 0000000..83b472d
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/CDOTestPlugin.java
@@ -0,0 +1,36 @@
+/**
+ * <copyright>
+ *
+ * Copyright (c) 2002-2004 IBM Corporation 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:
+ * IBM - Initial API and implementation
+ *
+ * </copyright>
+ *
+ * $Id: CDOTestPlugin.java,v 1.1 2006-05-29 23:06:29 nickb Exp $
+ */
+package org.eclipse.emf.cdo.tests;
+
+import org.eclipse.core.runtime.Plugin;
+
+public class CDOTestPlugin
+extends Plugin
+{
+ private static CDOTestPlugin instance;
+
+ public CDOTestPlugin()
+ {
+ super();
+ instance = this;
+ }
+
+ public static CDOTestPlugin getPlugin()
+ {
+ return instance;
+ }
+}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/SampleTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/SampleTest.java
new file mode 100644
index 0000000..e91d717
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/SampleTest.java
@@ -0,0 +1,10 @@
+package org.eclipse.emf.cdo.tests;
+
+import junit.framework.TestCase;
+
+public class SampleTest extends TestCase
+{
+ public static void testSample() throws Exception {
+ assertTrue(true); // TODO: add real JUnit tests here
+ }
+}