Added:
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java?view=auto&rev=478886
==============================================================================
---
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java
(added)
+++
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java
Fri Nov 24 06:07:34 2006
@@ -0,0 +1,135 @@
+/*
+ *
+ * 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.qpid.test.unit.topic;
+
+import org.apache.qpid.AMQException;
+import org.apache.qpid.client.vmbroker.AMQVMBrokerCreationException;
+import org.apache.qpid.url.URLSyntaxException;
+import org.apache.qpid.client.AMQConnection;
+import org.apache.qpid.client.AMQSession;
+import org.apache.qpid.client.AMQTopic;
+import org.apache.qpid.client.transport.TransportConnection;
+import org.apache.qpid.test.VMBrokerSetup;
+
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+import javax.jms.TopicSubscriber;
+
+import junit.framework.TestCase;
+
+public class DurableSubscriptionTest extends TestCase
+{
+ public void testUnsubscribe() throws AMQException, JMSException,
URLSyntaxException
+ {
+ AMQTopic topic = new AMQTopic("MyTopic");
+ AMQConnection con = new AMQConnection("vm://:1", "guest", "guest",
"test", "/test");
+ Session session1 = con.createSession(false, AMQSession.NO_ACKNOWLEDGE);
+ MessageConsumer consumer1 = session1.createConsumer(topic);
+ MessageProducer producer = session1.createProducer(topic);
+
+ Session session2 = con.createSession(false, AMQSession.NO_ACKNOWLEDGE);
+ TopicSubscriber consumer2 = session2.createDurableSubscriber(topic,
"MySubscription");
+
+ con.start();
+
+ producer.send(session1.createTextMessage("A"));
+
+ Message msg;
+ msg = consumer1.receive();
+ assertEquals("A", ((TextMessage) msg).getText());
+ msg = consumer1.receive(1000);
+ assertEquals(null, msg);
+
+ msg = consumer2.receive();
+ assertEquals("A", ((TextMessage) msg).getText());
+ msg = consumer2.receive(1000);
+ assertEquals(null, msg);
+
+ session2.unsubscribe("MySubscription");
+
+ producer.send(session1.createTextMessage("B"));
+
+ msg = consumer1.receive();
+ assertEquals("B", ((TextMessage) msg).getText());
+ msg = consumer1.receive(1000);
+ assertEquals(null, msg);
+
+ msg = consumer2.receive(1000);
+ assertEquals(null, msg);
+
+ con.close();
+ }
+
+ public void testDurability() throws AMQException, JMSException,
URLSyntaxException
+ {
+ AMQTopic topic = new AMQTopic("MyTopic");
+ AMQConnection con = new AMQConnection("vm://:1", "guest", "guest",
"test", "/test");
+ Session session1 = con.createSession(false, AMQSession.NO_ACKNOWLEDGE);
+ MessageConsumer consumer1 = session1.createConsumer(topic);
+ MessageProducer producer = session1.createProducer(topic);
+
+ Session session2 = con.createSession(false, AMQSession.NO_ACKNOWLEDGE);
+ TopicSubscriber consumer2 = session2.createDurableSubscriber(topic,
"MySubscription");
+
+ con.start();
+
+ producer.send(session1.createTextMessage("A"));
+
+ Message msg;
+ msg = consumer1.receive();
+ assertEquals("A", ((TextMessage) msg).getText());
+ msg = consumer1.receive(1000);
+ assertEquals(null, msg);
+
+ msg = consumer2.receive();
+ assertEquals("A", ((TextMessage) msg).getText());
+ msg = consumer2.receive(1000);
+ assertEquals(null, msg);
+
+ consumer2.close();
+
+ Session session3 = con.createSession(false, AMQSession.NO_ACKNOWLEDGE);
+ MessageConsumer consumer3 = session3.createDurableSubscriber(topic,
"MySubscription");
+
+ producer.send(session1.createTextMessage("B"));
+
+ msg = consumer1.receive();
+ assertEquals("B", ((TextMessage) msg).getText());
+ msg = consumer1.receive(1000);
+ assertEquals(null, msg);
+
+ msg = consumer3.receive();
+ assertEquals("B", ((TextMessage) msg).getText());
+ msg = consumer3.receive(1000);
+ assertEquals(null, msg);
+
+ con.close();
+ }
+
+ public static junit.framework.Test suite()
+ {
+ return new VMBrokerSetup(new
junit.framework.TestSuite(DurableSubscriptionTest.class));
+ }
+}
Propchange:
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/test/unit/transacted/TransactedTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/test/unit/transacted/TransactedTest.java?view=auto&rev=478886
==============================================================================
---
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/test/unit/transacted/TransactedTest.java
(added)
+++
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/test/unit/transacted/TransactedTest.java
Fri Nov 24 06:07:34 2006
@@ -0,0 +1,147 @@
+/*
+ *
+ * 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.qpid.test.unit.transacted;
+
+import org.apache.qpid.client.AMQConnection;
+import org.apache.qpid.client.AMQQueue;
+import org.apache.qpid.client.AMQSession;
+import org.apache.qpid.client.transport.TransportConnection;
+import org.apache.qpid.client.vmbroker.AMQVMBrokerCreationException;
+import org.apache.qpid.test.VMBrokerSetup;
+
+import javax.jms.*;
+
+import junit.framework.TestCase;
+
+public class TransactedTest extends TestCase
+{
+ private AMQQueue queue1;
+ private AMQQueue queue2;
+
+ private AMQConnection con;
+ private Session session;
+ private MessageConsumer consumer1;
+ private MessageProducer producer2;
+
+ private AMQConnection prepCon;
+ private Session prepSession;
+ private MessageProducer prepProducer1;
+
+ private AMQConnection testCon;
+ private Session testSession;
+ private MessageConsumer testConsumer1;
+ private MessageConsumer testConsumer2;
+
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+ queue1 = new AMQQueue("Q1", false);
+ queue2 = new AMQQueue("Q2", false);
+
+ con = new AMQConnection("vm://:1", "guest", "guest", "TransactedTest",
"/test");
+ session = con.createSession(true, 0);
+ consumer1 = session.createConsumer(queue1);
+ //Dummy just to create the queue.
+ MessageConsumer consumer2 = session.createConsumer(queue2);
+ consumer2.close();
+ producer2 = session.createProducer(queue2);
+ con.start();
+
+ prepCon = new AMQConnection("vm://:1", "guest", "guest",
"PrepConnection", "/test");
+ prepSession = prepCon.createSession(false, AMQSession.NO_ACKNOWLEDGE);
+ prepProducer1 = prepSession.createProducer(queue1);
+ prepCon.start();
+
+
+ //add some messages
+ prepProducer1.send(prepSession.createTextMessage("A"));
+ prepProducer1.send(prepSession.createTextMessage("B"));
+ prepProducer1.send(prepSession.createTextMessage("C"));
+
+ testCon = new AMQConnection("vm://:1", "guest", "guest",
"TestConnection", "/test");
+ testSession = testCon.createSession(false, AMQSession.NO_ACKNOWLEDGE);
+ testConsumer1 = testSession.createConsumer(queue1);
+ testConsumer2 = testSession.createConsumer(queue2);
+ testCon.start();
+ }
+
+ protected void tearDown() throws Exception
+ {
+ con.close();
+ testCon.close();
+ prepCon.close();
+ super.tearDown();
+ }
+
+ public void testCommit() throws Exception
+ {
+ //send and receive some messages
+ producer2.send(session.createTextMessage("X"));
+ producer2.send(session.createTextMessage("Y"));
+ producer2.send(session.createTextMessage("Z"));
+ expect("A", consumer1.receive(1000));
+ expect("B", consumer1.receive(1000));
+ expect("C", consumer1.receive(1000));
+
+ //commit
+ session.commit();
+
+ //ensure sent messages can be received and received messages are gone
+ expect("X", testConsumer2.receive(1000));
+ expect("Y", testConsumer2.receive(1000));
+ expect("Z", testConsumer2.receive(1000));
+
+ assertTrue(null == testConsumer1.receive(1000));
+ assertTrue(null == testConsumer2.receive(1000));
+ }
+
+ public void testRollback() throws Exception
+ {
+ producer2.send(session.createTextMessage("X"));
+ producer2.send(session.createTextMessage("Y"));
+ producer2.send(session.createTextMessage("Z"));
+ expect("A", consumer1.receive(1000));
+ expect("B", consumer1.receive(1000));
+ expect("C", consumer1.receive(1000));
+
+ //rollback
+ session.rollback();
+
+ //ensure sent messages are not visible and received messages are
requeued
+ expect("A", consumer1.receive(1000));
+ expect("B", consumer1.receive(1000));
+ expect("C", consumer1.receive(1000));
+
+ assertTrue(null == testConsumer1.receive(1000));
+ assertTrue(null == testConsumer2.receive(1000));
+ }
+
+ private void expect(String text, Message msg) throws JMSException
+ {
+ assertTrue(msg instanceof TextMessage);
+ assertEquals(text, ((TextMessage) msg).getText());
+ }
+
+ public static junit.framework.Test suite()
+ {
+ return new VMBrokerSetup(new
junit.framework.TestSuite(TransactedTest.class));
+ }
+}
Propchange:
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/test/unit/transacted/TransactedTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/testutil/Config.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/testutil/Config.java?view=diff&rev=478886&r1=478885&r2=478886
==============================================================================
---
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/testutil/Config.java
(original)
+++
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/testutil/Config.java
Fri Nov 24 06:07:34 2006
@@ -1,18 +1,21 @@
/*
*
- * Copyright (c) 2006 The Apache Software Foundation
- *
- * Licensed 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.
+ * 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.qpid.testutil;
Modified:
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/topic/Config.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/topic/Config.java?view=diff&rev=478886&r1=478885&r2=478886
==============================================================================
---
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/topic/Config.java
(original)
+++
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/topic/Config.java
Fri Nov 24 06:07:34 2006
@@ -1,18 +1,21 @@
/*
*
- * Copyright (c) 2006 The Apache Software Foundation
- *
- * Licensed 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.
+ * 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.qpid.topic;
Modified:
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/topic/Listener.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/topic/Listener.java?view=diff&rev=478886&r1=478885&r2=478886
==============================================================================
---
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/topic/Listener.java
(original)
+++
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/topic/Listener.java
Fri Nov 24 06:07:34 2006
@@ -1,18 +1,21 @@
/*
*
- * Copyright (c) 2006 The Apache Software Foundation
- *
- * Licensed 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.
+ * 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.qpid.topic;
Modified:
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/topic/MessageFactory.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/topic/MessageFactory.java?view=diff&rev=478886&r1=478885&r2=478886
==============================================================================
---
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/topic/MessageFactory.java
(original)
+++
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/topic/MessageFactory.java
Fri Nov 24 06:07:34 2006
@@ -1,18 +1,21 @@
/*
*
- * Copyright (c) 2006 The Apache Software Foundation
- *
- * Licensed 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.
+ * 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.qpid.topic;
Modified:
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/topic/Publisher.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/topic/Publisher.java?view=diff&rev=478886&r1=478885&r2=478886
==============================================================================
---
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/topic/Publisher.java
(original)
+++
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/topic/Publisher.java
Fri Nov 24 06:07:34 2006
@@ -1,18 +1,21 @@
/*
*
- * Copyright (c) 2006 The Apache Software Foundation
- *
- * Licensed 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.
+ * 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.qpid.topic;
@@ -154,7 +157,8 @@
}
sum -= min;
sum -= max;
- return (sum / times.length - 2);
+
+ return (sum / (times.length - 2));
}
public static void main(String[] argv) throws Exception
Modified:
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/transacted/Config.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/transacted/Config.java?view=diff&rev=478886&r1=478885&r2=478886
==============================================================================
---
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/transacted/Config.java
(original)
+++
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/transacted/Config.java
Fri Nov 24 06:07:34 2006
@@ -1,18 +1,21 @@
/*
*
- * Copyright (c) 2006 The Apache Software Foundation
- *
- * Licensed 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.
+ * 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.qpid.transacted;
Modified:
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/transacted/Ping.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/transacted/Ping.java?view=diff&rev=478886&r1=478885&r2=478886
==============================================================================
---
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/transacted/Ping.java
(original)
+++
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/transacted/Ping.java
Fri Nov 24 06:07:34 2006
@@ -1,18 +1,21 @@
/*
*
- * Copyright (c) 2006 The Apache Software Foundation
- *
- * Licensed 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.
+ * 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.qpid.transacted;
Modified:
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/transacted/Pong.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/transacted/Pong.java?view=diff&rev=478886&r1=478885&r2=478886
==============================================================================
---
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/transacted/Pong.java
(original)
+++
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/transacted/Pong.java
Fri Nov 24 06:07:34 2006
@@ -1,18 +1,21 @@
/*
*
- * Copyright (c) 2006 The Apache Software Foundation
- *
- * Licensed 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.
+ * 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.qpid.transacted;
Modified:
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/transacted/Relay.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/transacted/Relay.java?view=diff&rev=478886&r1=478885&r2=478886
==============================================================================
---
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/transacted/Relay.java
(original)
+++
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/transacted/Relay.java
Fri Nov 24 06:07:34 2006
@@ -1,18 +1,21 @@
/*
*
- * Copyright (c) 2006 The Apache Software Foundation
- *
- * Licensed 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.
+ * 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.qpid.transacted;
Modified:
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/transacted/Start.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/transacted/Start.java?view=diff&rev=478886&r1=478885&r2=478886
==============================================================================
---
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/transacted/Start.java
(original)
+++
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/transacted/Start.java
Fri Nov 24 06:07:34 2006
@@ -1,18 +1,21 @@
/*
*
- * Copyright (c) 2006 The Apache Software Foundation
- *
- * Licensed 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.
+ * 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.qpid.transacted;
Modified:
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/weblogic/ServiceProvider.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/weblogic/ServiceProvider.java?view=diff&rev=478886&r1=478885&r2=478886
==============================================================================
---
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/weblogic/ServiceProvider.java
(original)
+++
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/weblogic/ServiceProvider.java
Fri Nov 24 06:07:34 2006
@@ -1,18 +1,21 @@
/*
*
- * Copyright (c) 2006 The Apache Software Foundation
- *
- * Licensed 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.
+ * 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.qpid.weblogic;
Modified:
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/weblogic/ServiceRequestingClient.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/weblogic/ServiceRequestingClient.java?view=diff&rev=478886&r1=478885&r2=478886
==============================================================================
---
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/weblogic/ServiceRequestingClient.java
(original)
+++
incubator/qpid/branches/new_persistence/java/client/src/test/java/org/apache/qpid/weblogic/ServiceRequestingClient.java
Fri Nov 24 06:07:34 2006
@@ -1,18 +1,21 @@
/*
*
- * Copyright (c) 2006 The Apache Software Foundation
- *
- * Licensed 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.
+ * 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.qpid.weblogic;