Revert "Make sure the job_schedulizer service name is unique across the"

This reverts commit e4be8e4.
torquebox · Apr 3, 2013 · f7280ec · f7280ec
1 parent e4be8e4
commit f7280ec
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 17 deletions.
diff --git a/gems/core/lib/torquebox/scheduled_job.rb b/gems/core/lib/torquebox/scheduled_job.rb
@@ -133,7 +133,7 @@ def remove(name)
       #   {TorqueBox::ScheduledJob.lookup} for more details on these
       #   instances
       def list
-        prefix = job_service_name_prefix.canonical_name
+        prefix = job_service_name.canonical_name
         service_names = TorqueBox::MSC.service_names.select do |service_name|
           name = service_name.canonical_name
           name.start_with?(prefix) && !name.end_with?('mbean')
@@ -167,21 +167,21 @@ def list
       #   job.stop
       #   job.status => 'STOPPED'
       def lookup(name)
-        service_name = job_service_name_prefix.append(name)
+        service_name = job_service_name.append(name)
         service = TorqueBox::MSC.get_service(service_name)
         service.nil? ? nil : service.value
       end
 
       private
 
       # @api private
-      def job_service_name_prefix
-        TorqueBox::MSC.deployment_unit.service_name.append('torquebox').append('jobs').append('scheduled_job')
+      def job_service_name
+        TorqueBox::MSC.deployment_unit.service_name.append('scheduled_job')
       end
 
       # @api private
       def schedulizer_service_name
-        TorqueBox::MSC.deployment_unit.service_name.append('torquebox').append('jobs').append('job_schedulizer')
+        TorqueBox::MSC.deployment_unit.service_name.append('job_schedulizer')
       end
 
     end

diff --git a/modules/jobs/src/main/java/org/torquebox/jobs/as/JobsServices.java b/modules/jobs/src/main/java/org/torquebox/jobs/as/JobsServices.java
@@ -27,19 +27,8 @@ public class JobsServices extends org.projectodd.polyglot.jobs.as.JobsServices {
     public static final ServiceName TORQUEBOX = ServiceName.of("torquebox");
     public static final ServiceName JOBS = TORQUEBOX.append("jobs");
 
-    public static ServiceName jobsServices(DeploymentUnit unit) {
-        return unit.getServiceName().append(JOBS);
-    }
-
     public static ServiceName componentResolver(DeploymentUnit unit, String jobName) {
-        return jobsServices(unit).append("component_resolver").append(jobName);
+        return unit.getServiceName().append("component_resolver").append(jobName);
     }
 
-    public static ServiceName job(DeploymentUnit unit, String name) {
-        return jobsServices(unit).append("scheduled_job").append(name);
-    }
-
-    public static ServiceName schedulizer(DeploymentUnit unit) {
-        return jobsServices(unit).append("job_schedulizer");
-    }
 }