From: <bsc...@us...> - 2007-12-10 18:46:02
|
Revision: 2093 http://unicore.svn.sourceforge.net/unicore/?rev=2093&view=rev Author: bschuller Date: 2007-12-10 10:46:00 -0800 (Mon, 10 Dec 2007) Log Message: ----------- move resourceproperty classes Modified Paths: -------------- unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/client/StorageClient.java unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/fts/FileTransferImpl.java unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/job/JobManagementImpl.java unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/sms/SMSBaseImpl.java unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/util/Constants.java unicorex/uas-core/trunk/src/site/apt/programmer/getstarted.apt Added Paths: ----------- unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/fts/ProtocolRP.java unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/job/ExecutionJSDLResourceProperty.java unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/job/LogResourceProperty.java unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/job/StatusInfoResourceProperty.java unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/job/StdErrProperty.java unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/job/StdOutProperty.java unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/job/TSSReferenceResourceProperty.java unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/job/WorkingDirResourceProperty.java Removed Paths: ------------- unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/fts/rp/ProtocolRP.java unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/job/rp/ExecutionJSDLResourceProperty.java unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/job/rp/LogResourceProperty.java unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/job/rp/StatusInfoResourceProperty.java unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/job/rp/StdErrProperty.java unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/job/rp/StdOutProperty.java unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/job/rp/TSSReferenceResourceProperty.java unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/job/rp/WorkingDirResourceProperty.java Modified: unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/client/StorageClient.java =================================================================== --- unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/client/StorageClient.java 2007-12-10 18:32:46 UTC (rev 2092) +++ unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/client/StorageClient.java 2007-12-10 18:46:00 UTC (rev 2093) @@ -456,7 +456,7 @@ * @return */ public static void download(URI uri, IUASSecurityProperties sec, OutputStream writeTo) - { + { try { ProtocolType.Enum protocol = ProtocolType.Enum.forString(uri.getScheme()); String storageUrl = uri.getSchemeSpecificPart(); Modified: unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/fts/FileTransferImpl.java =================================================================== --- unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/fts/FileTransferImpl.java 2007-12-10 18:32:46 UTC (rev 2092) +++ unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/fts/FileTransferImpl.java 2007-12-10 18:46:00 UTC (rev 2093) @@ -51,7 +51,6 @@ import org.unigrids.x2006.x04.services.fts.TransferredBytesDocument; import org.w3.x2005.x08.addressing.EndpointReferenceType; -import de.fzj.unicore.uas.fts.rp.ProtocolRP; import de.fzj.unicore.uas.impl.UASWSResourceImpl; import de.fzj.unicore.uas.xnjs.XNJSFacade; import de.fzj.unicore.wsrflite.WSRFInstance; Copied: unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/fts/ProtocolRP.java (from rev 1303, unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/fts/rp/ProtocolRP.java) =================================================================== --- unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/fts/ProtocolRP.java (rev 0) +++ unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/fts/ProtocolRP.java 2007-12-10 18:46:00 UTC (rev 2093) @@ -0,0 +1,75 @@ +/********************************************************************************* + * Copyright (c) 2006 Forschungszentrum Juelich GmbH + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * (1) Redistributions of source code must retain the above copyright notice, + * this list of conditions and the disclaimer at the end. Redistributions in + * binary form must reproduce the above copyright notice, this list of + * conditions and the following disclaimer in the documentation and/or other + * materials provided with the distribution. + * + * (2) Neither the name of Forschungszentrum Juelich GmbH nor the names of its + * contributors may be used to endorse or promote products derived from this + * software without specific prior written permission. + * + * DISCLAIMER + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + ********************************************************************************/ + + +package de.fzj.unicore.uas.fts; + +import org.unigrids.services.atomic.types.ProtocolDocument; +import org.unigrids.services.atomic.types.ProtocolType; + +import de.fzj.unicore.wsrflite.xmlbeans.ResourceProperty; + +/** + * Property representing a filetransfer protocol + */ +public class ProtocolRP extends ResourceProperty<ProtocolType.Enum[]>{ + + private static final long serialVersionUID = -3186248112485716127L; + + private ProtocolDocument[] xdoc; + private ProtocolType.Enum[] protocols; + + public ProtocolRP(ProtocolType.Enum[] protocols){ + this.protocols=protocols; + xdoc=new ProtocolDocument[protocols.length]; + for(int i=0;i<protocols.length;i++){ + ProtocolType.Enum protocol= protocols[i]; + ProtocolDocument pd=ProtocolDocument.Factory.newInstance(); + pd.setProtocol(protocol); + xdoc[i]=pd; + } + } + + @Override + public ProtocolDocument[] getXml() { + return xdoc; + } + + + /** + * returns the protocol array + */ + @Override + public ProtocolType.Enum[] getProperty() { + return protocols; + } +} \ No newline at end of file Deleted: unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/fts/rp/ProtocolRP.java =================================================================== --- unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/fts/rp/ProtocolRP.java 2007-12-10 18:32:46 UTC (rev 2092) +++ unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/fts/rp/ProtocolRP.java 2007-12-10 18:46:00 UTC (rev 2093) @@ -1,75 +0,0 @@ -/********************************************************************************* - * Copyright (c) 2006 Forschungszentrum Juelich GmbH - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * (1) Redistributions of source code must retain the above copyright notice, - * this list of conditions and the disclaimer at the end. Redistributions in - * binary form must reproduce the above copyright notice, this list of - * conditions and the following disclaimer in the documentation and/or other - * materials provided with the distribution. - * - * (2) Neither the name of Forschungszentrum Juelich GmbH nor the names of its - * contributors may be used to endorse or promote products derived from this - * software without specific prior written permission. - * - * DISCLAIMER - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - ********************************************************************************/ - - -package de.fzj.unicore.uas.fts.rp; - -import org.unigrids.services.atomic.types.ProtocolDocument; -import org.unigrids.services.atomic.types.ProtocolType; - -import de.fzj.unicore.wsrflite.xmlbeans.ResourceProperty; - -/** - * Property representing a filetransfer protocol - */ -public class ProtocolRP extends ResourceProperty<ProtocolType.Enum[]>{ - - private static final long serialVersionUID = -3186248112485716127L; - - private ProtocolDocument[] xdoc; - private ProtocolType.Enum[] protocols; - - public ProtocolRP(ProtocolType.Enum[] protocols){ - this.protocols=protocols; - xdoc=new ProtocolDocument[protocols.length]; - for(int i=0;i<protocols.length;i++){ - ProtocolType.Enum protocol= protocols[i]; - ProtocolDocument pd=ProtocolDocument.Factory.newInstance(); - pd.setProtocol(protocol); - xdoc[i]=pd; - } - } - - @Override - public ProtocolDocument[] getXml() { - return xdoc; - } - - - /** - * returns the protocol array - */ - @Override - public ProtocolType.Enum[] getProperty() { - return protocols; - } -} \ No newline at end of file Copied: unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/job/ExecutionJSDLResourceProperty.java (from rev 1303, unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/job/rp/ExecutionJSDLResourceProperty.java) =================================================================== --- unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/job/ExecutionJSDLResourceProperty.java (rev 0) +++ unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/job/ExecutionJSDLResourceProperty.java 2007-12-10 18:46:00 UTC (rev 2093) @@ -0,0 +1,86 @@ +/********************************************************************************* + * Copyright (c) 2006 Forschungszentrum Juelich GmbH + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * (1) Redistributions of source code must retain the above copyright notice, + * this list of conditions and the disclaimer at the end. Redistributions in + * binary form must reproduce the above copyright notice, this list of + * conditions and the following disclaimer in the documentation and/or other + * materials provided with the distribution. + * + * (2) Neither the name of Forschungszentrum Juelich GmbH nor the names of its + * contributors may be used to endorse or promote products derived from this + * software without specific prior written permission. + * + * DISCLAIMER + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + ********************************************************************************/ + + +package de.fzj.unicore.uas.impl.job; + +import java.util.logging.Logger; + +import org.ggf.schemas.jsdl.x2005.x11.jsdl.JobDefinitionDocument; +import org.unigrids.x2006.x04.services.jms.ExecutionJSDLDocument; + +import de.fzj.unicore.uas.xnjs.XNJSFacade; +import de.fzj.unicore.wsrflite.xmlbeans.ResourceProperty; + +/** + * Contains the JSDL job description that is actually executed by the XNJS + * after incarnation + */ +public class ExecutionJSDLResourceProperty extends ResourceProperty<Object> { + protected static final long serialVersionUID=20348L; + + protected static Logger logger=Logger.getLogger(ExecutionJSDLResourceProperty.class.getName()); + + private ExecutionJSDLDocument[] xdoc; + + private String actionId; + + /** + * + * @param jobID the id of the job + */ + public ExecutionJSDLResourceProperty(String jobID){ + this.actionId=jobID; + xdoc=new ExecutionJSDLDocument[1]; + + } + + @Override + public ExecutionJSDLDocument getProperty() { + return xdoc[0]; + } + + @Override + public ExecutionJSDLDocument[] getXml() { + return xdoc; + } + + @Override + public ExecutionJSDLResourceProperty update() throws Exception{ + JobDefinitionDocument jdd=(JobDefinitionDocument)XNJSFacade.getAction(actionId).getAjd(); + ExecutionJSDLDocument ejd=ExecutionJSDLDocument.Factory.newInstance(); + ejd.setExecutionJSDL(jdd.getJobDefinition()); + xdoc[0]=ejd; + return this; + } + +} Modified: unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/job/JobManagementImpl.java =================================================================== --- unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/job/JobManagementImpl.java 2007-12-10 18:32:46 UTC (rev 2092) +++ unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/job/JobManagementImpl.java 2007-12-10 18:46:00 UTC (rev 2093) @@ -62,13 +62,6 @@ import de.fzj.unicore.uas.faults.JobNotStartedFault; import de.fzj.unicore.uas.impl.UASWSResourceImpl; import de.fzj.unicore.uas.impl.bp.BPSupportImpl; -import de.fzj.unicore.uas.impl.job.rp.ExecutionJSDLResourceProperty; -import de.fzj.unicore.uas.impl.job.rp.LogResourceProperty; -import de.fzj.unicore.uas.impl.job.rp.StatusInfoResourceProperty; -import de.fzj.unicore.uas.impl.job.rp.StdErrProperty; -import de.fzj.unicore.uas.impl.job.rp.StdOutProperty; -import de.fzj.unicore.uas.impl.job.rp.TSSReferenceResourceProperty; -import de.fzj.unicore.uas.impl.job.rp.WorkingDirResourceProperty; import de.fzj.unicore.uas.impl.sms.SMSBaseImpl; import de.fzj.unicore.uas.impl.sms.StorageManagementHomeImpl; import de.fzj.unicore.uas.impl.sms.StorageManagementHomeImpl.StorageTypes; Copied: unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/job/LogResourceProperty.java (from rev 1303, unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/job/rp/LogResourceProperty.java) =================================================================== --- unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/job/LogResourceProperty.java (rev 0) +++ unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/job/LogResourceProperty.java 2007-12-10 18:46:00 UTC (rev 2093) @@ -0,0 +1,106 @@ +/********************************************************************************* + * Copyright (c) 2006 Forschungszentrum Juelich GmbH + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * (1) Redistributions of source code must retain the above copyright notice, + * this list of conditions and the disclaimer at the end. Redistributions in + * binary form must reproduce the above copyright notice, this list of + * conditions and the following disclaimer in the documentation and/or other + * materials provided with the distribution. + * + * (2) Neither the name of Forschungszentrum Juelich GmbH nor the names of its + * contributors may be used to endorse or promote products derived from this + * software without specific prior written permission. + * + * DISCLAIMER + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + ********************************************************************************/ + + +package de.fzj.unicore.uas.impl.job; + +import java.util.List; +import java.util.logging.Logger; + +import org.unigrids.x2006.x04.services.jms.LogDocument; + +import de.fzj.unicore.uas.xnjs.XNJSFacade; +import de.fzj.unicore.wsrflite.xmlbeans.ResourceProperty; +import de.fzj.unicore.xnjs.aaa.Client; + +/** + * Contains the job log (which is copied from the XNJS Action log) + */ +public class LogResourceProperty extends ResourceProperty<String>{ + protected static final long serialVersionUID=20348L; + + protected static Logger logger=Logger.getLogger(LogResourceProperty.class.getName()); + + private LogDocument status; + + private LogDocument[] xdoc; + + private String actionId; + + /** + * TODO + * log can be seen without access control, + * is this a security hole in the XNJS or not? + */ + private Client client; + + /** + * + * @param jobID the id of the job + */ + public LogResourceProperty(String jobID, Client client){ + status=LogDocument.Factory.newInstance(); + status.setLog(""); + xdoc=new LogDocument[]{status}; + this.actionId=jobID; + this.client=client; + } + + @Override + public String getProperty() { + return status.getLog(); + } + + @Override + public LogDocument[] getXml() { + return xdoc; + } + + @Override + public void setProperty(String log) { + status.setLog(log); + } + + /** + * + * @see de.fzj.unicore.wsrflite.ResourceProperty#update() + */ + @Override + public LogResourceProperty update() throws Exception{ + StringBuffer sb=new StringBuffer(); + List<String> l=XNJSFacade.getAction(actionId).getLog(); + for(String s:l)sb.append(s+"\n"); + status.setLog(sb.toString()); + return this; + } + +} Copied: unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/job/StatusInfoResourceProperty.java (from rev 1519, unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/job/rp/StatusInfoResourceProperty.java) =================================================================== --- unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/job/StatusInfoResourceProperty.java (rev 0) +++ unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/job/StatusInfoResourceProperty.java 2007-12-10 18:46:00 UTC (rev 2093) @@ -0,0 +1,142 @@ +/********************************************************************************* + * Copyright (c) 2006 Forschungszentrum Juelich GmbH + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * (1) Redistributions of source code must retain the above copyright notice, + * this list of conditions and the disclaimer at the end. Redistributions in + * binary form must reproduce the above copyright notice, this list of + * conditions and the following disclaimer in the documentation and/or other + * materials provided with the distribution. + * + * (2) Neither the name of Forschungszentrum Juelich GmbH nor the names of its + * contributors may be used to endorse or promote products derived from this + * software without specific prior written permission. + * + * DISCLAIMER + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + ********************************************************************************/ + + +package de.fzj.unicore.uas.impl.job; + +import java.math.BigInteger; +import java.util.logging.Logger; + +import org.unigrids.services.atomic.types.StatusInfoDocument; +import org.unigrids.services.atomic.types.StatusType.Enum; + +import de.fzj.unicore.uas.xnjs.XNJSFacade; +import de.fzj.unicore.wsrflite.xmlbeans.ResourceProperty; +import de.fzj.unicore.xnjs.aaa.Client; +import de.fzj.unicore.xnjs.ems.ActionStatus; + +/** + * Represents the job status + */ +public class StatusInfoResourceProperty extends ResourceProperty<Object> { + protected static final long serialVersionUID=20348L; + + protected static Logger logger=Logger.getLogger(StatusInfoResourceProperty.class.getName()); + + private StatusInfoDocument status; + + private StatusInfoDocument[] xdoc; + + private String actionId; + private Client client; + + /** + * + * @param jobID the id of the job + */ + public StatusInfoResourceProperty(String jobID, Client client){ + status=StatusInfoDocument.Factory.newInstance(); + status.addNewStatusInfo(); + xdoc=new StatusInfoDocument[]{status}; + this.actionId=jobID; + } + + @Override + public StatusInfoDocument[] getXml() { + return xdoc; + } + + /** + * + * @see de.fzj.unicore.wsrflite.ResourceProperty#update() + */ + @Override + public StatusInfoResourceProperty update() throws Exception{ + status.getStatusInfo().setStatus( + convertStatus( + XNJSFacade.getStatus(actionId,client))); + + Integer exitCode=XNJSFacade.getExitCode(actionId,client); + if(exitCode!=null){ + status.getStatusInfo().setExitCode(BigInteger.valueOf(exitCode.longValue())); + } + return this; + } + + /** + * converts from the XNJS action status to Unicore job status + * + * states from unigridsTypes.xsd + * + * <xsd:simpleType name="StatusType"> + <xsd:restriction base="xsd:string"> + <xsd:enumeration value="UNDEFINED"/> + <xsd:enumeration value="READY"/> + <xsd:enumeration value="QUEUED"/> + <xsd:enumeration value="RUNNING"/> + <xsd:enumeration value="SUCCESSFUL"/> + <xsd:enumeration value="FAILED"/> + <xsd:enumeration value="STAGINGIN"/> + <xsd:enumeration value="STAGINGOUT"/> + </xsd:restriction> + </xsd:simpleType> + * + * @param emsStatus + * @return UNICORE status + */ + protected Enum convertStatus(Integer emsStatus){ + int i=emsStatus.intValue(); + switch (i){ + case ActionStatus.PREPROCESSING: + return Enum.forString("STAGINGIN"); + case ActionStatus.POSTPROCESSING: + return Enum.forString("STAGINGOUT"); + case ActionStatus.RUNNING: + return Enum.forString("RUNNING"); + case ActionStatus.PENDING: + return Enum.forString("QUEUED"); + case ActionStatus.READY: + return Enum.forString("READY"); + case ActionStatus.DONE: + //figure out if success or not + if(XNJSFacade.getAction(actionId).getResult().isSuccessful()){ + return Enum.forString("SUCCESSFUL"); + } + else{ + return Enum.forString("FAILED"); + } + default: + return Enum.forString("UNDEFINED"); + } + } + +} Copied: unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/job/StdErrProperty.java (from rev 1303, unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/job/rp/StdErrProperty.java) =================================================================== --- unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/job/StdErrProperty.java (rev 0) +++ unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/job/StdErrProperty.java 2007-12-10 18:46:00 UTC (rev 2093) @@ -0,0 +1,42 @@ +package de.fzj.unicore.uas.impl.job; + +import org.unigrids.x2006.x04.services.jms.StdErrDocument; + +import de.fzj.unicore.uas.xnjs.XNJSFacade; +import de.fzj.unicore.wsrflite.xmlbeans.ResourceProperty; + +public class StdErrProperty extends ResourceProperty<String> { + + private static final long serialVersionUID = 1L; + + private String actionID; + + private String sErr; + + public StdErrProperty(String actionID){ + this.actionID=actionID; + sErr="stderr"; + } + + @Override + public StdErrDocument[] getXml() { + StdErrDocument s=StdErrDocument.Factory.newInstance(); + s.setStdErr(sErr); + return new StdErrDocument[]{s}; + } + + @Override + public StdErrProperty update() throws Exception { + try{ + XNJSFacade.getAction(actionID).getExecutionContext().getStderr(); + }catch(Exception e){ + sErr="stderr"; + } + return this; + } + + @Override + public String getProperty() { + return sErr; + } +} Copied: unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/job/StdOutProperty.java (from rev 1303, unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/job/rp/StdOutProperty.java) =================================================================== --- unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/job/StdOutProperty.java (rev 0) +++ unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/job/StdOutProperty.java 2007-12-10 18:46:00 UTC (rev 2093) @@ -0,0 +1,42 @@ +package de.fzj.unicore.uas.impl.job; + +import org.unigrids.x2006.x04.services.jms.StdOutDocument; + +import de.fzj.unicore.uas.xnjs.XNJSFacade; +import de.fzj.unicore.wsrflite.xmlbeans.ResourceProperty; + +public class StdOutProperty extends ResourceProperty<String> { + + private static final long serialVersionUID = 1L; + + private String actionID; + + private String sOut; + + public StdOutProperty(String actionID){ + this.actionID=actionID; + sOut="stdout"; + } + + @Override + public StdOutDocument[] getXml() { + StdOutDocument s=StdOutDocument.Factory.newInstance(); + s.setStdOut(sOut); + return new StdOutDocument[]{s}; + } + + @Override + public StdOutProperty update() throws Exception { + try{ + XNJSFacade.getAction(actionID).getExecutionContext().getStdout(); + }catch(Exception e){ + sOut="stdout"; + } + return this; + } + + @Override + public String getProperty() { + return sOut; + } +} Copied: unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/job/TSSReferenceResourceProperty.java (from rev 1303, unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/job/rp/TSSReferenceResourceProperty.java) =================================================================== --- unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/job/TSSReferenceResourceProperty.java (rev 0) +++ unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/job/TSSReferenceResourceProperty.java 2007-12-10 18:46:00 UTC (rev 2093) @@ -0,0 +1,72 @@ +/********************************************************************************* + * Copyright (c) 2006 Forschungszentrum Juelich GmbH + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * (1) Redistributions of source code must retain the above copyright notice, + * this list of conditions and the disclaimer at the end. Redistributions in + * binary form must reproduce the above copyright notice, this list of + * conditions and the following disclaimer in the documentation and/or other + * materials provided with the distribution. + * + * (2) Neither the name of Forschungszentrum Juelich GmbH nor the names of its + * contributors may be used to endorse or promote products derived from this + * software without specific prior written permission. + * + * DISCLAIMER + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + ********************************************************************************/ + + +package de.fzj.unicore.uas.impl.job; + +import org.unigrids.x2006.x04.services.jms.TargetSystemReferenceDocument; +import org.w3.x2005.x08.addressing.EndpointReferenceType; + +import de.fzj.unicore.wsrflite.xmlbeans.ResourceProperty; + +/** + * holds a reference to the TargetSystem service to which the job was submitted + */ +public class TSSReferenceResourceProperty extends ResourceProperty<EndpointReferenceType> { + protected static final long serialVersionUID=20348L; + + private TargetSystemReferenceDocument [] xdoc; + private TargetSystemReferenceDocument ref; + + public TSSReferenceResourceProperty(EndpointReferenceType epr){ + ref=TargetSystemReferenceDocument.Factory.newInstance(); + ref.setTargetSystemReference(epr); + xdoc=new TargetSystemReferenceDocument []{ref}; + } + + @Override + public TargetSystemReferenceDocument [] getXml() { + // TODO Auto-generated method stub + return xdoc; + } + + /** + * set the reference + * + * @param EndpointReferenceType + */ + @Override + public void setProperty(EndpointReferenceType epr) { + ref.setTargetSystemReference((EndpointReferenceType)epr); + } + +} Copied: unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/job/WorkingDirResourceProperty.java (from rev 1303, unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/job/rp/WorkingDirResourceProperty.java) =================================================================== --- unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/job/WorkingDirResourceProperty.java (rev 0) +++ unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/job/WorkingDirResourceProperty.java 2007-12-10 18:46:00 UTC (rev 2093) @@ -0,0 +1,74 @@ +/********************************************************************************* + * Copyright (c) 2006 Forschungszentrum Juelich GmbH + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * (1) Redistributions of source code must retain the above copyright notice, + * this list of conditions and the disclaimer at the end. Redistributions in + * binary form must reproduce the above copyright notice, this list of + * conditions and the following disclaimer in the documentation and/or other + * materials provided with the distribution. + * + * (2) Neither the name of Forschungszentrum Juelich GmbH nor the names of its + * contributors may be used to endorse or promote products derived from this + * software without specific prior written permission. + * + * DISCLAIMER + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + ********************************************************************************/ + + +package de.fzj.unicore.uas.impl.job; + +import org.unigrids.x2006.x04.services.jms.WorkingDirectoryReferenceDocument; +import org.w3.x2005.x08.addressing.EndpointReferenceType; + +import de.fzj.unicore.wsrflite.xmlbeans.ResourceProperty; + +/** + * holds the Uspace EPR + * + * @author schuller + * @version $Id: WorkingDirResourceProperty.java,v 1.5 2006/09/08 12:33:47 bschuller Exp $ + */ +public class WorkingDirResourceProperty extends ResourceProperty<EndpointReferenceType>{ + + protected static final long serialVersionUID=20348L; + + private WorkingDirectoryReferenceDocument[] xdoc; + + private WorkingDirectoryReferenceDocument wrd; + + public WorkingDirResourceProperty(EndpointReferenceType epr){ + setProperty(epr); + } + + @Override + public WorkingDirectoryReferenceDocument[] getXml() { + return xdoc; + } + + /** + * pass in the epr + */ + @Override + public void setProperty(EndpointReferenceType newEpr) { + wrd=WorkingDirectoryReferenceDocument.Factory.newInstance(); + wrd.setWorkingDirectoryReference(newEpr); + xdoc=new WorkingDirectoryReferenceDocument[]{wrd}; + } + +} Deleted: unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/job/rp/ExecutionJSDLResourceProperty.java =================================================================== --- unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/job/rp/ExecutionJSDLResourceProperty.java 2007-12-10 18:32:46 UTC (rev 2092) +++ unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/job/rp/ExecutionJSDLResourceProperty.java 2007-12-10 18:46:00 UTC (rev 2093) @@ -1,86 +0,0 @@ -/********************************************************************************* - * Copyright (c) 2006 Forschungszentrum Juelich GmbH - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * (1) Redistributions of source code must retain the above copyright notice, - * this list of conditions and the disclaimer at the end. Redistributions in - * binary form must reproduce the above copyright notice, this list of - * conditions and the following disclaimer in the documentation and/or other - * materials provided with the distribution. - * - * (2) Neither the name of Forschungszentrum Juelich GmbH nor the names of its - * contributors may be used to endorse or promote products derived from this - * software without specific prior written permission. - * - * DISCLAIMER - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - ********************************************************************************/ - - -package de.fzj.unicore.uas.impl.job.rp; - -import java.util.logging.Logger; - -import org.ggf.schemas.jsdl.x2005.x11.jsdl.JobDefinitionDocument; -import org.unigrids.x2006.x04.services.jms.ExecutionJSDLDocument; - -import de.fzj.unicore.uas.xnjs.XNJSFacade; -import de.fzj.unicore.wsrflite.xmlbeans.ResourceProperty; - -/** - * Contains the JSDL job description that is actually executed by the XNJS - * after incarnation - */ -public class ExecutionJSDLResourceProperty extends ResourceProperty<Object> { - protected static final long serialVersionUID=20348L; - - protected static Logger logger=Logger.getLogger(ExecutionJSDLResourceProperty.class.getName()); - - private ExecutionJSDLDocument[] xdoc; - - private String actionId; - - /** - * - * @param jobID the id of the job - */ - public ExecutionJSDLResourceProperty(String jobID){ - this.actionId=jobID; - xdoc=new ExecutionJSDLDocument[1]; - - } - - @Override - public ExecutionJSDLDocument getProperty() { - return xdoc[0]; - } - - @Override - public ExecutionJSDLDocument[] getXml() { - return xdoc; - } - - @Override - public ExecutionJSDLResourceProperty update() throws Exception{ - JobDefinitionDocument jdd=(JobDefinitionDocument)XNJSFacade.getAction(actionId).getAjd(); - ExecutionJSDLDocument ejd=ExecutionJSDLDocument.Factory.newInstance(); - ejd.setExecutionJSDL(jdd.getJobDefinition()); - xdoc[0]=ejd; - return this; - } - -} Deleted: unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/job/rp/LogResourceProperty.java =================================================================== --- unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/job/rp/LogResourceProperty.java 2007-12-10 18:32:46 UTC (rev 2092) +++ unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/job/rp/LogResourceProperty.java 2007-12-10 18:46:00 UTC (rev 2093) @@ -1,106 +0,0 @@ -/********************************************************************************* - * Copyright (c) 2006 Forschungszentrum Juelich GmbH - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * (1) Redistributions of source code must retain the above copyright notice, - * this list of conditions and the disclaimer at the end. Redistributions in - * binary form must reproduce the above copyright notice, this list of - * conditions and the following disclaimer in the documentation and/or other - * materials provided with the distribution. - * - * (2) Neither the name of Forschungszentrum Juelich GmbH nor the names of its - * contributors may be used to endorse or promote products derived from this - * software without specific prior written permission. - * - * DISCLAIMER - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - ********************************************************************************/ - - -package de.fzj.unicore.uas.impl.job.rp; - -import java.util.List; -import java.util.logging.Logger; - -import org.unigrids.x2006.x04.services.jms.LogDocument; - -import de.fzj.unicore.uas.xnjs.XNJSFacade; -import de.fzj.unicore.wsrflite.xmlbeans.ResourceProperty; -import de.fzj.unicore.xnjs.aaa.Client; - -/** - * Contains the job log (which is copied from the XNJS Action log) - */ -public class LogResourceProperty extends ResourceProperty<String>{ - protected static final long serialVersionUID=20348L; - - protected static Logger logger=Logger.getLogger(LogResourceProperty.class.getName()); - - private LogDocument status; - - private LogDocument[] xdoc; - - private String actionId; - - /** - * TODO - * log can be seen without access control, - * is this a security hole in the XNJS or not? - */ - private Client client; - - /** - * - * @param jobID the id of the job - */ - public LogResourceProperty(String jobID, Client client){ - status=LogDocument.Factory.newInstance(); - status.setLog(""); - xdoc=new LogDocument[]{status}; - this.actionId=jobID; - this.client=client; - } - - @Override - public String getProperty() { - return status.getLog(); - } - - @Override - public LogDocument[] getXml() { - return xdoc; - } - - @Override - public void setProperty(String log) { - status.setLog(log); - } - - /** - * - * @see de.fzj.unicore.wsrflite.ResourceProperty#update() - */ - @Override - public LogResourceProperty update() throws Exception{ - StringBuffer sb=new StringBuffer(); - List<String> l=XNJSFacade.getAction(actionId).getLog(); - for(String s:l)sb.append(s+"\n"); - status.setLog(sb.toString()); - return this; - } - -} Deleted: unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/job/rp/StatusInfoResourceProperty.java =================================================================== --- unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/job/rp/StatusInfoResourceProperty.java 2007-12-10 18:32:46 UTC (rev 2092) +++ unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/job/rp/StatusInfoResourceProperty.java 2007-12-10 18:46:00 UTC (rev 2093) @@ -1,142 +0,0 @@ -/********************************************************************************* - * Copyright (c) 2006 Forschungszentrum Juelich GmbH - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * (1) Redistributions of source code must retain the above copyright notice, - * this list of conditions and the disclaimer at the end. Redistributions in - * binary form must reproduce the above copyright notice, this list of - * conditions and the following disclaimer in the documentation and/or other - * materials provided with the distribution. - * - * (2) Neither the name of Forschungszentrum Juelich GmbH nor the names of its - * contributors may be used to endorse or promote products derived from this - * software without specific prior written permission. - * - * DISCLAIMER - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - ********************************************************************************/ - - -package de.fzj.unicore.uas.impl.job.rp; - -import java.math.BigInteger; -import java.util.logging.Logger; - -import org.unigrids.services.atomic.types.StatusInfoDocument; -import org.unigrids.services.atomic.types.StatusType.Enum; - -import de.fzj.unicore.uas.xnjs.XNJSFacade; -import de.fzj.unicore.wsrflite.xmlbeans.ResourceProperty; -import de.fzj.unicore.xnjs.aaa.Client; -import de.fzj.unicore.xnjs.ems.ActionStatus; - -/** - * Represents the job status - */ -public class StatusInfoResourceProperty extends ResourceProperty<Object> { - protected static final long serialVersionUID=20348L; - - protected static Logger logger=Logger.getLogger(StatusInfoResourceProperty.class.getName()); - - private StatusInfoDocument status; - - private StatusInfoDocument[] xdoc; - - private String actionId; - private Client client; - - /** - * - * @param jobID the id of the job - */ - public StatusInfoResourceProperty(String jobID, Client client){ - status=StatusInfoDocument.Factory.newInstance(); - status.addNewStatusInfo(); - xdoc=new StatusInfoDocument[]{status}; - this.actionId=jobID; - } - - @Override - public StatusInfoDocument[] getXml() { - return xdoc; - } - - /** - * - * @see de.fzj.unicore.wsrflite.ResourceProperty#update() - */ - @Override - public StatusInfoResourceProperty update() throws Exception{ - status.getStatusInfo().setStatus( - convertStatus( - XNJSFacade.getStatus(actionId,client))); - - Integer exitCode=XNJSFacade.getExitCode(actionId,client); - if(exitCode!=null){ - status.getStatusInfo().setExitCode(BigInteger.valueOf(exitCode.longValue())); - } - return this; - } - - /** - * converts from the XNJS action status to Unicore job status - * - * states from unigridsTypes.xsd - * - * <xsd:simpleType name="StatusType"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="UNDEFINED"/> - <xsd:enumeration value="READY"/> - <xsd:enumeration value="QUEUED"/> - <xsd:enumeration value="RUNNING"/> - <xsd:enumeration value="SUCCESSFUL"/> - <xsd:enumeration value="FAILED"/> - <xsd:enumeration value="STAGINGIN"/> - <xsd:enumeration value="STAGINGOUT"/> - </xsd:restriction> - </xsd:simpleType> - * - * @param emsStatus - * @return UNICORE status - */ - protected Enum convertStatus(Integer emsStatus){ - int i=emsStatus.intValue(); - switch (i){ - case ActionStatus.PREPROCESSING: - return Enum.forString("STAGINGIN"); - case ActionStatus.POSTPROCESSING: - return Enum.forString("STAGINGOUT"); - case ActionStatus.RUNNING: - return Enum.forString("RUNNING"); - case ActionStatus.PENDING: - return Enum.forString("QUEUED"); - case ActionStatus.READY: - return Enum.forString("READY"); - case ActionStatus.DONE: - //figure out if success or not - if(XNJSFacade.getAction(actionId).getResult().isSuccessful()){ - return Enum.forString("SUCCESSFUL"); - } - else{ - return Enum.forString("FAILED"); - } - default: - return Enum.forString("UNDEFINED"); - } - } - -} Deleted: unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/job/rp/StdErrProperty.java =================================================================== --- unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/job/rp/StdErrProperty.java 2007-12-10 18:32:46 UTC (rev 2092) +++ unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/job/rp/StdErrProperty.java 2007-12-10 18:46:00 UTC (rev 2093) @@ -1,42 +0,0 @@ -package de.fzj.unicore.uas.impl.job.rp; - -import org.unigrids.x2006.x04.services.jms.StdErrDocument; - -import de.fzj.unicore.uas.xnjs.XNJSFacade; -import de.fzj.unicore.wsrflite.xmlbeans.ResourceProperty; - -public class StdErrProperty extends ResourceProperty<String> { - - private static final long serialVersionUID = 1L; - - private String actionID; - - private String sErr; - - public StdErrProperty(String actionID){ - this.actionID=actionID; - sErr="stderr"; - } - - @Override - public StdErrDocument[] getXml() { - StdErrDocument s=StdErrDocument.Factory.newInstance(); - s.setStdErr(sErr); - return new StdErrDocument[]{s}; - } - - @Override - public StdErrProperty update() throws Exception { - try{ - XNJSFacade.getAction(actionID).getExecutionContext().getStderr(); - }catch(Exception e){ - sErr="stderr"; - } - return this; - } - - @Override - public String getProperty() { - return sErr; - } -} Deleted: unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/job/rp/StdOutProperty.java =================================================================== --- unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/job/rp/StdOutProperty.java 2007-12-10 18:32:46 UTC (rev 2092) +++ unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/job/rp/StdOutProperty.java 2007-12-10 18:46:00 UTC (rev 2093) @@ -1,42 +0,0 @@ -package de.fzj.unicore.uas.impl.job.rp; - -import org.unigrids.x2006.x04.services.jms.StdOutDocument; - -import de.fzj.unicore.uas.xnjs.XNJSFacade; -import de.fzj.unicore.wsrflite.xmlbeans.ResourceProperty; - -public class StdOutProperty extends ResourceProperty<String> { - - private static final long serialVersionUID = 1L; - - private String actionID; - - private String sOut; - - public StdOutProperty(String actionID){ - this.actionID=actionID; - sOut="stdout"; - } - - @Override - public StdOutDocument[] getXml() { - StdOutDocument s=StdOutDocument.Factory.newInstance(); - s.setStdOut(sOut); - return new StdOutDocument[]{s}; - } - - @Override - public StdOutProperty update() throws Exception { - try{ - XNJSFacade.getAction(actionID).getExecutionContext().getStdout(); - }catch(Exception e){ - sOut="stdout"; - } - return this; - } - - @Override - public String getProperty() { - return sOut; - } -} Deleted: unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/job/rp/TSSReferenceResourceProperty.java =================================================================== --- unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/job/rp/TSSReferenceResourceProperty.java 2007-12-10 18:32:46 UTC (rev 2092) +++ unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/job/rp/TSSReferenceResourceProperty.java 2007-12-10 18:46:00 UTC (rev 2093) @@ -1,72 +0,0 @@ -/********************************************************************************* - * Copyright (c) 2006 Forschungszentrum Juelich GmbH - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * (1) Redistributions of source code must retain the above copyright notice, - * this list of conditions and the disclaimer at the end. Redistributions in - * binary form must reproduce the above copyright notice, this list of - * conditions and the following disclaimer in the documentation and/or other - * materials provided with the distribution. - * - * (2) Neither the name of Forschungszentrum Juelich GmbH nor the names of its - * contributors may be used to endorse or promote products derived from this - * software without specific prior written permission. - * - * DISCLAIMER - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - ********************************************************************************/ - - -package de.fzj.unicore.uas.impl.job.rp; - -import org.unigrids.x2006.x04.services.jms.TargetSystemReferenceDocument; -import org.w3.x2005.x08.addressing.EndpointReferenceType; - -import de.fzj.unicore.wsrflite.xmlbeans.ResourceProperty; - -/** - * holds a reference to the TargetSystem service to which the job was submitted - */ -public class TSSReferenceResourceProperty extends ResourceProperty<EndpointReferenceType> { - protected static final long serialVersionUID=20348L; - - private TargetSystemReferenceDocument [] xdoc; - private TargetSystemReferenceDocument ref; - - public TSSReferenceResourceProperty(EndpointReferenceType epr){ - ref=TargetSystemReferenceDocument.Factory.newInstance(); - ref.setTargetSystemReference(epr); - xdoc=new TargetSystemReferenceDocument []{ref}; - } - - @Override - public TargetSystemReferenceDocument [] getXml() { - // TODO Auto-generated method stub - return xdoc; - } - - /** - * set the reference - * - * @param EndpointReferenceType - */ - @Override - public void setProperty(EndpointReferenceType epr) { - ref.setTargetSystemReference((EndpointReferenceType)epr); - } - -} Deleted: unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/job/rp/WorkingDirResourceProperty.java =================================================================== --- unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/job/rp/WorkingDirResourceProperty.java 2007-12-10 18:32:46 UTC (rev 2092) +++ unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/job/rp/WorkingDirResourceProperty.java 2007-12-10 18:46:00 UTC (rev 2093) @@ -1,74 +0,0 @@ -/********************************************************************************* - * Copyright (c) 2006 Forschungszentrum Juelich GmbH - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * (1) Redistributions of source code must retain the above copyright notice, - * this list of conditions and the disclaimer at the end. Redistributions in - * binary form must reproduce the above copyright notice, this list of - * conditions and the following disclaimer in the documentation and/or other - * materials provided with the distribution. - * - * (2) Neither the name of Forschungszentrum Juelich GmbH nor the names of its - * contributors may be used to endorse or promote products derived from this - * software without specific prior written permission. - * - * DISCLAIMER - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - ********************************************************************************/ - - -package de.fzj.unicore.uas.impl.job.rp; - -import org.unigrids.x2006.x04.services.jms.WorkingDirectoryReferenceDocument; -import org.w3.x2005.x08.addressing.EndpointReferenceType; - -import de.fzj.unicore.wsrflite.xmlbeans.ResourceProperty; - -/** - * holds the Uspace EPR - * - * @author schuller - * @version $Id: WorkingDirResourceProperty.java,v 1.5 2006/09/08 12:33:47 bschuller Exp $ - */ -public class WorkingDirResourceProperty extends ResourceProperty<EndpointReferenceType>{ - - protected static final long serialVersionUID=20348L; - - private WorkingDirectoryReferenceDocument[] xdoc; - - private WorkingDirectoryReferenceDocument wrd; - - public WorkingDirResourceProperty(EndpointReferenceType epr){ - setProperty(epr); - } - - @Override - public WorkingDirectoryReferenceDocument[] getXml() { - return xdoc; - } - - /** - * pass in the epr - */ - @Override - public void setProperty(EndpointReferenceType newEpr) { - wrd=WorkingDirectoryReferenceDocument.Factory.newInstance(); - wrd.setWorkingDirectoryReference(newEpr); - xdoc=new WorkingDirectoryReferenceDocument[]{wrd}; - } - -} Modified: unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/sms/SMSBaseImpl.java =================================================================== --- unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/sms/SMSBaseImpl.java 2007-12-10 18:32:46 UTC (rev 2092) +++ unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/impl/sms/SMSBaseImpl.java 2007-12-10 18:46:00 UTC (rev 2093) @@ -75,7 +75,7 @@ import de.fzj.unicore.uas.StorageManagement; import de.fzj.unicore.uas.UAS; import de.fzj.unicore.uas.fts.FileTransferImpl; -import de.fzj.unicore.uas.fts.rp.ProtocolRP; +import de.fzj.unicore.uas.fts.ProtocolRP; import de.fzj.unicore.uas.impl.UASWSResourceImpl; import de.fzj.unicore.uas.impl.bp.BPSupportImpl; import de.fzj.unicore.uas.util.AddressingUtil; Modified: unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/util/Constants.java =================================================================== --- unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/util/Constants.java 2007-12-10 18:32:46 UTC (rev 2092) +++ unicorex/uas-core/trunk/src/main/java/de/fzj/unicore/uas/util/Constants.java 2007-12-10 18:46:00 UTC (rev 2093) @@ -38,7 +38,7 @@ public class Constants { /** - * will be removed in the 6.0.1 release + * will be removed in the 6.1 release */ @Deprecated public final static QName FLE_RESOURCE_DISAMBIGUATOR= Modified: unicorex/uas-core/trunk/src/site/apt/programmer/getstarted.apt =================================================================== --- unicorex/uas-core/trunk/src/site/apt/programmer/getstarted.apt 2007-12-10 18:32:46 UTC (rev 2092) +++ unicorex/uas-core/trunk/src/site/apt/programmer/getstarted.apt 2007-12-10 18:46:00 UTC (rev 2093) @@ -194,7 +194,7 @@ +-------------- Make sure to read up on maven or check the UNICORE pom.xml files to see some other -useful configuration options. For starters, remember that Java code goes into "rsc/main/java" and +useful configuration options. For starters, remember that Java code goes into "src/main/java" and JUnit tests go into "src/test/java". Have fun! This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |