You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2009/02/11 18:14:32 UTC
svn commit: r743409 [2/2] - in /servicemix/smx4/nmr/trunk: ./ assembly/
assembly/src/main/descriptors/ jbi/ jbi/cluster/ jbi/cluster/config/
jbi/cluster/config/src/ jbi/cluster/config/src/main/
jbi/cluster/config/src/main/resources/ jbi/cluster/config/...
Copied: servicemix/smx4/nmr/trunk/jbi/cluster/requestor/src/main/java/org/apache/servicemix/jbi/cluster/requestor/GenericJmsRequestorPool.java (from r742283, servicemix/smx4/nmr/trunk/jbi/cluster/src/main/java/org/apache/servicemix/jbi/cluster/requestor/GenericJmsRequestorPool.java)
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/cluster/requestor/src/main/java/org/apache/servicemix/jbi/cluster/requestor/GenericJmsRequestorPool.java?p2=servicemix/smx4/nmr/trunk/jbi/cluster/requestor/src/main/java/org/apache/servicemix/jbi/cluster/requestor/GenericJmsRequestorPool.java&p1=servicemix/smx4/nmr/trunk/jbi/cluster/src/main/java/org/apache/servicemix/jbi/cluster/requestor/GenericJmsRequestorPool.java&r1=742283&r2=743409&rev=743409&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/cluster/src/main/java/org/apache/servicemix/jbi/cluster/requestor/GenericJmsRequestorPool.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/cluster/requestor/src/main/java/org/apache/servicemix/jbi/cluster/requestor/GenericJmsRequestorPool.java Wed Feb 11 17:14:30 2009
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.servicemix.jbi.cluster.requestor;
import java.util.Map;
@@ -332,6 +348,7 @@
activeInvokerCount++;
lifecycleMonitor.notifyAll();
}
+ updateRecoveryMarker();
boolean messageReceived = false;
try {
if (maxMessagesPerTask < 0) {
Copied: servicemix/smx4/nmr/trunk/jbi/cluster/requestor/src/main/java/org/apache/servicemix/jbi/cluster/requestor/JmsRequestor.java (from r742283, servicemix/smx4/nmr/trunk/jbi/cluster/src/main/java/org/apache/servicemix/jbi/cluster/requestor/JmsRequestor.java)
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/cluster/requestor/src/main/java/org/apache/servicemix/jbi/cluster/requestor/JmsRequestor.java?p2=servicemix/smx4/nmr/trunk/jbi/cluster/requestor/src/main/java/org/apache/servicemix/jbi/cluster/requestor/JmsRequestor.java&p1=servicemix/smx4/nmr/trunk/jbi/cluster/src/main/java/org/apache/servicemix/jbi/cluster/requestor/JmsRequestor.java&r1=742283&r2=743409&rev=743409&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/cluster/src/main/java/org/apache/servicemix/jbi/cluster/requestor/JmsRequestor.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/cluster/requestor/src/main/java/org/apache/servicemix/jbi/cluster/requestor/JmsRequestor.java Wed Feb 11 17:14:30 2009
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.servicemix.jbi.cluster.requestor;
import javax.jms.JMSException;
Copied: servicemix/smx4/nmr/trunk/jbi/cluster/requestor/src/main/java/org/apache/servicemix/jbi/cluster/requestor/JmsRequestorListener.java (from r742283, servicemix/smx4/nmr/trunk/jbi/cluster/src/main/java/org/apache/servicemix/jbi/cluster/requestor/JmsRequestorListener.java)
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/cluster/requestor/src/main/java/org/apache/servicemix/jbi/cluster/requestor/JmsRequestorListener.java?p2=servicemix/smx4/nmr/trunk/jbi/cluster/requestor/src/main/java/org/apache/servicemix/jbi/cluster/requestor/JmsRequestorListener.java&p1=servicemix/smx4/nmr/trunk/jbi/cluster/src/main/java/org/apache/servicemix/jbi/cluster/requestor/JmsRequestorListener.java&r1=742283&r2=743409&rev=743409&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/cluster/src/main/java/org/apache/servicemix/jbi/cluster/requestor/JmsRequestorListener.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/cluster/requestor/src/main/java/org/apache/servicemix/jbi/cluster/requestor/JmsRequestorListener.java Wed Feb 11 17:14:30 2009
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.servicemix.jbi.cluster.requestor;
/**
Copied: servicemix/smx4/nmr/trunk/jbi/cluster/requestor/src/main/java/org/apache/servicemix/jbi/cluster/requestor/JmsRequestorPool.java (from r742283, servicemix/smx4/nmr/trunk/jbi/cluster/src/main/java/org/apache/servicemix/jbi/cluster/requestor/JmsRequestorPool.java)
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/cluster/requestor/src/main/java/org/apache/servicemix/jbi/cluster/requestor/JmsRequestorPool.java?p2=servicemix/smx4/nmr/trunk/jbi/cluster/requestor/src/main/java/org/apache/servicemix/jbi/cluster/requestor/JmsRequestorPool.java&p1=servicemix/smx4/nmr/trunk/jbi/cluster/src/main/java/org/apache/servicemix/jbi/cluster/requestor/JmsRequestorPool.java&r1=742283&r2=743409&rev=743409&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/cluster/src/main/java/org/apache/servicemix/jbi/cluster/requestor/JmsRequestorPool.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/cluster/requestor/src/main/java/org/apache/servicemix/jbi/cluster/requestor/JmsRequestorPool.java Wed Feb 11 17:14:30 2009
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.servicemix.jbi.cluster.requestor;
import javax.jms.JMSException;
Copied: servicemix/smx4/nmr/trunk/jbi/cluster/requestor/src/main/java/org/apache/servicemix/jbi/cluster/requestor/Transacted.java (from r742283, servicemix/smx4/nmr/trunk/jbi/cluster/src/main/java/org/apache/servicemix/jbi/cluster/requestor/Transacted.java)
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/cluster/requestor/src/main/java/org/apache/servicemix/jbi/cluster/requestor/Transacted.java?p2=servicemix/smx4/nmr/trunk/jbi/cluster/requestor/src/main/java/org/apache/servicemix/jbi/cluster/requestor/Transacted.java&p1=servicemix/smx4/nmr/trunk/jbi/cluster/src/main/java/org/apache/servicemix/jbi/cluster/requestor/Transacted.java&r1=742283&r2=743409&rev=743409&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/cluster/src/main/java/org/apache/servicemix/jbi/cluster/requestor/Transacted.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/cluster/requestor/src/main/java/org/apache/servicemix/jbi/cluster/requestor/Transacted.java Wed Feb 11 17:14:30 2009
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.servicemix.jbi.cluster.requestor;
/**
Modified: servicemix/smx4/nmr/trunk/jbi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/pom.xml?rev=743409&r1=743408&r2=743409&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/pom.xml Wed Feb 11 17:14:30 2009
@@ -34,6 +34,7 @@
<modules>
<module>runtime</module>
+ <module>cluster</module>
<module>deployer</module>
<module>osgi</module>
<module>management</module>
Modified: servicemix/smx4/nmr/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/pom.xml?rev=743409&r1=743408&r2=743409&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/pom.xml Wed Feb 11 17:14:30 2009
@@ -56,7 +56,7 @@
</prerequisites>
<properties>
- <activemq.version>5.3-SNAPSHOT</activemq.version>
+ <activemq.version>5.2.0</activemq.version>
<ant.version>1.7.0_1</ant.version>
<aopalliance.version>1.0_1</aopalliance.version>
<asm.version>2.2.3_1</asm.version>
@@ -335,6 +335,41 @@
<version>${pom.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.servicemix.jbi.cluster</groupId>
+ <artifactId>org.apache.servicemix.jbi.cluster.requestor</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.jbi.cluster</groupId>
+ <artifactId>org.apache.servicemix.jbi.cluster.engine</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.jbi.cluster</groupId>
+ <artifactId>org.apache.servicemix.jbi.cluster.config</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.jbi.cluster</groupId>
+ <artifactId>cluster</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.jbi.cluster</groupId>
+ <artifactId>org.apache.servicemix.jbi.cluster.requestor</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.jbi.cluster</groupId>
+ <artifactId>org.apache.servicemix.jbi.cluster.engine</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.jbi.cluster</groupId>
+ <artifactId>org.apache.servicemix.jbi.cluster.config</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.servicemix.specs</groupId>
<artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
<version>${servicemix.specs.version}</version>