git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...

diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/server/actions/ExecuteRunableAction.java b/server/user.jobengine.osgi.server/src/user/jobengine/server/actions/ExecuteRunnableAction.java
similarity index 83%
rename from server/user.jobengine.osgi.server/src/user/jobengine/server/actions/ExecuteRunableAction.java
rename to server/user.jobengine.osgi.server/src/user/jobengine/server/actions/ExecuteRunnableAction.java
index d9a9b9faa583b8cd1f1b6695ed2185ea237b0250..d71d903458f94429d38c3e2301aeba3bb3ba64c5 100644 (file)
--- a/server/user.jobengine.osgi.server/src/user/jobengine/server/actions/ExecuteRunableAction.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/server/actions/ExecuteRunnableAction.java
@@ -4,7 +4,7 @@ import user.commons.JobStatus;
 import user.jobengine.server.IJobEngine;\r
 import user.jobengine.server.IJobRuntime;\r
 \r
-public class ExecuteRunableAction implements IJobStatusAction {\r
+public class ExecuteRunnableAction implements IJobStatusAction {\r
        @Override\r
        public void processAction(IJobEngine jobEngine, IJobRuntime jobRuntime) {\r
                jobRuntime.setStatus(JobStatus.WAIT_EXECUTOR);\r

diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/server/actions/FinishRunableAction.java b/server/user.jobengine.osgi.server/src/user/jobengine/server/actions/FinishRunnableAction.java
similarity index 86%
rename from server/user.jobengine.osgi.server/src/user/jobengine/server/actions/FinishRunableAction.java
rename to server/user.jobengine.osgi.server/src/user/jobengine/server/actions/FinishRunnableAction.java
index 988623dd03777b0a72fb8d9702bb0a2cedae15bf..4522c6759a23e56828f7c87bb1797882f521daf1 100644 (file)
--- a/server/user.jobengine.osgi.server/src/user/jobengine/server/actions/FinishRunableAction.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/server/actions/FinishRunnableAction.java
@@ -6,7 +6,7 @@ import user.commons.JobStatus;
 import user.jobengine.server.IJobEngine;\r
 import user.jobengine.server.IJobRuntime;\r
 \r
-public class FinishRunableAction implements IJobStatusAction {\r
+public class FinishRunnableAction implements IJobStatusAction {\r
        @Override\r
        public void processAction(IJobEngine jobEngine, IJobRuntime jobRuntime) {\r
                // jobs.remove(job.getJobId());\r

diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/server/actions/MessageRunableAction.java b/server/user.jobengine.osgi.server/src/user/jobengine/server/actions/MessageRunnableAction.java
similarity index 80%
rename from server/user.jobengine.osgi.server/src/user/jobengine/server/actions/MessageRunableAction.java
rename to server/user.jobengine.osgi.server/src/user/jobengine/server/actions/MessageRunnableAction.java
index 4988103932e1176360568b0014c4d24cd0dd46f8..e8e9ac2c29b8f137e9f8c6403125894d70c1d0f1 100644 (file)
--- a/server/user.jobengine.osgi.server/src/user/jobengine/server/actions/MessageRunableAction.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/server/actions/MessageRunnableAction.java
@@ -4,7 +4,7 @@ import user.commons.JobStatus;
 import user.jobengine.server.IJobEngine;\r
 import user.jobengine.server.IJobRuntime;\r
 \r
-public class MessageRunableAction implements IJobStatusAction {\r
+public class MessageRunnableAction implements IJobStatusAction {\r
 \r
        @Override\r
        public void processAction(IJobEngine jobEngine, IJobRuntime jobRuntime) {\r

diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/server/actions/SuspendRunableAction.java b/server/user.jobengine.osgi.server/src/user/jobengine/server/actions/SuspendRunnableAction.java
similarity index 82%
rename from server/user.jobengine.osgi.server/src/user/jobengine/server/actions/SuspendRunableAction.java
rename to server/user.jobengine.osgi.server/src/user/jobengine/server/actions/SuspendRunnableAction.java
index a05f6a3b890aa1631133dc219b70f3c4a7772ab2..7b66f8f7f61e130e657453b2d08659e754652ffa 100644 (file)
--- a/server/user.jobengine.osgi.server/src/user/jobengine/server/actions/SuspendRunableAction.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/server/actions/SuspendRunnableAction.java
@@ -4,7 +4,7 @@ import user.commons.JobStatus;
 import user.jobengine.server.IJobEngine;\r
 import user.jobengine.server.IJobRuntime;\r
 \r
-public class SuspendRunableAction implements IJobStatusAction {\r
+public class SuspendRunnableAction implements IJobStatusAction {\r
 \r
        @Override\r
        public void processAction(IJobEngine jobEngine, IJobRuntime jobRuntime) {\r

diff --git a/server/user.jobengine.osgi.server/test/user/jobengine/server/actions/CancelRunableActionTest.java b/server/user.jobengine.osgi.server/test/user/jobengine/server/actions/CancelRunableActionTest.java
deleted file mode 100644 (file)
index 3dc47a1..0000000
--- a/server/user.jobengine.osgi.server/test/user/jobengine/server/actions/CancelRunableActionTest.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package user.jobengine.server.actions;
-
-import org.jmock.Expectations;
-import org.junit.Test;
-
-import user.commons.JobStatus;
-
-public class CancelRunableActionTest extends ActionTest {
-       
-       @Test
-       public void testProcessAction() throws Exception {
-               // Fixture
-               final IJobStatusAction sut = new CancelRunableAction(); 
-               context.checking(new Expectations() {{
-               one (jobRuntime).setStatus(JobStatus.CANCELED);
-               one (jobRuntime).setDescription("Canceled by user");
-               one (jobRuntime).reset();
-                   one (jobEngine).removeFromRunQueue(jobRuntime);
-           }});        
-               
-               // Exercise, Verify
-               sut.processAction(jobEngine, jobRuntime);
-       }
-}

diff --git a/server/user.jobengine.osgi.server/test/user/jobengine/server/actions/CancelRunnableActionTest.java b/server/user.jobengine.osgi.server/test/user/jobengine/server/actions/CancelRunnableActionTest.java
new file mode 100644 (file)
index 0000000..7b12a76
--- /dev/null
+++ b/server/user.jobengine.osgi.server/test/user/jobengine/server/actions/CancelRunnableActionTest.java
@@ -0,0 +1,26 @@
+package user.jobengine.server.actions;
+
+import org.jmock.Expectations;
+import org.junit.Test;
+
+import user.commons.JobStatus;
+
+public class CancelRunnableActionTest extends ActionTest {
+
+       @Test
+       public void testProcessAction() throws Exception {
+               // Fixture
+               final IJobStatusAction sut = new CancelRunnableAction();
+               context.checking(new Expectations() {
+                       {
+                               one(jobRuntime).setStatus(JobStatus.CANCELED);
+                               one(jobRuntime).setDescription("Canceled by user");
+                               one(jobRuntime).reset();
+                               one(jobEngine).removeFromRunQueue(jobRuntime);
+                       }
+               });
+
+               // Exercise, Verify
+               sut.processAction(jobEngine, jobRuntime);
+       }
+}

diff --git a/server/user.jobengine.osgi.server/test/user/jobengine/server/actions/ExecuteRunableActionTest.java b/server/user.jobengine.osgi.server/test/user/jobengine/server/actions/ExecuteRunnableActionTest.java
similarity index 79%
rename from server/user.jobengine.osgi.server/test/user/jobengine/server/actions/ExecuteRunableActionTest.java
rename to server/user.jobengine.osgi.server/test/user/jobengine/server/actions/ExecuteRunnableActionTest.java
index f1c76ab0c8450a015d80cb465f8b2757887682bc..6e41b4e5248548787f577963d553d185b48d0569 100644 (file)
--- a/server/user.jobengine.osgi.server/test/user/jobengine/server/actions/ExecuteRunableActionTest.java
+++ b/server/user.jobengine.osgi.server/test/user/jobengine/server/actions/ExecuteRunnableActionTest.java
@@ -5,12 +5,12 @@ import org.junit.Test;
 
 import user.commons.JobStatus;
 
-public class ExecuteRunableActionTest extends ActionTest {
+public class ExecuteRunnableActionTest extends ActionTest {
        
        @Test
        public void testProcessAction() throws Exception {
                // Fixture
-               final IJobStatusAction sut = new ExecuteRunableAction(); 
+               final IJobStatusAction sut = new ExecuteRunnableAction(); 
                context.checking(new Expectations() {{
                one (jobRuntime).setStatus(JobStatus.WAIT_EXECUTOR);
                    one (jobRuntime).saveStack();

diff --git a/server/user.jobengine.osgi.server/test/user/jobengine/server/actions/FinishRunableActionTest.java b/server/user.jobengine.osgi.server/test/user/jobengine/server/actions/FinishRunnableActionTest.java
similarity index 82%
rename from server/user.jobengine.osgi.server/test/user/jobengine/server/actions/FinishRunableActionTest.java
rename to server/user.jobengine.osgi.server/test/user/jobengine/server/actions/FinishRunnableActionTest.java
index 1a6243c8fb29a274f871177cb23f6f3da8971ab0..1c5c9d992d2cf1d3a1126c58d02066ed5e447683 100644 (file)
--- a/server/user.jobengine.osgi.server/test/user/jobengine/server/actions/FinishRunableActionTest.java
+++ b/server/user.jobengine.osgi.server/test/user/jobengine/server/actions/FinishRunnableActionTest.java
@@ -7,12 +7,12 @@ import org.junit.Test;
 
 import user.commons.JobStatus;
 
-public class FinishRunableActionTest extends ActionTest {
+public class FinishRunnableActionTest extends ActionTest {
 
        @Test
        public void testProcessAction() throws Exception {
                // Fixture
-               IJobStatusAction sut = new FinishRunableAction();
+               IJobStatusAction sut = new FinishRunnableAction();
                context.checking(new Expectations() {{
                one (jobRuntime).setFinished(with(any(Timestamp.class)));
                one (jobRuntime).setStatus(JobStatus.FINISHED);