Adding registry web service and changes to WStester and JWS2Client code. Bugs in...

[jabaws.git] / webservices / compbio / ws / server / JronnWS.java

diff --git a/webservices/compbio/ws/server/JronnWS.java b/webservices/compbio/ws/server/JronnWS.java
index e9070d5..dc37f3f 100644 (file)
--- a/webservices/compbio/ws/server/JronnWS.java
+++ b/webservices/compbio/ws/server/JronnWS.java
@@ -15,6 +15,7 @@ import compbio.data.sequence.ScoreManager;
 import compbio.engine.AsyncExecutor;\r
 import compbio.engine.Configurator;\r
 import compbio.engine.client.ConfiguredExecutable;\r
+import compbio.engine.client.SkeletalExecutable;\r
 import compbio.metadata.ChunkHolder;\r
 import compbio.metadata.JobStatus;\r
 import compbio.metadata.JobSubmissionException;\r
@@ -49,10 +50,14 @@ public class JronnWS implements SequenceAnnotation<Jronn> {
        private static final PresetManager<Jronn> jronnPresets = Util\r
                        .getPresets(Jronn.class);\r
 \r
+       private static final LimitsManager<Jronn> limitMan = compbio.engine.client.Util\r
+                       .getLimits(new Jronn().getType());\r
+\r
        ConfiguredExecutable<Jronn> init(List<FastaSequence> sequences)\r
                        throws JobSubmissionException {\r
                Jronn jronn = new Jronn();\r
-               jronn.setInput("fasta.in").setOutput("jronn.out");\r
+               jronn.setInput(SkeletalExecutable.INPUT).setOutput(\r
+                               SkeletalExecutable.OUTPUT);\r
                return Configurator.configureExecutable(jronn, sequences);\r
        }\r
 \r
@@ -70,12 +75,15 @@ public class JronnWS implements SequenceAnnotation<Jronn> {
 \r
        @Override\r
        public Limit<Jronn> getLimit(String presetName) {\r
-               return new Jronn().getLimit(presetName);\r
+               if (limitMan == null) {\r
+                       return null;\r
+               }\r
+               return limitMan.getLimitByName(presetName);\r
        }\r
 \r
        @Override\r
        public LimitsManager<Jronn> getLimits() {\r
-               return new Jronn().getLimits();\r
+               return limitMan;\r
        }\r
 \r
        @Override\r