Modified: ode/trunk/engine/src/main/java/org/apache/ode/bpel/memdao/MessageExchangeDAOImpl.java URL: http://svn.apache.org/viewvc/ode/trunk/engine/src/main/java/org/apache/ode/bpel/memdao/MessageExchangeDAOImpl.java?rev=745274&r1=745273&r2=745274&view=diff ============================================================================== --- ode/trunk/engine/src/main/java/org/apache/ode/bpel/memdao/MessageExchangeDAOImpl.java (original) +++ ode/trunk/engine/src/main/java/org/apache/ode/bpel/memdao/MessageExchangeDAOImpl.java Tue Feb 17 22:15:22 2009 @@ -42,25 +42,25 @@ public class MessageExchangeDAOImpl extends DaoBaseImpl implements MessageExchangeDAO { String messageExchangeId; - MessageDAO response; - Date createTime; - MessageDAO request; - String operation; - QName portType; - Status status; - int partnerLinkModelId; - String correlationId; - MessageExchangePattern pattern; - Element ePR; - String channel; - QName fault; + MessageDAO response; + Date createTime; + MessageDAO request; + String operation; + QName portType; + Status status; + int partnerLinkModelId; + String correlationId; + MessageExchangePattern pattern; + Element ePR; + String channel; + QName fault; String faultExplanation; String correlationStatus; - ProcessDAO process; - ProcessInstanceDAO instance; - char direction; - QName callee; - Properties properties = new Properties(); + ProcessDAO process; + ProcessInstanceDAO instance; + char direction; + QName callee; + Properties properties = new Properties(); PartnerLinkDAOImpl _plink; InvocationStyle _istyle; String _pipedExchange; @@ -69,122 +69,122 @@ AckType _ackType; QName _pipedPID; - public MessageExchangeDAOImpl(char direction, String messageEchangeId){ - this.direction = direction; - this.messageExchangeId = messageEchangeId; + public MessageExchangeDAOImpl(char direction, String messageEchangeId){ + this.direction = direction; + this.messageExchangeId = messageEchangeId; + } + + public String getMessageExchangeId() { + return messageExchangeId; } - - public String getMessageExchangeId() { - return messageExchangeId; - } - public MessageDAO getResponse() { - return response; - } + public MessageDAO getResponse() { + return response; + } - public Date getCreateTime() { - return createTime; - } + public Date getCreateTime() { + return createTime; + } - public MessageDAO getRequest() { - return request; - } + public MessageDAO getRequest() { + return request; + } - public String getOperation() { - return operation; - } + public String getOperation() { + return operation; + } - public QName getPortType() { - return portType; - } + public QName getPortType() { + return portType; + } - public void setPortType(QName porttype) { - this.portType = porttype; + public void setPortType(QName porttype) { + this.portType = porttype; - } + } - public void setStatus(Status status) { - this.status = status; + public void setStatus(Status status) { + this.status = status; - } + } - public Status getStatus() { - return status; - } + public Status getStatus() { + return status; + } - public MessageDAO createMessage(QName type) { - MessageDAO messageDAO = new MessageDAOImpl(); - messageDAO.setType(type); - return messageDAO; - } + public MessageDAO createMessage(QName type) { + MessageDAO messageDAO = new MessageDAOImpl(); + messageDAO.setType(type); + return messageDAO; + } - public void setRequest(MessageDAO msg) { - this.request = msg; + public void setRequest(MessageDAO msg) { + this.request = msg; - } + } - public void setResponse(MessageDAO msg) { - this.response = msg; + public void setResponse(MessageDAO msg) { + this.response = msg; - } + } - public int getPartnerLinkModelId() { - return partnerLinkModelId; - } + public int getPartnerLinkModelId() { + return partnerLinkModelId; + } - public void setPartnerLinkModelId(int modelId) { - this.partnerLinkModelId = modelId; + public void setPartnerLinkModelId(int modelId) { + this.partnerLinkModelId = modelId; - } + } - public String getPartnersKey() { - return correlationId; - } + public String getPartnersKey() { + return correlationId; + } - public void setPartnersKey(String correlationId) { - this.correlationId = correlationId; + public void setPartnersKey(String correlationId) { + this.correlationId = correlationId; - } + } - public void setPattern(MessageExchangePattern pattern) { - this.pattern = pattern; + public void setPattern(MessageExchangePattern pattern) { + this.pattern = pattern; - } + } - public void setOperation(String opname) { - this.operation = opname; + public void setOperation(String opname) { + this.operation = opname; - } + } - public void setEPR(Element epr) { - this.ePR = epr; + public void setEPR(Element epr) { + this.ePR = epr; - } + } - public Element getEPR() { - return ePR; - } + public Element getEPR() { + return ePR; + } - - public MessageExchangePattern getPattern() { - return pattern; - } + + public MessageExchangePattern getPattern() { + return pattern; + } - public String getChannel() { - return channel; - } + public String getChannel() { + return channel; + } - public void setChannel(String string) { - this.channel = string; - } + public void setChannel(String string) { + this.channel = string; + } - public QName getFault() { - return fault; - } + public QName getFault() { + return fault; + } - public void setFault(QName faultType) { - this.fault = faultType; - } + public void setFault(QName faultType) { + this.fault = faultType; + } public String getFaultExplanation() { return faultExplanation; @@ -196,50 +196,50 @@ public void setCorrelationStatus(String cstatus) { - this.correlationStatus = cstatus; - } + this.correlationStatus = cstatus; + } - public String getCorrelationStatus() { - return correlationStatus; - } + public String getCorrelationStatus() { + return correlationStatus; + } - public ProcessDAO getProcess() { - return process; - } + public ProcessDAO getProcess() { + return process; + } - public void setProcess(ProcessDAO process) { - this.process = process; + public void setProcess(ProcessDAO process) { + this.process = process; - } + } - public void setInstance(ProcessInstanceDAO dao) { - this.instance = dao; - } + public void setInstance(ProcessInstanceDAO dao) { + this.instance = dao; + } - public ProcessInstanceDAO getInstance() { - return instance; - } + public ProcessInstanceDAO getInstance() { + return instance; + } - public char getDirection() { - return direction; - } + public char getDirection() { + return direction; + } - public QName getCallee() { - return callee; - } + public QName getCallee() { + return callee; + } - public void setCallee(QName callee) { - this.callee = callee; + public void setCallee(QName callee) { + this.callee = callee; - } + } - public String getProperty(String key) { - return properties.getProperty(key); - } + public String getProperty(String key) { + return properties.getProperty(key); + } - public void setProperty(String key, String value) { - properties.setProperty(key,value); - } + public void setProperty(String key, String value) { + properties.setProperty(key,value); + } public void setPartnerLink(PartnerLinkDAO plinkDAO) { _plink = (PartnerLinkDAOImpl) plinkDAO;
Modified: ode/trunk/engine/src/main/java/org/apache/ode/bpel/memdao/ProcessDaoImpl.java URL: http://svn.apache.org/viewvc/ode/trunk/engine/src/main/java/org/apache/ode/bpel/memdao/ProcessDaoImpl.java?rev=745274&r1=745273&r2=745274&view=diff ============================================================================== --- ode/trunk/engine/src/main/java/org/apache/ode/bpel/memdao/ProcessDaoImpl.java (original) +++ ode/trunk/engine/src/main/java/org/apache/ode/bpel/memdao/ProcessDaoImpl.java Tue Feb 17 22:15:22 2009 @@ -133,17 +133,17 @@ } public Collection<ProcessInstanceDAO> findInstance(CorrelationKey key) { - return findInstance(key, true); + return findInstance(key, true); } public Collection<ProcessInstanceDAO> findInstance(CorrelationKey key, boolean wait) { ArrayList<ProcessInstanceDAO> result = new ArrayList<ProcessInstanceDAO>(); for (ProcessInstanceDAO instance : _instances.values()) { for (CorrelationSetDAO corrSet : instance.getCorrelationSets()) { - CorrelationKey value = corrSet.getValue(); - if (value != null) { - if (value.equals(key)) result.add(instance); - } + CorrelationKey value = corrSet.getValue(); + if (value != null) { + if (value.equals(key)) result.add(instance); + } } } return result; Modified: ode/trunk/engine/src/main/java/org/apache/ode/bpel/runtime/breaks/ActivityBreakpointImpl.java URL: http://svn.apache.org/viewvc/ode/trunk/engine/src/main/java/org/apache/ode/bpel/runtime/breaks/ActivityBreakpointImpl.java?rev=745274&r1=745273&r2=745274&view=diff ============================================================================== --- ode/trunk/engine/src/main/java/org/apache/ode/bpel/runtime/breaks/ActivityBreakpointImpl.java (original) +++ ode/trunk/engine/src/main/java/org/apache/ode/bpel/runtime/breaks/ActivityBreakpointImpl.java Tue Feb 17 22:15:22 2009 @@ -27,30 +27,30 @@ private static final long serialVersionUID = -8717519287041871427L; private String _activityName; - public ActivityBreakpointImpl(String uuid, String activityName) { - super(uuid); + public ActivityBreakpointImpl(String uuid, String activityName) { + super(uuid); _activityName = activityName; - } + } /** - * @see org.apache.ode.bpel.bdi.breaks.ActivityBreakpoint#activityName() - */ - public String activityName() { - return _activityName; - } + * @see org.apache.ode.bpel.bdi.breaks.ActivityBreakpoint#activityName() + */ + public String activityName() { + return _activityName; + } /** - * @see org.apache.ode.bpel.runtime.breaks.BreakpointImpl#checkBreak(org.apache.ode.bpel.evt.BpelEvent) - */ - public boolean checkBreak(BpelEvent event) { - return isEnabled() + * @see org.apache.ode.bpel.runtime.breaks.BreakpointImpl#checkBreak(org.apache.ode.bpel.evt.BpelEvent) + */ + public boolean checkBreak(BpelEvent event) { + return isEnabled() && (event instanceof ActivityExecStartEvent && ((ActivityExecStartEvent)event).getActivityName() != null && ((ActivityExecStartEvent)event).getActivityName().equals(_activityName)) || - ((event instanceof ScopeCompletionEvent) + ((event instanceof ScopeCompletionEvent) && ((ScopeCompletionEvent)event).getScopeName() != null - && ((ScopeCompletionEvent)event).getScopeName().equals(_activityName)); - } - + && ((ScopeCompletionEvent)event).getScopeName().equals(_activityName)); + } + } Modified: ode/trunk/engine/src/main/java/org/apache/ode/bpel/runtime/breaks/BreakpointImpl.java URL: http://svn.apache.org/viewvc/ode/trunk/engine/src/main/java/org/apache/ode/bpel/runtime/breaks/BreakpointImpl.java?rev=745274&r1=745273&r2=745274&view=diff ============================================================================== --- ode/trunk/engine/src/main/java/org/apache/ode/bpel/runtime/breaks/BreakpointImpl.java (original) +++ ode/trunk/engine/src/main/java/org/apache/ode/bpel/runtime/breaks/BreakpointImpl.java Tue Feb 17 22:15:22 2009 @@ -24,42 +24,42 @@ import java.io.Serializable; public abstract class BreakpointImpl implements Breakpoint, Serializable { - + private String _uuid; private boolean _enabled = true; - public BreakpointImpl(String uuid) { - _uuid = uuid; - } + public BreakpointImpl(String uuid) { + _uuid = uuid; + } /** - * @see org.apache.ode.bpel.bdi.breaks.Breakpoint#setEnabled(boolean) - */ - public void setEnabled(boolean enabled) { - _enabled = enabled; - } + * @see org.apache.ode.bpel.bdi.breaks.Breakpoint#setEnabled(boolean) + */ + public void setEnabled(boolean enabled) { + _enabled = enabled; + } /** - * @see org.apache.ode.bpel.bdi.breaks.Breakpoint#isEnabled() - */ - public boolean isEnabled() { - return _enabled; - } + * @see org.apache.ode.bpel.bdi.breaks.Breakpoint#isEnabled() + */ + public boolean isEnabled() { + return _enabled; + } - /** - * @see java.lang.Object#equals(java.lang.Object) - */ - public boolean equals(Object obj) { - return obj instanceof BreakpointImpl + /** + * @see java.lang.Object#equals(java.lang.Object) + */ + public boolean equals(Object obj) { + return obj instanceof BreakpointImpl && _uuid.equals(((BreakpointImpl)obj)._uuid); - } + } - /** - * @see java.lang.Object#hashCode() - */ - public int hashCode() { - return _uuid.hashCode(); - } + /** + * @see java.lang.Object#hashCode() + */ + public int hashCode() { + return _uuid.hashCode(); + } public abstract boolean checkBreak(BpelEvent event); } Modified: ode/trunk/engine/src/test/java/org/apache/ode/bpel/elang/xpath20/runtime/MockCompilerContext.java URL: http://svn.apache.org/viewvc/ode/trunk/engine/src/test/java/org/apache/ode/bpel/elang/xpath20/runtime/MockCompilerContext.java?rev=745274&r1=745273&r2=745274&view=diff ============================================================================== --- ode/trunk/engine/src/test/java/org/apache/ode/bpel/elang/xpath20/runtime/MockCompilerContext.java (original) +++ ode/trunk/engine/src/test/java/org/apache/ode/bpel/elang/xpath20/runtime/MockCompilerContext.java Tue Feb 17 22:15:22 2009 @@ -193,21 +193,21 @@ public void recoveredFromError(SourceLocation location, CompilationException error) { } - public boolean isExtensionDeclared(String namespace) { - return false; - } - public ExtensionValidator getExtensionValidator(QName extensionElementName) { - return null; - } + public boolean isExtensionDeclared(String namespace) { + return false; + } + public ExtensionValidator getExtensionValidator(QName extensionElementName) { + return null; + } public OMessageVarType.Part resolveHeaderPart(OScope.Variable variable, String partname) throws CompilationException { return null; } - public Map<URI, Source> getSchemaSources() { - return null; - } + public Map<URI, Source> getSchemaSources() { + return null; + } - public URI getBaseResourceURI() { - return null; - } + public URI getBaseResourceURI() { + return null; + } } Modified: ode/trunk/engine/src/test/java/org/apache/ode/bpel/elang/xpath20/runtime/XPath20ExpressionRuntimeTest.java URL: http://svn.apache.org/viewvc/ode/trunk/engine/src/test/java/org/apache/ode/bpel/elang/xpath20/runtime/XPath20ExpressionRuntimeTest.java?rev=745274&r1=745273&r2=745274&view=diff ============================================================================== --- ode/trunk/engine/src/test/java/org/apache/ode/bpel/elang/xpath20/runtime/XPath20ExpressionRuntimeTest.java (original) +++ ode/trunk/engine/src/test/java/org/apache/ode/bpel/elang/xpath20/runtime/XPath20ExpressionRuntimeTest.java Tue Feb 17 22:15:22 2009 @@ -151,10 +151,10 @@ return (OXPath20ExpressionBPEL20)_compiler.compileLValue(exp); } public URI getBaseResourceURI() { - return null; + return null; } - public Node getPropertyValue(QName propertyName) { - return null; - } + public Node getPropertyValue(QName propertyName) { + return null; + } } Modified: ode/trunk/engine/src/test/resources/xpath20/variables.xml URL: http://svn.apache.org/viewvc/ode/trunk/engine/src/test/resources/xpath20/variables.xml?rev=745274&r1=745273&r2=745274&view=diff ============================================================================== --- ode/trunk/engine/src/test/resources/xpath20/variables.xml (original) +++ ode/trunk/engine/src/test/resources/xpath20/variables.xml Tue Feb 17 22:15:22 2009 @@ -17,18 +17,18 @@ ~ under the License. --> <variables> - <elementVar name="emptyVar" xmlns:tns="http://foobar"; > - <tns:ApplicationData> - <tns:empty/> + <elementVar name="emptyVar" xmlns:tns="http://foobar"; > + <tns:ApplicationData> + <tns:empty/> </tns:ApplicationData> - </elementVar> + </elementVar> <elementVar name="reallyEmptyVar" xmlns:tns="http://foobar"; > - <tns:ApplicationData/> - </elementVar> - - <elementVar name="foo" xmlns:tns="http://foobar"; > - <tns:ApplicationData> + <tns:ApplicationData/> + </elementVar> + + <elementVar name="foo" xmlns:tns="http://foobar"; > + <tns:ApplicationData> <tns:ApplicationInfo> <tns:senderId>string</tns:senderId> <tns:senderName>string</tns:senderName> @@ -61,5 +61,5 @@ </tns:PaymentInfo> </tns:ApplicationData> - </elementVar> + </elementVar> </variables> \ No newline at end of file Modified: ode/trunk/jbi/src/main/java/org/apache/ode/jbi/MessageExchangePattern.java URL: http://svn.apache.org/viewvc/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/MessageExchangePattern.java?rev=745274&r1=745273&r2=745274&view=diff ============================================================================== --- ode/trunk/jbi/src/main/java/org/apache/ode/jbi/MessageExchangePattern.java (original) +++ ode/trunk/jbi/src/main/java/org/apache/ode/jbi/MessageExchangePattern.java Tue Feb 17 22:15:22 2009 @@ -25,20 +25,20 @@ */ public abstract class MessageExchangePattern { - public static final URI IN_OUT; - public static final URI IN_ONLY; + public static final URI IN_OUT; + public static final URI IN_ONLY; - static { - try { - IN_OUT = new URI("http://www.w3.org/2004/08/wsdl/in-out";); - IN_ONLY = new URI("http://www.w3.org/2004/08/wsdl/in-only";); - } - catch (Exception ex) { - throw new RuntimeException(ex); - } - } + static { + try { + IN_OUT = new URI("http://www.w3.org/2004/08/wsdl/in-out";); + IN_ONLY = new URI("http://www.w3.org/2004/08/wsdl/in-only";); + } + catch (Exception ex) { + throw new RuntimeException(ex); + } + } - private MessageExchangePattern() { - } + private MessageExchangePattern() { + } } Propchange: ode/trunk/jbi/src/main/java/org/apache/ode/jbi/MessageExchangePattern.java ('svn:executable' removed) Modified: ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeBootstrap.java URL: http://svn.apache.org/viewvc/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeBootstrap.java?rev=745274&r1=745273&r2=745274&view=diff ============================================================================== --- ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeBootstrap.java (original) +++ ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeBootstrap.java Tue Feb 17 22:15:22 2009 @@ -35,63 +35,63 @@ @SuppressWarnings("unused") private InstallationContext _installContext; - /** - * Cleans up any resources allocated by the bootstrap implementation, - * including deregistration of the extension MBean, if applicable. This method - * will be called after the onInstall() or onUninstall() method is called, - * whether it succeeds or fails. - * - * @throws javax.jbi.JBIException - * when cleanup processing fails to complete successfully. - */ - public void cleanUp() throws JBIException { - } - - /** - * Get the JMX ObjectName for the optional installation configuration MBean - * for this BPE. If there is none, the value is null. - * - * @return ObjectName the JMX object name of the installation configuration - * MBean or null if there is no MBean. - */ - public ObjectName getExtensionMBeanName() { - return null; - } - - /** - * Called to initialize the BPE bootstrap. - * - * @param installContext - * is the context containing information from the install command and - * from the BPE jar file. - * - * @throws javax.jbi.JBIException - * when there is an error requiring that the installation be - * terminated. - */ - public void init(InstallationContext installContext) throws JBIException { + /** + * Cleans up any resources allocated by the bootstrap implementation, + * including deregistration of the extension MBean, if applicable. This method + * will be called after the onInstall() or onUninstall() method is called, + * whether it succeeds or fails. + * + * @throws javax.jbi.JBIException + * when cleanup processing fails to complete successfully. + */ + public void cleanUp() throws JBIException { + } + + /** + * Get the JMX ObjectName for the optional installation configuration MBean + * for this BPE. If there is none, the value is null. + * + * @return ObjectName the JMX object name of the installation configuration + * MBean or null if there is no MBean. + */ + public ObjectName getExtensionMBeanName() { + return null; + } + + /** + * Called to initialize the BPE bootstrap. + * + * @param installContext + * is the context containing information from the install command and + * from the BPE jar file. + * + * @throws javax.jbi.JBIException + * when there is an error requiring that the installation be + * terminated. + */ + public void init(InstallationContext installContext) throws JBIException { _installContext = installContext; - } + } - /** - * Called at the beginning of installation. - * - * @throws javax.jbi.JBIException - * when there is an error requiring that the installation be - * terminated. - */ - public void onInstall() throws JBIException { - } - - /** - * Called at the beginning of uninstallation. - * - * @throws javax.jbi.JBIException - * when there is an error requiring that the uninstallation be - * terminated. - */ - public void onUninstall() throws JBIException { + /** + * Called at the beginning of installation. + * + * @throws javax.jbi.JBIException + * when there is an error requiring that the installation be + * terminated. + */ + public void onInstall() throws JBIException { + } + + /** + * Called at the beginning of uninstallation. + * + * @throws javax.jbi.JBIException + * when there is an error requiring that the uninstallation be + * terminated. + */ + public void onUninstall() throws JBIException { - } + } } Propchange: ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeBootstrap.java ('svn:executable' removed) Modified: ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeComponent.java URL: http://svn.apache.org/viewvc/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeComponent.java?rev=745274&r1=745273&r2=745274&view=diff ============================================================================== --- ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeComponent.java (original) +++ ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeComponent.java Tue Feb 17 22:15:22 2009 @@ -31,90 +31,90 @@ * This class implements {...@link javax.jbi.component.Component} interface. */ public class OdeComponent implements Component { - private OdeLifeCycle _lifeCycle; + private OdeLifeCycle _lifeCycle; - public OdeComponent() { - _lifeCycle = new OdeLifeCycle(); - } - - public ComponentLifeCycle getLifeCycle() { - return _lifeCycle; - } - - public ServiceUnitManager getServiceUnitManager() { - return _lifeCycle.getSUManager(); - } + public OdeComponent() { + _lifeCycle = new OdeLifeCycle(); + } + + public ComponentLifeCycle getLifeCycle() { + return _lifeCycle; + } + + public ServiceUnitManager getServiceUnitManager() { + return _lifeCycle.getSUManager(); + } - /** - * + /** + * * @param ref ServiceEndpoint object - * + * * @return Descriptor Object implementing * {...@link javax.jbi.servicedesc.Descriptor} interface. - */ - public Document getServiceDescription(ServiceEndpoint ref) { - return _lifeCycle.getOdeContext().getServiceDescription(ref.getServiceName()); - } - - /** - * This method is called by JBI to check if this component, in the role of - * provider of the service indicated by the given exchange, can actually - * perform the operation desired. The consumer is described by the given - * capabilities, and JBI has already ensured that a fit exists between the set - * of required capabilities of the provider and the available capabilities of - * the consumer, and vice versa. This matching consists of simple set matching - * based on capability names only. <br> - * <br> - * Note that JBI assures matches on capability names only; it is the - * responsibility of this method to examine capability values to ensure a - * match with the consumer. - * - * @param endpoint - * the endpoint to be used by the consumer - * @param exchange - * the proposed message exchange to be performed - * @return true if this provider component can perform the the given exchange - * with the described consumer - */ - public boolean isExchangeWithConsumerOkay(ServiceEndpoint endpoint, MessageExchange exchange) { - return true; - } - - /** - * This method is called by JBI to check if this component, in the role of - * consumer of the service indicated by the given exchange, can actually - * interact with the the provider completely. Ths provider is described by the - * given capabilities, and JBI has already ensure that a fit exists between - * the set of required capabilities of the consumer and the available - * capabilities of the provider, and vice versa. This matching consists of - * simple set matching based on capability names only. <br> - * <br> - * Note that JBI assures matches on capability names only; it is the - * responsibility of this method to examine capability values to ensure a - * match with the provider. - * - * @param exchange - * the proposed message exchange to be performed + */ + public Document getServiceDescription(ServiceEndpoint ref) { + return _lifeCycle.getOdeContext().getServiceDescription(ref.getServiceName()); + } + + /** + * This method is called by JBI to check if this component, in the role of + * provider of the service indicated by the given exchange, can actually + * perform the operation desired. The consumer is described by the given + * capabilities, and JBI has already ensured that a fit exists between the set + * of required capabilities of the provider and the available capabilities of + * the consumer, and vice versa. This matching consists of simple set matching + * based on capability names only. <br> + * <br> + * Note that JBI assures matches on capability names only; it is the + * responsibility of this method to examine capability values to ensure a + * match with the consumer. + * + * @param endpoint + * the endpoint to be used by the consumer + * @param exchange + * the proposed message exchange to be performed + * @return true if this provider component can perform the the given exchange + * with the described consumer + */ + public boolean isExchangeWithConsumerOkay(ServiceEndpoint endpoint, MessageExchange exchange) { + return true; + } + + /** + * This method is called by JBI to check if this component, in the role of + * consumer of the service indicated by the given exchange, can actually + * interact with the the provider completely. Ths provider is described by the + * given capabilities, and JBI has already ensure that a fit exists between + * the set of required capabilities of the consumer and the available + * capabilities of the provider, and vice versa. This matching consists of + * simple set matching based on capability names only. <br> + * <br> + * Note that JBI assures matches on capability names only; it is the + * responsibility of this method to examine capability values to ensure a + * match with the provider. + * + * @param exchange + * the proposed message exchange to be performed * @return true if this consumer component can interact with the described - * provider to perform the given exchange - */ - public boolean isExchangeWithProviderOkay(ServiceEndpoint endpoint, MessageExchange exchange) { - return true; - } - - /** - * Resolve the given endpoint reference, given the capabilities of the given - * consumer. This is called by JBI when it is attempting to resolve the given - * endpoint reference on behalf of a component. - * - * @param epr - * the endpoint reference, in some XML dialect understood by the - * appropriate component (usually a Binding Component). - * @return the service endpoint for the endpoint reference; <code>null</code> - * if the endpoint reference cannot be resolved. - */ - public ServiceEndpoint resolveEndpointReference(DocumentFragment epr) { + * provider to perform the given exchange + */ + public boolean isExchangeWithProviderOkay(ServiceEndpoint endpoint, MessageExchange exchange) { + return true; + } + + /** + * Resolve the given endpoint reference, given the capabilities of the given + * consumer. This is called by JBI when it is attempting to resolve the given + * endpoint reference on behalf of a component. + * + * @param epr + * the endpoint reference, in some XML dialect understood by the + * appropriate component (usually a Binding Component). + * @return the service endpoint for the endpoint reference; <code>null</code> + * if the endpoint reference cannot be resolved. + */ + public ServiceEndpoint resolveEndpointReference(DocumentFragment epr) { // We are an engine, so we don't have to worry about this. - return null; - } + return null; + } } Propchange: ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeComponent.java ('svn:executable' removed) Modified: ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeConsumer.java URL: http://svn.apache.org/viewvc/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeConsumer.java?rev=745274&r1=745273&r2=745274&view=diff ============================================================================== (empty) Propchange: ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeConsumer.java ('svn:executable' removed) Modified: ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeContext.java URL: http://svn.apache.org/viewvc/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeContext.java?rev=745274&r1=745273&r2=745274&view=diff ============================================================================== (empty) Propchange: ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeContext.java ('svn:executable' removed) Modified: ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java URL: http://svn.apache.org/viewvc/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java?rev=745274&r1=745273&r2=745274&view=diff ============================================================================== --- ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java (original) +++ ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java Tue Feb 17 22:15:22 2009 @@ -280,40 +280,40 @@ } private void registerMBean() throws JBIException { - ProcessAndInstanceManagementMBean pmapi = new ProcessAndInstanceManagementMBean(_ode._server,_ode._store); + ProcessAndInstanceManagementMBean pmapi = new ProcessAndInstanceManagementMBean(_ode._server,_ode._store); MBeanServer server = _ode.getContext().getMBeanServer(); try { - if (server != null) { - _mbeanName = _ode.getContext().getMBeanNames().createCustomComponentMBeanName("Management"); - if (server.isRegistered(_mbeanName)) { - server.unregisterMBean(_mbeanName); - } - server.registerMBean(pmapi, _mbeanName); - } + if (server != null) { + _mbeanName = _ode.getContext().getMBeanNames().createCustomComponentMBeanName("Management"); + if (server.isRegistered(_mbeanName)) { + server.unregisterMBean(_mbeanName); + } + server.registerMBean(pmapi, _mbeanName); + } } catch (Exception e) { - throw new JBIException(e); + throw new JBIException(e); } } private void unregisterMBean() throws JBIException { - try { - if (_mbeanName != null) { - MBeanServer server = _ode.getContext().getMBeanServer(); - assert server != null; - if (server.isRegistered(_mbeanName)) { - server.unregisterMBean(_mbeanName); - } - } - } catch (Exception e) { - throw new JBIException(e); - } + try { + if (_mbeanName != null) { + MBeanServer server = _ode.getContext().getMBeanServer(); + assert server != null; + if (server.isRegistered(_mbeanName)) { + server.unregisterMBean(_mbeanName); + } + } + } catch (Exception e) { + throw new JBIException(e); + } } private void registerEventListeners() { String listenersStr = _ode._config.getEventListeners(); if (listenersStr != null) { for (String listenerCN : listenersStr.split("\\s*(,|;)\\s*")) { - try { + try { _ode._server.registerBpelEventListener((BpelEventListener) Class.forName(listenerCN).newInstance()); __log.info(__msgs.msgBpelEventListenerRegistered(listenerCN)); } catch (Exception e) { @@ -328,7 +328,7 @@ String listenersStr = _ode._config.getMessageExchangeInterceptors(); if (listenersStr != null) { for (String interceptorCN : listenersStr.split("\\s*(,|;)\\s*")) { - try { + try { _ode._server.registerMessageExchangeInterceptor((MessageExchangeInterceptor) Class.forName(interceptorCN).newInstance()); __log.info(__msgs.msgMessageExchangeInterceptorRegistered(interceptorCN)); } catch (Exception e) { Propchange: ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java ('svn:executable' removed) Modified: ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeSUManager.java URL: http://svn.apache.org/viewvc/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeSUManager.java?rev=745274&r1=745273&r2=745274&view=diff ============================================================================== (empty) Propchange: ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeSUManager.java ('svn:executable' removed) Modified: ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeService.java URL: http://svn.apache.org/viewvc/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeService.java?rev=745274&r1=745273&r2=745274&view=diff ============================================================================== (empty) Propchange: ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeService.java ('svn:executable' removed) Modified: ode/trunk/jbi/src/main/java/org/apache/ode/jbi/Receiver.java URL: http://svn.apache.org/viewvc/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/Receiver.java?rev=745274&r1=745273&r2=745274&view=diff ============================================================================== (empty) Propchange: ode/trunk/jbi/src/main/java/org/apache/ode/jbi/Receiver.java ('svn:executable' removed) Modified: ode/trunk/jbi/src/main/java/org/apache/ode/jbi/msgmap/JbiWsdl11WrapperMapper.java URL: http://svn.apache.org/viewvc/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/msgmap/JbiWsdl11WrapperMapper.java?rev=745274&r1=745273&r2=745274&view=diff ============================================================================== (empty) Propchange: ode/trunk/jbi/src/main/java/org/apache/ode/jbi/msgmap/JbiWsdl11WrapperMapper.java ('svn:executable' removed) Modified: ode/trunk/jbi/src/main/java/org/apache/ode/jbi/msgmap/MessageTranslationException.java URL: http://svn.apache.org/viewvc/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/msgmap/MessageTranslationException.java?rev=745274&r1=745273&r2=745274&view=diff ============================================================================== --- ode/trunk/jbi/src/main/java/org/apache/ode/jbi/msgmap/MessageTranslationException.java (original) +++ ode/trunk/jbi/src/main/java/org/apache/ode/jbi/msgmap/MessageTranslationException.java Tue Feb 17 22:15:22 2009 @@ -25,10 +25,10 @@ private static final long serialVersionUID = 2253489719406683994L; public MessageTranslationException(String msg) { - super(msg); - } + super(msg); + } - public MessageTranslationException(String msg, Throwable cause) { - super(msg, cause); - } + public MessageTranslationException(String msg, Throwable cause) { + super(msg, cause); + } } Propchange: ode/trunk/jbi/src/main/java/org/apache/ode/jbi/msgmap/MessageTranslationException.java ('svn:executable' removed) Modified: ode/trunk/jbi/src/test/resources/HelloWorldRequest.xml URL: http://svn.apache.org/viewvc/ode/trunk/jbi/src/test/resources/HelloWorldRequest.xml?rev=745274&r1=745273&r2=745274&view=diff ============================================================================== --- ode/trunk/jbi/src/test/resources/HelloWorldRequest.xml (original) +++ ode/trunk/jbi/src/test/resources/HelloWorldRequest.xml Tue Feb 17 22:15:22 2009 @@ -17,7 +17,7 @@ ~ under the License. --> <message xmlns="http://java.sun.com/xml/ns/jbi/wsdl-11-wrapper";> - <part> + <part> <HelloRequest xmlns="urn:/HelloWorld2.wsdl"> <text>hello</text> </HelloRequest> Modified: ode/trunk/jca-ra/etc/ra.xml URL: http://svn.apache.org/viewvc/ode/trunk/jca-ra/etc/ra.xml?rev=745274&r1=745273&r2=745274&view=diff ============================================================================== --- ode/trunk/jca-ra/etc/ra.xml (original) +++ ode/trunk/jca-ra/etc/ra.xml Tue Feb 17 22:15:22 2009 @@ -44,7 +44,7 @@ <connectionfactory-interface> org.apache.ode.ra.OdeConnectionFactory</connectionfactory-interface> <connectionfactory-impl-class> - org.apache.ode.ra.OdeConnectionFactoryImpl </connectionfactory-impl-class> + org.apache.ode.ra.OdeConnectionFactoryImpl </connectionfactory-impl-class> <connection-interface> org.apache.ode.ra.OdeConnection </connection-interface> <connection-impl-class> org.apache.ode.ra.OdeConnectionImpl </connection-impl-class> </connection-definition> Modified: ode/trunk/jca-ra/src/main/java/org/apache/ode/ra/DummyResourceAdapter.java URL: http://svn.apache.org/viewvc/ode/trunk/jca-ra/src/main/java/org/apache/ode/ra/DummyResourceAdapter.java?rev=745274&r1=745273&r2=745274&view=diff ============================================================================== --- ode/trunk/jca-ra/src/main/java/org/apache/ode/ra/DummyResourceAdapter.java (original) +++ ode/trunk/jca-ra/src/main/java/org/apache/ode/ra/DummyResourceAdapter.java Tue Feb 17 22:15:22 2009 @@ -30,41 +30,41 @@ * Does nothing */ public class DummyResourceAdapter implements ResourceAdapter { - /** - * - */ - public DummyResourceAdapter() { - super(); - } - /** - * @see javax.resource.spi.ResourceAdapter#start(javax.resource.spi.BootstrapContext) - */ - public void start(BootstrapContext arg0) - throws ResourceAdapterInternalException { - } - /** - * @see javax.resource.spi.ResourceAdapter#stop() - */ - public void stop() { - } - /** - * @see javax.resource.spi.ResourceAdapter#endpointActivation(javax.resource.spi.endpoint.MessageEndpointFactory, javax.resource.spi.ActivationSpec) - */ - public void endpointActivation(MessageEndpointFactory arg0, - ActivationSpec arg1) throws ResourceException { - } - /** - * @see javax.resource.spi.ResourceAdapter#endpointDeactivation(javax.resource.spi.endpoint.MessageEndpointFactory, javax.resource.spi.ActivationSpec) - */ - public void endpointDeactivation(MessageEndpointFactory arg0, - ActivationSpec arg1) { - } - /** - * @see javax.resource.spi.ResourceAdapter#getXAResources(javax.resource.spi.ActivationSpec[]) - */ - public XAResource[] getXAResources(ActivationSpec[] arg0) - throws ResourceException { - // TODO Auto-generated method stub - return null; - } + /** + * + */ + public DummyResourceAdapter() { + super(); + } + /** + * @see javax.resource.spi.ResourceAdapter#start(javax.resource.spi.BootstrapContext) + */ + public void start(BootstrapContext arg0) + throws ResourceAdapterInternalException { + } + /** + * @see javax.resource.spi.ResourceAdapter#stop() + */ + public void stop() { + } + /** + * @see javax.resource.spi.ResourceAdapter#endpointActivation(javax.resource.spi.endpoint.MessageEndpointFactory, javax.resource.spi.ActivationSpec) + */ + public void endpointActivation(MessageEndpointFactory arg0, + ActivationSpec arg1) throws ResourceException { + } + /** + * @see javax.resource.spi.ResourceAdapter#endpointDeactivation(javax.resource.spi.endpoint.MessageEndpointFactory, javax.resource.spi.ActivationSpec) + */ + public void endpointDeactivation(MessageEndpointFactory arg0, + ActivationSpec arg1) { + } + /** + * @see javax.resource.spi.ResourceAdapter#getXAResources(javax.resource.spi.ActivationSpec[]) + */ + public XAResource[] getXAResources(ActivationSpec[] arg0) + throws ResourceException { + // TODO Auto-generated method stub + return null; + } } Modified: ode/trunk/ode-git.rb URL: http://svn.apache.org/viewvc/ode/trunk/ode-git.rb?rev=745274&r1=745273&r2=745274&view=diff ============================================================================== (empty) Propchange: ode/trunk/ode-git.rb ('svn:executable' removed) Modified: ode/trunk/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/Task.java URL: http://svn.apache.org/viewvc/ode/trunk/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/Task.java?rev=745274&r1=745273&r2=745274&view=diff ============================================================================== --- ode/trunk/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/Task.java (original) +++ ode/trunk/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/Task.java Tue Feb 17 22:15:22 2009 @@ -26,7 +26,7 @@ * */ class Task { - /** Scheduled date/time. */ + /** Scheduled date/time. */ public long schedDate; Task(long schedDate) { Modified: ode/trunk/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/DelegateSupport.java URL: http://svn.apache.org/viewvc/ode/trunk/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/DelegateSupport.java?rev=745274&r1=745273&r2=745274&view=diff ============================================================================== --- ode/trunk/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/DelegateSupport.java (original) +++ ode/trunk/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/DelegateSupport.java Tue Feb 17 22:15:22 2009 @@ -53,7 +53,7 @@ Connection c = _ds.getConnection(); try { c.createStatement().executeUpdate("CREATE ALIAS MOD FOR \"org.apache.ode.scheduler.simple.DelegateSupport.mod\";"); - String sql = "CREATE TABLE \"ODE_JOB\" (\"JOBID\" CHAR(64) NOT NULL, \"TS\" NUMERIC NOT NULL, \"NODEID\" char(64) NULL, \"SCHEDULED\" int NOT NULL, \"TRANSACTED\" int NOT NULL, \"DETAILS\" BINARY(4096) NULL, PRIMARY KEY(\"JOBID\"));"; + String sql = "CREATE TABLE \"ODE_JOB\" (\"JOBID\" CHAR(64) NOT NULL, \"TS\" NUMERIC NOT NULL, \"NODEID\" char(64) NULL, \"SCHEDULED\" int NOT NULL, \"TRANSACTED\" int NOT NULL, \"DETAILS\" BINARY(4096) NULL, PRIMARY KEY(\"JOBID\"));"; c.createStatement().executeUpdate(sql); } finally { c.close(); @@ -62,7 +62,7 @@ } public static long mod(long a, long b) { - return a % b; + return a % b; } } Modified: ode/trunk/scheduler-simple/src/test/resources/HelloWorld2/HelloWorld2.wsdl URL: http://svn.apache.org/viewvc/ode/trunk/scheduler-simple/src/test/resources/HelloWorld2/HelloWorld2.wsdl?rev=745274&r1=745273&r2=745274&view=diff ============================================================================== --- ode/trunk/scheduler-simple/src/test/resources/HelloWorld2/HelloWorld2.wsdl (original) +++ ode/trunk/scheduler-simple/src/test/resources/HelloWorld2/HelloWorld2.wsdl Tue Feb 17 22:15:22 2009 @@ -56,9 +56,9 @@ </wsdl:operation> </wsdl:binding> <wsdl:service name="HelloService"> - <wsdl:port name="HelloPort" binding="tns:HelloSoapBinding"> - <soap:address location="http://localhost:8080/ode/processes/helloWorld"/> - </wsdl:port> + <wsdl:port name="HelloPort" binding="tns:HelloSoapBinding"> + <soap:address location="http://localhost:8080/ode/processes/helloWorld"/> + </wsdl:port> </wsdl:service> <plnk:partnerLinkType name="HelloPartnerLinkType"> Modified: ode/trunk/scheduler-simple/src/test/resources/HelloWorld2/deploy.xml URL: http://svn.apache.org/viewvc/ode/trunk/scheduler-simple/src/test/resources/HelloWorld2/deploy.xml?rev=745274&r1=745273&r2=745274&view=diff ============================================================================== --- ode/trunk/scheduler-simple/src/test/resources/HelloWorld2/deploy.xml (original) +++ ode/trunk/scheduler-simple/src/test/resources/HelloWorld2/deploy.xml Tue Feb 17 22:15:22 2009 @@ -18,14 +18,14 @@ --> <deploy xmlns="http://ode.fivesight.com/schemas/2006/06/27/dd"; - xmlns:pns="http://ode/bpel/unit-test"; - xmlns:wns="http://ode/bpel/unit-test.wsdl";> + xmlns:pns="http://ode/bpel/unit-test"; + xmlns:wns="http://ode/bpel/unit-test.wsdl";> - <process name="pns:HelloWorld2"> - <active>true</active> - <provide partnerLink="helloPartnerLink"> - <service name="wns:HelloService" port="HelloPort"/> - </provide> - </process> + <process name="pns:HelloWorld2"> + <active>true</active> + <provide partnerLink="helloPartnerLink"> + <service name="wns:HelloService" port="HelloPort"/> + </provide> + </process> </deploy>
