You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by mi...@apache.org on 2009/02/17 23:06:26 UTC
svn commit: r745271 [19/19] - in /ode/branches/APACHE_ODE_1.X: ./
axis2-war/src/main/webapp/ axis2-war/src/main/webapp/WEB-INF/
axis2-war/src/main/webapp/WEB-INF/classes/
axis2-war/src/main/webapp/WEB-INF/conf.hib-derby/
axis2-war/src/main/webapp/WEB-I...
Modified: ode/branches/APACHE_ODE_1.X/bpel-schemas/src/main/xsd/dd.xsd
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-schemas/src/main/xsd/dd.xsd?rev=745271&r1=745270&r2=745271&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-schemas/src/main/xsd/dd.xsd (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-schemas/src/main/xsd/dd.xsd Tue Feb 17 22:06:18 2009
@@ -93,9 +93,9 @@
</xs:annotation>
</xs:element>
- <xs:element name="cleanup"
- minOccurs="0" maxOccurs="3"
- type="dd:tCleanup" />
+ <xs:element name="cleanup"
+ minOccurs="0" maxOccurs="3"
+ type="dd:tCleanup" />
</xs:sequence>
<xs:attribute name="name" type="xs:QName" use="required"/>
@@ -116,7 +116,7 @@
<xs:complexType name="tProvide">
<xs:sequence>
<xs:element name="service" minOccurs="1" maxOccurs="1" type="dd:tService"/>
- <xs:element name="enableSharing" minOccurs="0" maxOccurs="1" type="dd:tEnableSharing"/>
+ <xs:element name="enableSharing" minOccurs="0" maxOccurs="1" type="dd:tEnableSharing"/>
</xs:sequence>
<xs:attribute name="partnerLink" type="xs:string" use="required"/>
</xs:complexType>
@@ -143,9 +143,9 @@
<xs:complexType name="tEnableSharing">
<xs:complexContent>
- <xs:restriction base="xs:anyType">
- </xs:restriction>
- </xs:complexContent>
+ <xs:restriction base="xs:anyType">
+ </xs:restriction>
+ </xs:complexContent>
</xs:complexType>
<xs:complexType name="tMexInterceptor" >
@@ -193,28 +193,28 @@
</xs:complexType>
<xs:complexType name="tCleanup">
- <xs:sequence>
- <xs:element name="category" default="all" minOccurs="0" maxOccurs="unbounded">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="instance" />
- <xs:enumeration value="variables" />
- <xs:enumeration value="messages" />
- <xs:enumeration value="correlations" />
- <xs:enumeration value="events" />
- <xs:enumeration value="all" />
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="on" use="required">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="success" />
- <xs:enumeration value="failure" />
- <xs:enumeration value="always" />
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
+ <xs:sequence>
+ <xs:element name="category" default="all" minOccurs="0" maxOccurs="unbounded">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="instance" />
+ <xs:enumeration value="variables" />
+ <xs:enumeration value="messages" />
+ <xs:enumeration value="correlations" />
+ <xs:enumeration value="events" />
+ <xs:enumeration value="all" />
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="on" use="required">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="success" />
+ <xs:enumeration value="failure" />
+ <xs:enumeration value="always" />
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
</xs:complexType>
</xs:schema>
Modified: ode/branches/APACHE_ODE_1.X/jbi/src/main/java/org/apache/ode/jbi/MessageExchangePattern.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi/src/main/java/org/apache/ode/jbi/MessageExchangePattern.java?rev=745271&r1=745270&r2=745271&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/jbi/src/main/java/org/apache/ode/jbi/MessageExchangePattern.java (original)
+++ ode/branches/APACHE_ODE_1.X/jbi/src/main/java/org/apache/ode/jbi/MessageExchangePattern.java Tue Feb 17 22:06:18 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/branches/APACHE_ODE_1.X/jbi/src/main/java/org/apache/ode/jbi/MessageExchangePattern.java
('svn:executable' removed)
Modified: ode/branches/APACHE_ODE_1.X/jbi/src/main/java/org/apache/ode/jbi/OdeBootstrap.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi/src/main/java/org/apache/ode/jbi/OdeBootstrap.java?rev=745271&r1=745270&r2=745271&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/jbi/src/main/java/org/apache/ode/jbi/OdeBootstrap.java (original)
+++ ode/branches/APACHE_ODE_1.X/jbi/src/main/java/org/apache/ode/jbi/OdeBootstrap.java Tue Feb 17 22:06:18 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/branches/APACHE_ODE_1.X/jbi/src/main/java/org/apache/ode/jbi/OdeBootstrap.java
('svn:executable' removed)
Modified: ode/branches/APACHE_ODE_1.X/jbi/src/main/java/org/apache/ode/jbi/OdeComponent.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi/src/main/java/org/apache/ode/jbi/OdeComponent.java?rev=745271&r1=745270&r2=745271&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/jbi/src/main/java/org/apache/ode/jbi/OdeComponent.java (original)
+++ ode/branches/APACHE_ODE_1.X/jbi/src/main/java/org/apache/ode/jbi/OdeComponent.java Tue Feb 17 22:06:18 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/branches/APACHE_ODE_1.X/jbi/src/main/java/org/apache/ode/jbi/OdeComponent.java
('svn:executable' removed)
Modified: ode/branches/APACHE_ODE_1.X/jbi/src/main/java/org/apache/ode/jbi/OdeConsumer.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi/src/main/java/org/apache/ode/jbi/OdeConsumer.java?rev=745271&r1=745270&r2=745271&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/jbi/src/main/java/org/apache/ode/jbi/OdeConsumer.java (original)
+++ ode/branches/APACHE_ODE_1.X/jbi/src/main/java/org/apache/ode/jbi/OdeConsumer.java Tue Feb 17 22:06:18 2009
@@ -254,10 +254,10 @@
}
public void setResponseTimeout(long timeout) {
- _responseTimeout = timeout;
+ _responseTimeout = timeout;
}
public long getResponseTimeout() {
- return _responseTimeout;
+ return _responseTimeout;
}
}
Propchange: ode/branches/APACHE_ODE_1.X/jbi/src/main/java/org/apache/ode/jbi/OdeConsumer.java
('svn:executable' removed)
Modified: ode/branches/APACHE_ODE_1.X/jbi/src/main/java/org/apache/ode/jbi/OdeContext.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi/src/main/java/org/apache/ode/jbi/OdeContext.java?rev=745271&r1=745270&r2=745271&view=diff
==============================================================================
(empty)
Propchange: ode/branches/APACHE_ODE_1.X/jbi/src/main/java/org/apache/ode/jbi/OdeContext.java
('svn:executable' removed)
Modified: ode/branches/APACHE_ODE_1.X/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java?rev=745271&r1=745270&r2=745271&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java (original)
+++ ode/branches/APACHE_ODE_1.X/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java Tue Feb 17 22:06:18 2009
@@ -229,7 +229,7 @@
_ode._server.setMessageExchangeContext(_ode._mexContext);
_ode._server.setBindingContext(new BindingContextImpl(_ode));
_ode._server.setScheduler(_ode._scheduler);
- _ode._server.setConfigProperties(_ode._config.getProperties());
+ _ode._server.setConfigProperties(_ode._config.getProperties());
_ode._server.init();
}
Propchange: ode/branches/APACHE_ODE_1.X/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java
('svn:executable' removed)
Modified: ode/branches/APACHE_ODE_1.X/jbi/src/main/java/org/apache/ode/jbi/OdeSUManager.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi/src/main/java/org/apache/ode/jbi/OdeSUManager.java?rev=745271&r1=745270&r2=745271&view=diff
==============================================================================
(empty)
Propchange: ode/branches/APACHE_ODE_1.X/jbi/src/main/java/org/apache/ode/jbi/OdeSUManager.java
('svn:executable' removed)
Modified: ode/branches/APACHE_ODE_1.X/jbi/src/main/java/org/apache/ode/jbi/OdeService.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi/src/main/java/org/apache/ode/jbi/OdeService.java?rev=745271&r1=745270&r2=745271&view=diff
==============================================================================
(empty)
Propchange: ode/branches/APACHE_ODE_1.X/jbi/src/main/java/org/apache/ode/jbi/OdeService.java
('svn:executable' removed)
Modified: ode/branches/APACHE_ODE_1.X/jbi/src/main/java/org/apache/ode/jbi/Receiver.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi/src/main/java/org/apache/ode/jbi/Receiver.java?rev=745271&r1=745270&r2=745271&view=diff
==============================================================================
(empty)
Propchange: ode/branches/APACHE_ODE_1.X/jbi/src/main/java/org/apache/ode/jbi/Receiver.java
('svn:executable' removed)
Modified: ode/branches/APACHE_ODE_1.X/jbi/src/main/java/org/apache/ode/jbi/msgmap/JbiWsdl11WrapperMapper.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi/src/main/java/org/apache/ode/jbi/msgmap/JbiWsdl11WrapperMapper.java?rev=745271&r1=745270&r2=745271&view=diff
==============================================================================
(empty)
Propchange: ode/branches/APACHE_ODE_1.X/jbi/src/main/java/org/apache/ode/jbi/msgmap/JbiWsdl11WrapperMapper.java
('svn:executable' removed)
Modified: ode/branches/APACHE_ODE_1.X/jbi/src/main/java/org/apache/ode/jbi/msgmap/MessageTranslationException.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi/src/main/java/org/apache/ode/jbi/msgmap/MessageTranslationException.java?rev=745271&r1=745270&r2=745271&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/jbi/src/main/java/org/apache/ode/jbi/msgmap/MessageTranslationException.java (original)
+++ ode/branches/APACHE_ODE_1.X/jbi/src/main/java/org/apache/ode/jbi/msgmap/MessageTranslationException.java Tue Feb 17 22:06:18 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/branches/APACHE_ODE_1.X/jbi/src/main/java/org/apache/ode/jbi/msgmap/MessageTranslationException.java
('svn:executable' removed)
Modified: ode/branches/APACHE_ODE_1.X/jbi/src/main/jbi/ode-jbi.properties
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi/src/main/jbi/ode-jbi.properties?rev=745271&r1=745270&r2=745271&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/jbi/src/main/jbi/ode-jbi.properties (original)
+++ ode/branches/APACHE_ODE_1.X/jbi/src/main/jbi/ode-jbi.properties Tue Feb 17 22:06:18 2009
@@ -36,7 +36,7 @@
# Database Mode ("INTERNAL", "EXTERNAL", "EMBEDDED")
# What kind of database should ODE use?
# * "EMBEDDED" - ODE will create its own embbeded database (Derby)
-# and connection pool (Minerva).
+# and connection pool (Minerva).
# * "EXTERNAL" - ODE will use an app-server provided database and pool.
# The "ode-jbi.db.ext.dataSource" property will need to
# be set.
Modified: ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/HelloWorldRequest.xml
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/HelloWorldRequest.xml?rev=745271&r1=745270&r2=745271&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/HelloWorldRequest.xml (original)
+++ ode/branches/APACHE_ODE_1.X/jbi/src/test/resources/HelloWorldRequest.xml Tue Feb 17 22:06:18 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/branches/APACHE_ODE_1.X/jca-ra/etc/ra.xml
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jca-ra/etc/ra.xml?rev=745271&r1=745270&r2=745271&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/jca-ra/etc/ra.xml (original)
+++ ode/branches/APACHE_ODE_1.X/jca-ra/etc/ra.xml Tue Feb 17 22:06:18 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/branches/APACHE_ODE_1.X/jca-ra/src/main/java/org/apache/ode/ra/DummyResourceAdapter.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jca-ra/src/main/java/org/apache/ode/ra/DummyResourceAdapter.java?rev=745271&r1=745270&r2=745271&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/jca-ra/src/main/java/org/apache/ode/ra/DummyResourceAdapter.java (original)
+++ ode/branches/APACHE_ODE_1.X/jca-ra/src/main/java/org/apache/ode/ra/DummyResourceAdapter.java Tue Feb 17 22:06:18 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/branches/APACHE_ODE_1.X/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/DatabaseDelegate.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/DatabaseDelegate.java?rev=745271&r1=745270&r2=745271&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/DatabaseDelegate.java (original)
+++ ode/branches/APACHE_ODE_1.X/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/DatabaseDelegate.java Tue Feb 17 22:06:18 2009
@@ -71,9 +71,9 @@
* group (of jobs that get the nodeId) is determined by the "x" parameter. Essentially the logic is:
* <code>
* UPDATE jobs AS job
- * WHERE job.scheduledTime before :maxtime
- * AND job.nodeId is null
- * AND job.scheduledTime MOD :y == :x
+ * WHERE job.scheduledTime before :maxtime
+ * AND job.nodeId is null
+ * AND job.scheduledTime MOD :y == :x
* SET job.nodeId = :nodeId
* </code>
*
Modified: ode/branches/APACHE_ODE_1.X/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/JdbcDelegate.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/JdbcDelegate.java?rev=745271&r1=745270&r2=745271&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/JdbcDelegate.java (original)
+++ ode/branches/APACHE_ODE_1.X/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/JdbcDelegate.java Tue Feb 17 22:06:18 2009
@@ -64,7 +64,7 @@
+ "and convert(int, ts) % ? = ? and ts < ?";
private static final String UPGRADE_JOB_SYBASE12 = "update ODE_JOB set nodeid = ? where nodeid is null "
- + "and -1 <> ? and -1 <> ? and ts < ?";
+ + "and -1 <> ? and -1 <> ? and ts < ?";
private static final String SAVE_JOB = "insert into ODE_JOB "
+ " (jobid, nodeid, ts, scheduled, transacted, details) values(?, ?, ?, ?, ?, ?)";
@@ -220,15 +220,15 @@
try {
con = getConnection();
if (_dialect == Dialect.SQLSERVER) {
- ps = con.prepareStatement(UPGRADE_JOB_SQLSERVER);
+ ps = con.prepareStatement(UPGRADE_JOB_SQLSERVER);
} else if (_dialect == Dialect.DB2) {
- ps = con.prepareStatement(UPGRADE_JOB_DB2);
+ ps = con.prepareStatement(UPGRADE_JOB_DB2);
} else if (_dialect == Dialect.SYBASE) {
- ps = con.prepareStatement(UPGRADE_JOB_SYBASE);
+ ps = con.prepareStatement(UPGRADE_JOB_SYBASE);
} else if (_dialect == Dialect.SYBASE12) {
ps = con.prepareStatement(UPGRADE_JOB_SYBASE12);
} else {
- ps = con.prepareStatement(UPGRADE_JOB_DEFAULT);
+ ps = con.prepareStatement(UPGRADE_JOB_DEFAULT);
}
ps.setString(1, node);
ps.setInt(2, numNodes);
@@ -300,7 +300,7 @@
} else if (dbProductName.indexOf("Sybase") >= 0 || dbProductName.indexOf("Adaptive") >= 0) {
d = Dialect.SYBASE;
if( dbMajorVer == 12 ) {
- d = Dialect.SYBASE12;
+ d = Dialect.SYBASE12;
}
}
}
Modified: ode/branches/APACHE_ODE_1.X/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/SchedulerThread.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/SchedulerThread.java?rev=745271&r1=745270&r2=745271&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/SchedulerThread.java (original)
+++ ode/branches/APACHE_ODE_1.X/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/SchedulerThread.java Tue Feb 17 22:06:18 2009
@@ -38,160 +38,160 @@
*/
class SchedulerThread implements Runnable {
- private static final Log __log = LogFactory.getLog(SchedulerThread.class);
+ private static final Log __log = LogFactory.getLog(SchedulerThread.class);
- private static final int TODO_QUEUE_INITIAL_CAPACITY = 200;
+ private static final int TODO_QUEUE_INITIAL_CAPACITY = 200;
- /** Jobs ready for immediate execution. */
- private PriorityBlockingQueue<Task> _todo;
+ /** Jobs ready for immediate execution. */
+ private PriorityBlockingQueue<Task> _todo;
- /** Lock for managing the queue */
- private ReentrantLock _lock = new ReentrantLock();
-
- private Condition _activity = _lock.newCondition();
-
- private volatile boolean _done;
-
- private TaskRunner _taskrunner;
-
- private Thread _thread;
-
- SchedulerThread(TaskRunner runner) {
- _todo = new PriorityBlockingQueue<Task>(TODO_QUEUE_INITIAL_CAPACITY,
- new JobComparatorByDate());
- _taskrunner = runner;
- }
-
- void start() {
- if (_thread != null)
- return;
-
- _done = false;
- _thread = new Thread(this, "OdeScheduler");
- _thread.start();
- }
-
- /**
- * Shutdown the thread.
- */
- void stop() {
- if (_thread == null)
- return;
-
- _done = true;
- _lock.lock();
- try {
- _activity.signal();
- } finally {
- _lock.unlock();
-
- }
-
- while (_thread != null)
- try {
- _thread.join();
- _thread = null;
- } catch (InterruptedException e) {
- ;
- }
-
- }
-
- /**
- * Add a job to the todo queue.
- *
- * @param job
- */
- void enqueue(Task task) {
- _lock.lock();
- try {
- _todo.add(task);
- _activity.signal();
- } finally {
- _lock.unlock();
- }
- }
-
- /**
- * Remove a job to the todo queue.
- *
- * @param job
- */
- void dequeue(Task task) {
- _lock.lock();
- try {
- _todo.remove(task);
- _activity.signal();
- } finally {
- _lock.unlock();
- }
- }
-
- /**
- * Get the size of the todo queue.
- *
- * @return
- */
- public int size() {
- return _todo.size();
- }
-
- /**
- * Pop items off the todo queue, and send them to the task runner for processing.
- */
- public void run() {
- while (!_done) {
- _lock.lock();
- try {
- long nextjob;
- while ((nextjob = nextJobTime()) > 0 && !_done)
- _activity.await(nextjob, TimeUnit.MILLISECONDS);
-
- if (!_done && nextjob == 0) {
- Task task = _todo.take();
- _taskrunner.runTask(task);
-
- }
- } catch (InterruptedException ex) {
- ; // ignore
- } finally {
- _lock.unlock();
- }
- }
- }
-
- /**
- * Calculate the time until the next available job.
- *
- * @return time until next job, 0 if one is one is scheduled to go, and some
- * really large number if there are no jobs to speak of
- */
- private long nextJobTime() {
- assert _lock.isLocked();
-
- Task job = _todo.peek();
- if (job == null)
- return Long.MAX_VALUE;
-
- return Math.max(0, job.schedDate - System.currentTimeMillis());
- }
-
- /**
- * Remove the tasks of a given type from the list.
- * @param tasktype type of task
- */
- public void clearTasks(final Class<? extends Task> tasktype) {
- _lock.lock();
- try {
- CollectionsX.remove_if(_todo, new MemberOfFunction<Task>() {
- @Override
- public boolean isMember(Task o) {
- return tasktype.isAssignableFrom(o.getClass());
- }
-
- });
- } finally {
- _lock.unlock();
- }
- }
+ /** Lock for managing the queue */
+ private ReentrantLock _lock = new ReentrantLock();
+
+ private Condition _activity = _lock.newCondition();
+
+ private volatile boolean _done;
+
+ private TaskRunner _taskrunner;
+
+ private Thread _thread;
+
+ SchedulerThread(TaskRunner runner) {
+ _todo = new PriorityBlockingQueue<Task>(TODO_QUEUE_INITIAL_CAPACITY,
+ new JobComparatorByDate());
+ _taskrunner = runner;
+ }
+
+ void start() {
+ if (_thread != null)
+ return;
+
+ _done = false;
+ _thread = new Thread(this, "OdeScheduler");
+ _thread.start();
+ }
+
+ /**
+ * Shutdown the thread.
+ */
+ void stop() {
+ if (_thread == null)
+ return;
+
+ _done = true;
+ _lock.lock();
+ try {
+ _activity.signal();
+ } finally {
+ _lock.unlock();
+
+ }
+
+ while (_thread != null)
+ try {
+ _thread.join();
+ _thread = null;
+ } catch (InterruptedException e) {
+ ;
+ }
+
+ }
+
+ /**
+ * Add a job to the todo queue.
+ *
+ * @param job
+ */
+ void enqueue(Task task) {
+ _lock.lock();
+ try {
+ _todo.add(task);
+ _activity.signal();
+ } finally {
+ _lock.unlock();
+ }
+ }
+
+ /**
+ * Remove a job to the todo queue.
+ *
+ * @param job
+ */
+ void dequeue(Task task) {
+ _lock.lock();
+ try {
+ _todo.remove(task);
+ _activity.signal();
+ } finally {
+ _lock.unlock();
+ }
+ }
+
+ /**
+ * Get the size of the todo queue.
+ *
+ * @return
+ */
+ public int size() {
+ return _todo.size();
+ }
+
+ /**
+ * Pop items off the todo queue, and send them to the task runner for processing.
+ */
+ public void run() {
+ while (!_done) {
+ _lock.lock();
+ try {
+ long nextjob;
+ while ((nextjob = nextJobTime()) > 0 && !_done)
+ _activity.await(nextjob, TimeUnit.MILLISECONDS);
+
+ if (!_done && nextjob == 0) {
+ Task task = _todo.take();
+ _taskrunner.runTask(task);
+
+ }
+ } catch (InterruptedException ex) {
+ ; // ignore
+ } finally {
+ _lock.unlock();
+ }
+ }
+ }
+
+ /**
+ * Calculate the time until the next available job.
+ *
+ * @return time until next job, 0 if one is one is scheduled to go, and some
+ * really large number if there are no jobs to speak of
+ */
+ private long nextJobTime() {
+ assert _lock.isLocked();
+
+ Task job = _todo.peek();
+ if (job == null)
+ return Long.MAX_VALUE;
+
+ return Math.max(0, job.schedDate - System.currentTimeMillis());
+ }
+
+ /**
+ * Remove the tasks of a given type from the list.
+ * @param tasktype type of task
+ */
+ public void clearTasks(final Class<? extends Task> tasktype) {
+ _lock.lock();
+ try {
+ CollectionsX.remove_if(_todo, new MemberOfFunction<Task>() {
+ @Override
+ public boolean isMember(Task o) {
+ return tasktype.isAssignableFrom(o.getClass());
+ }
+
+ });
+ } finally {
+ _lock.unlock();
+ }
+ }
}
Modified: ode/branches/APACHE_ODE_1.X/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/Task.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/Task.java?rev=745271&r1=745270&r2=745271&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/Task.java (original)
+++ ode/branches/APACHE_ODE_1.X/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/Task.java Tue Feb 17 22:06:18 2009
@@ -26,7 +26,7 @@
*
*/
class Task {
- /** Scheduled date/time. */
+ /** Scheduled date/time. */
public long schedDate;
Task(long schedDate) {
Modified: ode/branches/APACHE_ODE_1.X/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/DelegateSupport.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/DelegateSupport.java?rev=745271&r1=745270&r2=745271&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/DelegateSupport.java (original)
+++ ode/branches/APACHE_ODE_1.X/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/DelegateSupport.java Tue Feb 17 22:06:18 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/branches/APACHE_ODE_1.X/scheduler-simple/src/test/resources/HelloWorld2/HelloWorld2.wsdl
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/scheduler-simple/src/test/resources/HelloWorld2/HelloWorld2.wsdl?rev=745271&r1=745270&r2=745271&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/scheduler-simple/src/test/resources/HelloWorld2/HelloWorld2.wsdl (original)
+++ ode/branches/APACHE_ODE_1.X/scheduler-simple/src/test/resources/HelloWorld2/HelloWorld2.wsdl Tue Feb 17 22:06:18 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/branches/APACHE_ODE_1.X/scheduler-simple/src/test/resources/HelloWorld2/deploy.xml
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/scheduler-simple/src/test/resources/HelloWorld2/deploy.xml?rev=745271&r1=745270&r2=745271&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/scheduler-simple/src/test/resources/HelloWorld2/deploy.xml (original)
+++ ode/branches/APACHE_ODE_1.X/scheduler-simple/src/test/resources/HelloWorld2/deploy.xml Tue Feb 17 22:06:18 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>