Author: rupertlssmith
Date: Thu Jun 21 09:14:03 2007
New Revision: 549530
URL: http://svn.apache.org/viewvc?view=rev&rev=549530
Log:
Added minimal checkstyle to project reports. Fixed some problems with site
generation.
Added:
incubator/qpid/branches/M2/java/etc/coding_standards.xml
incubator/qpid/branches/M2/java/etc/license_header.txt
Modified:
incubator/qpid/branches/M2/java/broker/pom.xml
incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/txn/CleanupMessageOperation.java
incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/txn/LocalTransactionalContext.java
incubator/qpid/branches/M2/java/client-java14/pom.xml
incubator/qpid/branches/M2/java/client/example/pom.xml
incubator/qpid/branches/M2/java/common/pom.xml
incubator/qpid/branches/M2/java/distribution/pom.xml
incubator/qpid/branches/M2/java/integrationtests/pom.xml
incubator/qpid/branches/M2/java/integrationtests/src/main/java/org/apache/qpid/interop/coordinator/CoordinatingTestCase.java
incubator/qpid/branches/M2/java/integrationtests/src/main/java/org/apache/qpid/util/ConversationFactory.java
incubator/qpid/branches/M2/java/management/eclipse-plugin/pom.xml
incubator/qpid/branches/M2/java/perftests/pom.xml
incubator/qpid/branches/M2/java/perftests/src/test/java/org/apache/qpid/ping/PingTestPerf.java
incubator/qpid/branches/M2/java/pom.xml
incubator/qpid/branches/M2/java/systests/distribution/pom.xml
incubator/qpid/branches/M2/java/systests/pom.xml
Modified: incubator/qpid/branches/M2/java/broker/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/broker/pom.xml?view=diff&rev=549530&r1=549529&r2=549530
==============================================================================
--- incubator/qpid/branches/M2/java/broker/pom.xml (original)
+++ incubator/qpid/branches/M2/java/broker/pom.xml Thu Jun 21 09:14:03 2007
@@ -30,6 +30,7 @@
<groupId>org.apache.qpid</groupId>
<artifactId>qpid</artifactId>
<version>1.0-incubating-M2-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<properties>
Modified:
incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/txn/CleanupMessageOperation.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/txn/CleanupMessageOperation.java?view=diff&rev=549530&r1=549529&r2=549530
==============================================================================
---
incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/txn/CleanupMessageOperation.java
(original)
+++
incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/txn/CleanupMessageOperation.java
Thu Jun 21 09:14:03 2007
@@ -1,31 +1,35 @@
/*
*
- * Copyright (c) 2006 The Apache Software Foundation
+ * 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
*
- * 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
*
- * 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.
+ * 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.server.txn;
-import java.util.List;
-
import org.apache.log4j.Logger;
+
import org.apache.qpid.AMQException;
import org.apache.qpid.server.RequiredDeliveryException;
import org.apache.qpid.server.queue.AMQMessage;
import org.apache.qpid.server.queue.NoConsumersException;
import org.apache.qpid.server.store.StoreContext;
+import java.util.List;
+
/**
* @author Apache Software Foundation
*/
@@ -44,33 +48,26 @@
}
public void prepare(StoreContext context) throws AMQException
- {
- }
+ { }
public void undoPrepare()
{
- //don't need to do anything here, if the store's txn failed
- //when processing prepare then the message was not stored
- //or enqueued on any queues and can be discarded
+ // don't need to do anything here, if the store's txn failed
+ // when processing prepare then the message was not stored
+ // or enqueued on any queues and can be discarded
}
public void commit(StoreContext context)
{
-
- try
+ // No-op can't be done here has this is before the message has been
attempted to be delivered.
+ /*try
{
_msg.checkDeliveredToConsumer();
}
catch (NoConsumersException e)
{
- //TODO: store this for delivery after the commit-ok
_returns.add(e);
- }
- catch (AMQException e)
- {
- _log.error("On commiting transaction, unable to determine whether
delivered to a consumer immediately: " +
- e, e);
- }
+ }*/
}
public void rollback(StoreContext context)
Modified:
incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/txn/LocalTransactionalContext.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/txn/LocalTransactionalContext.java?view=diff&rev=549530&r1=549529&r2=549530
==============================================================================
---
incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/txn/LocalTransactionalContext.java
(original)
+++
incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/txn/LocalTransactionalContext.java
Thu Jun 21 09:14:03 2007
@@ -1,26 +1,27 @@
/*
*
- * Copyright (c) 2006 The Apache Software Foundation
+ * 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
*
- * 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
*
- * 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.
+ * 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.server.txn;
-import java.util.LinkedList;
-import java.util.List;
-
import org.apache.log4j.Logger;
+
import org.apache.qpid.AMQException;
import org.apache.qpid.server.RequiredDeliveryException;
import org.apache.qpid.server.ack.TxAck;
@@ -28,9 +29,13 @@
import org.apache.qpid.server.protocol.AMQProtocolSession;
import org.apache.qpid.server.queue.AMQMessage;
import org.apache.qpid.server.queue.AMQQueue;
+import org.apache.qpid.server.queue.NoConsumersException;
import org.apache.qpid.server.store.MessageStore;
import org.apache.qpid.server.store.StoreContext;
+import java.util.LinkedList;
+import java.util.List;
+
/** A transactional context that only supports local transactions. */
public class LocalTransactionalContext implements TransactionalContext
{
@@ -54,6 +59,7 @@
private boolean _inTran = false;
+ /** Are there messages to deliver. NOT Has the message been delivered */
private boolean _messageDelivered = false;
private static class DeliveryDetails
@@ -62,7 +68,6 @@
public AMQQueue queue;
private boolean deliverFirst;
-
public DeliveryDetails(AMQMessage message, AMQQueue queue, boolean
deliverFirst)
{
this.message = message;
@@ -72,15 +77,14 @@
}
public LocalTransactionalContext(MessageStore messageStore, StoreContext
storeContext,
- List<RequiredDeliveryException>
returnMessages)
+ List<RequiredDeliveryException> returnMessages)
{
_messageStore = messageStore;
_storeContext = storeContext;
_returnMessages = returnMessages;
- //_txnBuffer.enlist(new StoreMessageOperation(messageStore));
+ // _txnBuffer.enlist(new StoreMessageOperation(messageStore));
}
-
public StoreContext getStoreContext()
{
return _storeContext;
@@ -90,11 +94,12 @@
{
_txnBuffer.rollback(_storeContext);
// Hack to deal with uncommitted non-transactional writes
- if(_messageStore.inTran(_storeContext))
+ if (_messageStore.inTran(_storeContext))
{
_messageStore.abortTran(_storeContext);
_inTran = false;
}
+
_postCommitDeliveryList.clear();
}
@@ -106,7 +111,7 @@
// be added for every queue onto which the message is
// enqueued. Finally a cleanup op will be added to decrement
// the reference associated with the routing.
-// message.incrementReference();
+ // message.incrementReference();
_postCommitDeliveryList.add(new DeliveryDetails(message, queue,
deliverFirst));
_messageDelivered = true;
_txnBuffer.enlist(new CleanupMessageOperation(message,
_returnMessages));
@@ -119,7 +124,7 @@
message.incrementReference();
_messageDelivered = true;
- */
+ */
}
private void checkAck(long deliveryTag, UnacknowledgedMessageMap
unacknowledgedMessageMap) throws AMQException
@@ -131,16 +136,16 @@
}
public void acknowledgeMessage(long deliveryTag, long lastDeliveryTag,
boolean multiple,
- UnacknowledgedMessageMap
unacknowledgedMessageMap) throws AMQException
+ UnacknowledgedMessageMap unacknowledgedMessageMap) throws AMQException
{
- //check that the tag exists to give early failure
- if (!multiple || deliveryTag > 0)
+ // check that the tag exists to give early failure
+ if (!multiple || (deliveryTag > 0))
{
checkAck(deliveryTag, unacknowledgedMessageMap);
}
- //we use a single txn op for all acks and update this op
- //as new acks come in. If this is the first ack in the txn
- //we will need to create and enlist the op.
+ // we use a single txn op for all acks and update this op
+ // as new acks come in. If this is the first ack in the txn
+ // we will need to create and enlist the op.
if (_ackOp == null)
{
beginTranIfNecessary();
@@ -148,7 +153,7 @@
_txnBuffer.enlist(_ackOp);
}
// update the op to include this ack request
- if (multiple && deliveryTag == 0)
+ if (multiple && (deliveryTag == 0))
{
// if have signalled to ack all, that refers only
// to all at this time
@@ -178,6 +183,7 @@
{
_log.debug("Starting transaction on message store: " + this);
}
+
_messageStore.beginTran(_storeContext);
_inTran = true;
}
@@ -189,12 +195,13 @@
{
_log.debug("Committing transactional context: " + this);
}
+
if (_ackOp != null)
{
_messageDelivered = true;
_ackOp.consolidate();
- //already enlisted, after commit will reset regardless of outcome
+ // already enlisted, after commit will reset regardless of outcome
_ackOp = null;
}
@@ -202,7 +209,7 @@
{
_txnBuffer.enlist(new StoreMessageOperation(_messageStore));
}
- //fixme fail commit here ... QPID-440
+ // fixme fail commit here ... QPID-440
try
{
_txnBuffer.commit(_storeContext);
@@ -215,7 +222,7 @@
try
{
- postCommitDelivery();
+ postCommitDelivery(_returnMessages);
}
catch (AMQException e)
{
@@ -224,23 +231,32 @@
}
}
- private void postCommitDelivery() throws AMQException
+ private void postCommitDelivery(List<RequiredDeliveryException>
returnMessages) throws AMQException
{
if (_log.isDebugEnabled())
{
_log.debug("Performing post commit delivery");
}
+
try
{
for (DeliveryDetails dd : _postCommitDeliveryList)
{
dd.queue.process(_storeContext, dd.message, dd.deliverFirst);
+
+ try
+ {
+ dd.message.checkDeliveredToConsumer();
+ }
+ catch (NoConsumersException nce)
+ {
+ returnMessages.add(nce);
+ }
}
}
finally
{
_postCommitDeliveryList.clear();
}
-
}
}
Modified: incubator/qpid/branches/M2/java/client-java14/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/client-java14/pom.xml?view=diff&rev=549530&r1=549529&r2=549530
==============================================================================
--- incubator/qpid/branches/M2/java/client-java14/pom.xml (original)
+++ incubator/qpid/branches/M2/java/client-java14/pom.xml Thu Jun 21 09:14:03
2007
@@ -32,6 +32,7 @@
<groupId>org.apache.qpid</groupId>
<artifactId>qpid</artifactId>
<version>1.0-incubating-M2-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<properties>
Modified: incubator/qpid/branches/M2/java/client/example/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/client/example/pom.xml?view=diff&rev=549530&r1=549529&r2=549530
==============================================================================
--- incubator/qpid/branches/M2/java/client/example/pom.xml (original)
+++ incubator/qpid/branches/M2/java/client/example/pom.xml Thu Jun 21 09:14:03
2007
@@ -31,6 +31,7 @@
<groupId>org.apache.qpid</groupId>
<artifactId>qpid</artifactId>
<version>1.0-incubating-M2-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<properties>
Modified: incubator/qpid/branches/M2/java/common/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/common/pom.xml?view=diff&rev=549530&r1=549529&r2=549530
==============================================================================
--- incubator/qpid/branches/M2/java/common/pom.xml (original)
+++ incubator/qpid/branches/M2/java/common/pom.xml Thu Jun 21 09:14:03 2007
@@ -31,6 +31,7 @@
<groupId>org.apache.qpid</groupId>
<artifactId>qpid</artifactId>
<version>1.0-incubating-M2-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<properties>
Modified: incubator/qpid/branches/M2/java/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/distribution/pom.xml?view=diff&rev=549530&r1=549529&r2=549530
==============================================================================
--- incubator/qpid/branches/M2/java/distribution/pom.xml (original)
+++ incubator/qpid/branches/M2/java/distribution/pom.xml Thu Jun 21 09:14:03
2007
@@ -31,6 +31,7 @@
<groupId>org.apache.qpid</groupId>
<artifactId>qpid</artifactId>
<version>1.0-incubating-M2-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<properties>
Added: incubator/qpid/branches/M2/java/etc/coding_standards.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/etc/coding_standards.xml?view=auto&rev=549530
==============================================================================
--- incubator/qpid/branches/M2/java/etc/coding_standards.xml (added)
+++ incubator/qpid/branches/M2/java/etc/coding_standards.xml Thu Jun 21
09:14:03 2007
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.1//EN"
"http://www.puppycrawl.com/dtds/configuration_1_1.dtd";>
+<module name="Checker">
+ <!-- Checks package.html defined for all packages. -->
+ <module name="PackageHtml"/>
+
+ <module name="TreeWalker">
+
+ <!-- Whitespace conventions. -->
+ <module name="TabCharacter"/>
+
+ <!-- License conventions. Checks that the license is included in every
file. -->
+ <module name="Header">
+ <property name="headerFile" value="${checkstyle.header.file}"/>
+ </module>
+
+ <!-- Coding style conventions. -->
+ <module
name="com.puppycrawl.tools.checkstyle.checks.coding.PackageDeclarationCheck">
+ <property name="severity" value="error"/>
+ </module>
+
+ <!-- These rules ensure that everything is javadoc'ed. -->
+ <!--
+ <module name="RequiredRegexp">
+ <property name="format" value="<table
id="crc"><caption>CRC Card</caption>"/>
+ </module>
+ -->
+
+ <module
name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck">
+ <property name="excludeScope" value="nothing"/>
+ <property name="scope" value="private"/>
+ <property name="severity" value="error"/>
+ <property name="tokens" value="CLASS_DEF, INTERFACE_DEF"/>
+ <property name="allowMissingParamTags" value="true"/>
+ </module>
+
+ <module
name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocVariableCheck">
+ <property name="excludeScope" value="nothing"/>
+ <property name="scope" value="private"/>
+ <property name="severity" value="error"/>
+ </module>
+
+ <module
name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck">
+ <property name="allowMissingParamTags" value="false"/>
+ <property name="allowMissingReturnTag" value="false"/>
+ <property name="allowMissingThrowsTags" value="false"/>
+ <property name="allowThrowsTagsForSubclasses" value="false"/>
+ <property name="allowUndeclaredRTE" value="true"/>
+ <property name="allowMissingJavadoc" value="false"/>
+ <property name="allowMissingPropertyJavadoc" value="true"/>
+ <property name="excludeScope" value="nothing"/>
+ <property name="scope" value="private"/>
+ <property name="severity" value="error"/>
+ <property name="tokens" value="METHOD_DEF, CTOR_DEF"/>
+ </module>
+
+ <module name="JavadocStyle">
+ <property name="scope" value="private"/>
+ <property name="checkHtml" value="false"/>
+ <property name="checkFirstSentence" value="true"/>
+ <property name="checkEmptyJavadoc" value="true"/>
+ </module>
+
+ <!-- These rules enforce the conventions for the naming of variables.
-->
+ <!--
+ <module
name="com.puppycrawl.tools.checkstyle.checks.naming.ConstantNameCheck">
+ <property name="format" value="^log$|^[A-Z](_?[A-Z0-9]+)*$"/>
+ <property name="severity" value="error"/>
+ </module>
+
+ <module
name="com.puppycrawl.tools.checkstyle.checks.naming.LocalFinalVariableNameCheck">
+ <property name="format" value="^[a-z][a-zA-Z0-9_]*$"/>
+ <property name="severity" value="error"/>
+ </module>
+
+ <module
name="com.puppycrawl.tools.checkstyle.checks.naming.LocalVariableNameCheck">
+ <property name="format" value="^[a-z][a-zA-Z0-9_]*$"/>
+ <property name="severity" value="error"/>
+ </module>
+
+ <module
name="com.puppycrawl.tools.checkstyle.checks.naming.MemberNameCheck">
+ <property name="applyToPackage" value="true"/>
+ <property name="applyToPrivate" value="true"/>
+ <property name="applyToProtected" value="true"/>
+ <property name="applyToPublic" value="true"/>
+ <property name="format" value="^[a-z][a-zA-Z0-9_]*$"/>
+ <property name="severity" value="error"/>
+ </module>
+
+ <module
name="com.puppycrawl.tools.checkstyle.checks.naming.MethodNameCheck">
+ <property name="format" value="^[a-z][a-zA-Z0-9_]*$"/>
+ <property name="severity" value="error"/>
+ </module>
+
+ <module
name="com.puppycrawl.tools.checkstyle.checks.naming.PackageNameCheck">
+ <property name="format"
value="^[a-z]+(\.[a-zA-Z_][a-zA-Z0-9_]*)*$"/>
+ <property name="severity" value="error"/>
+ </module>
+
+ <module
name="com.puppycrawl.tools.checkstyle.checks.naming.ParameterNameCheck">
+ <property name="format" value="^[a-z][a-zA-Z0-9_]*$"/>
+ <property name="severity" value="error"/>
+ </module>
+
+ <module
name="com.puppycrawl.tools.checkstyle.checks.naming.StaticVariableNameCheck">
+ <property name="format" value="^[a-z][a-zA-Z0-9_]*$"/>
+ <property name="severity" value="error"/>
+ </module>
+
+ <module
name="com.puppycrawl.tools.checkstyle.checks.naming.TypeNameCheck">
+ <property name="format" value="^[A-Z][a-zA-Z0-9_]*$"/>
+ <property name="severity" value="error"/>
+ <property name="tokens" value="CLASS_DEF, INTERFACE_DEF"/>
+ </module>
+ -->
+ </module>
+</module>
Added: incubator/qpid/branches/M2/java/etc/license_header.txt
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/etc/license_header.txt?view=auto&rev=549530
==============================================================================
--- incubator/qpid/branches/M2/java/etc/license_header.txt (added)
+++ incubator/qpid/branches/M2/java/etc/license_header.txt Thu Jun 21 09:14:03
2007
@@ -0,0 +1,20 @@
+/*
+ *
+ * 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.
+ *
+ */
\ No newline at end of file
Modified: incubator/qpid/branches/M2/java/integrationtests/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/integrationtests/pom.xml?view=diff&rev=549530&r1=549529&r2=549530
==============================================================================
--- incubator/qpid/branches/M2/java/integrationtests/pom.xml (original)
+++ incubator/qpid/branches/M2/java/integrationtests/pom.xml Thu Jun 21
09:14:03 2007
@@ -31,6 +31,7 @@
<groupId>org.apache.qpid</groupId>
<artifactId>qpid</artifactId>
<version>1.0-incubating-M2-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<properties>
Modified:
incubator/qpid/branches/M2/java/integrationtests/src/main/java/org/apache/qpid/interop/coordinator/CoordinatingTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/integrationtests/src/main/java/org/apache/qpid/interop/coordinator/CoordinatingTestCase.java?view=diff&rev=549530&r1=549529&r2=549530
==============================================================================
---
incubator/qpid/branches/M2/java/integrationtests/src/main/java/org/apache/qpid/interop/coordinator/CoordinatingTestCase.java
(original)
+++
incubator/qpid/branches/M2/java/integrationtests/src/main/java/org/apache/qpid/interop/coordinator/CoordinatingTestCase.java
Thu Jun 21 09:14:03 2007
@@ -1,4 +1,3 @@
-/* Copyright Rupert Smith, 2005 to 2006, all rights reserved. */
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -21,15 +20,15 @@
*/
package org.apache.qpid.interop.coordinator;
-import java.util.Map;
-
-import javax.jms.*;
-
import junit.framework.TestCase;
import org.apache.log4j.Logger;
import org.apache.qpid.util.ConversationFactory;
+
+import javax.jms.*;
+
+import java.util.Map;
/**
* A CoordinatingTestCase is a JUnit test case extension that knows how to
coordinate test clients that take part in a
Modified:
incubator/qpid/branches/M2/java/integrationtests/src/main/java/org/apache/qpid/util/ConversationFactory.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/integrationtests/src/main/java/org/apache/qpid/util/ConversationFactory.java?view=diff&rev=549530&r1=549529&r2=549530
==============================================================================
---
incubator/qpid/branches/M2/java/integrationtests/src/main/java/org/apache/qpid/util/ConversationFactory.java
(original)
+++
incubator/qpid/branches/M2/java/integrationtests/src/main/java/org/apache/qpid/util/ConversationFactory.java
Thu Jun 21 09:14:03 2007
@@ -20,16 +20,16 @@
*/
package org.apache.qpid.util;
+import org.apache.log4j.Logger;
+
+import javax.jms.*;
+
import java.util.*;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
-import javax.jms.*;
-
-import org.apache.log4j.Logger;
-
/**
* A conversation helper, uses a message correlation id pattern to match up
sent and received messages as a conversation
* over JMS messaging. Incoming message traffic is divided up by correlation
id. Each id has a queue (behaviour dependant
@@ -153,7 +153,7 @@
* queue.
* @param queueClass The queue implementation class.
*
- * @throws JMSException All undelying JMSExceptions are allowed to fall
through.
+ * @throws JMSException All underlying JMSExceptions are allowed to fall
through.
*/
public ConversationFactory(Connection connection, Destination
receiveDestination,
Class<? extends BlockingQueue> queueClass) throws JMSException
Modified: incubator/qpid/branches/M2/java/management/eclipse-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/management/eclipse-plugin/pom.xml?view=diff&rev=549530&r1=549529&r2=549530
==============================================================================
--- incubator/qpid/branches/M2/java/management/eclipse-plugin/pom.xml (original)
+++ incubator/qpid/branches/M2/java/management/eclipse-plugin/pom.xml Thu Jun
21 09:14:03 2007
@@ -15,39 +15,40 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
- -->
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.qpid.management</groupId>
<artifactId>org.apache.qpid.management.ui</artifactId>
<packaging>jar</packaging>
<version>1.0-incubating-M2-SNAPSHOT</version>
<name>Qpid Management</name>
- <url>http://cwiki.apache.org/confluence/display/qpid</url>
<parent>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid</artifactId>
<version>1.0-incubating-M2-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<properties>
- <topDirectoryLocation>../../</topDirectoryLocation>
+ <topDirectoryLocation>../..</topDirectoryLocation>
</properties>
<repositories>
- <repository>
+ <repository>
<id>repo1.maven.org</id>
<name>Maven eclipse Repository</name>
<url>http://repo1.maven.org/eclipse</url>
- </repository>
- <repository>
+ </repository>
+ <repository>
<id>apache.snapshots</id>
<name>Apache SNAPSHOT Repository</name>
<url>http://people.apache.org/repo/m2-snapshot-repository</url>
<snapshots>
- <enabled>true</enabled>
+ <enabled>true</enabled>
</snapshots>
</repository>
</repositories>
@@ -196,40 +197,42 @@
<directory>icons/</directory>
<targetPath>icons/</targetPath>
<includes>
- <include>**</include>
+ <include>**</include>
</includes>
</resource>
<resource>
<directory>icons/</directory>
<targetPath>/</targetPath>
<includes>
- <include>splash.bmp</include>
+ <include>splash.bmp</include>
</includes>
</resource>
<resource>
- <directory>${basedir}</directory>
- <targetPath>/</targetPath>
- <includes>
- <include>plugin.xml</include>
- <include>plugin.properties</include>
- </includes>
+ <directory>${basedir}</directory>
+ <targetPath>/</targetPath>
+ <includes>
+ <include>plugin.xml</include>
+ <include>plugin.properties</include>
+ </includes>
</resource>
- </resources>
+ </resources>
<plugins>
+ <!--
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
</plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
- <archive>
- <manifestFile>META-INF/MANIFEST.MF</manifestFile>
- </archive>
- <finalName>${artifactId}_${version}</finalName>
+ <archive>
+ <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ <finalName>${artifactId}_${version}</finalName>
</configuration>
- </plugin>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -238,6 +241,7 @@
<skip>false</skip>
</configuration>
</plugin>
+ -->
</plugins>
</build>
Modified: incubator/qpid/branches/M2/java/perftests/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/perftests/pom.xml?view=diff&rev=549530&r1=549529&r2=549530
==============================================================================
--- incubator/qpid/branches/M2/java/perftests/pom.xml (original)
+++ incubator/qpid/branches/M2/java/perftests/pom.xml Thu Jun 21 09:14:03 2007
@@ -32,6 +32,7 @@
<groupId>org.apache.qpid</groupId>
<artifactId>qpid</artifactId>
<version>1.0-incubating-M2-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<properties>
Modified:
incubator/qpid/branches/M2/java/perftests/src/test/java/org/apache/qpid/ping/PingTestPerf.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/perftests/src/test/java/org/apache/qpid/ping/PingTestPerf.java?view=diff&rev=549530&r1=549529&r2=549530
==============================================================================
---
incubator/qpid/branches/M2/java/perftests/src/test/java/org/apache/qpid/ping/PingTestPerf.java
(original)
+++
incubator/qpid/branches/M2/java/perftests/src/test/java/org/apache/qpid/ping/PingTestPerf.java
Thu Jun 21 09:14:03 2007
@@ -20,8 +20,6 @@
*/
package org.apache.qpid.ping;
-import javax.jms.*;
-
import junit.framework.Assert;
import junit.framework.Test;
import junit.framework.TestSuite;
@@ -35,6 +33,8 @@
import uk.co.thebadgerset.junit.extensions.util.ParsedProperties;
import uk.co.thebadgerset.junit.extensions.util.TestContextProperties;
+import javax.jms.*;
+
/**
* PingTestPerf is a ping test, that has been written with the intention of
being scaled up to run many times
* simultaneously to simluate many clients/producers/connections.
@@ -72,39 +72,6 @@
super(name);
_logger.debug("testParameters = " + testParameters);
-
- // Sets up the test parameters with defaults.
-
/*testParameters.setPropertyIfNull(PingPongProducer.TX_BATCH_SIZE_PROPNAME,
PingPongProducer.TX_BATCH_SIZE_DEFAULT);
-
testParameters.setPropertyIfNull(PingPongProducer.MESSAGE_SIZE_PROPNAME,
PingPongProducer.MESSAGE_SIZE_DEAFULT);
-
testParameters.setPropertyIfNull(PingPongProducer.PING_QUEUE_NAME_PROPNAME,
- PingPongProducer.PING_QUEUE_NAME_DEFAULT);
-
testParameters.setPropertyIfNull(PingPongProducer.PERSISTENT_MODE_PROPNAME,
- PingPongProducer.PERSISTENT_MODE_DEFAULT);
- testParameters.setPropertyIfNull(PingPongProducer.TRANSACTED_PROPNAME,
PingPongProducer.TRANSACTED_DEFAULT);
- testParameters.setPropertyIfNull(PingPongProducer.BROKER_PROPNAME,
PingPongProducer.BROKER_DEFAULT);
- testParameters.setPropertyIfNull(PingPongProducer.USERNAME_PROPNAME,
PingPongProducer.USERNAME_DEFAULT);
- testParameters.setPropertyIfNull(PingPongProducer.PASSWORD_PROPNAME,
PingPongProducer.PASSWORD_DEFAULT);
-
testParameters.setPropertyIfNull(PingPongProducer.VIRTUAL_HOST_PROPNAME,
PingPongProducer.VIRTUAL_HOST_DEFAULT);
- testParameters.setPropertyIfNull(PingPongProducer.VERBOSE_PROPNAME,
PingPongProducer.VERBOSE_DEFAULT);
- testParameters.setPropertyIfNull(PingPongProducer.RATE_PROPNAME,
PingPongProducer.RATE_DEFAULT);
- testParameters.setPropertyIfNull(PingPongProducer.PUBSUB_PROPNAME,
PingPongProducer.PUBSUB_DEFAULT);
-
testParameters.setPropertyIfNull(PingPongProducer.TX_BATCH_SIZE_PROPNAME,
PingPongProducer.TX_BATCH_SIZE_DEFAULT);
- testParameters.setPropertyIfNull(PingPongProducer.TIMEOUT_PROPNAME,
PingPongProducer.TIMEOUT_DEFAULT);
-
testParameters.setPropertyIfNull(PingPongProducer.DESTINATION_COUNT_PROPNAME,
- PingPongProducer.DESTINATION_COUNT_DEFAULT);
-
testParameters.setPropertyIfNull(PingPongProducer.FAIL_AFTER_COMMIT_PROPNAME,
- PingPongProducer.FAIL_AFTER_COMMIT_DEFAULT);
-
testParameters.setPropertyIfNull(PingPongProducer.FAIL_BEFORE_COMMIT_PROPNAME,
- PingPongProducer.FAIL_BEFORE_COMMIT_DEFAULT);
-
testParameters.setPropertyIfNull(PingPongProducer.FAIL_AFTER_SEND_PROPNAME,
- PingPongProducer.FAIL_AFTER_SEND_DEFAULT);
-
testParameters.setPropertyIfNull(PingPongProducer.FAIL_BEFORE_SEND_PROPNAME,
- PingPongProducer.FAIL_BEFORE_SEND_DEFAULT);
- testParameters.setPropertyIfNull(PingPongProducer.FAIL_ONCE_PROPNAME,
PingPongProducer.FAIL_ONCE_DEFAULT);
-
testParameters.setPropertyIfNull(PingPongProducer.UNIQUE_DESTS_PROPNAME,
PingPongProducer.UNIQUE_DESTS_DEFAULT);
- testParameters.setPropertyIfNull(PingPongProducer.ACK_MODE_PROPNAME,
PingPongProducer.ACK_MODE_DEFAULT);
-
testParameters.setPropertyIfNull(PingPongProducer.PAUSE_AFTER_BATCH_PROPNAME,
- PingPongProducer.PAUSE_AFTER_BATCH_DEFAULT);*/
}
/**
Modified: incubator/qpid/branches/M2/java/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/pom.xml?view=diff&rev=549530&r1=549529&r2=549530
==============================================================================
--- incubator/qpid/branches/M2/java/pom.xml (original)
+++ incubator/qpid/branches/M2/java/pom.xml Thu Jun 21 09:14:03 2007
@@ -31,9 +31,9 @@
<packaging>pom</packaging>
<scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/incubator/qpid/trunk</connection>
-
<developerConnection>scm:svn:http://svn.apache.org/repos/asf/incubator/qpid/trunk</developerConnection>
- <url>http://svn.apache.org/viewvc/incubator/qpid/trunk/</url>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/incubator/qpid/branches/M2/java</connection>
+
<developerConnection>scm:svn:http://svn.apache.org/repos/asf/incubator/qpid/branches/M2/java</developerConnection>
+ <url>http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java</url>
</scm>
<prerequisites>
@@ -103,7 +103,7 @@
<surefire.fork.mode>never</surefire.fork.mode>
<surefire.format>brief</surefire.format>
- <surefire.usefile>false</surefire.usefile>
+ <surefire.usefile>true</surefire.usefile>
<compile.forked>false</compile.forked>
<java.source.version>1.5</java.source.version>
<compile.flags>-Xlint:fallthrough,finally</compile.flags>
@@ -554,30 +554,83 @@
<reporting>
<plugins>
+ <!--
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<version>${cobertura.version}</version>
</plugin>
+ -->
+
+ <!-- Run the javadoc report. -->
+ <!--
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <tags>
+ <tag>
+ <name>todo</name>
+ <placement>a</placement>
+ <head>To do:</head>
+ </tag>
+ </tags>
+ </configuration>
+ </plugin>
+ -->
+
+ <!-- Generate the clover coverage report. -->
+ <!--
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clover-plugin</artifactId>
+ </plugin>
+ -->
+
+ <!-- Standard Maven project info reports. -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>${mprojectinfo.version}</version>
</plugin>
+
+ <!-- Generate the surefire test report. -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
<version>${surefire-report.version}</version>
</plugin>
+
+ <!-- Generate the TODO lists. -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>taglist-maven-plugin</artifactId>
+ </plugin>
+
+ <!-- Generate the source code cross reference. -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>${javadoc.version}</version>
+ <artifactId>maven-jxr-plugin</artifactId>
+ </plugin>
+
+ <!-- Minimal checkstyle rules. -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+
<configLocation>${basedir}/${topDirectoryLocation}/etc/coding_standards.xml</configLocation>
+
<headerLocation>${basedir}/${topDirectoryLocation}/etc/license_header.txt</headerLocation>
+ </configuration>
</plugin>
+
+ <!-- Generate report on changed files. -->
+ <!--
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-clover-plugin</artifactId>
+ <artifactId>maven-changelog-plugin</artifactId>
</plugin>
+ -->
+
</plugins>
</reporting>
Modified: incubator/qpid/branches/M2/java/systests/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/systests/distribution/pom.xml?view=diff&rev=549530&r1=549529&r2=549530
==============================================================================
--- incubator/qpid/branches/M2/java/systests/distribution/pom.xml (original)
+++ incubator/qpid/branches/M2/java/systests/distribution/pom.xml Thu Jun 21
09:14:03 2007
@@ -31,6 +31,7 @@
<groupId>org.apache.qpid</groupId>
<artifactId>qpid</artifactId>
<version>1.0-incubating-M2-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<properties>
Modified: incubator/qpid/branches/M2/java/systests/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/systests/pom.xml?view=diff&rev=549530&r1=549529&r2=549530
==============================================================================
--- incubator/qpid/branches/M2/java/systests/pom.xml (original)
+++ incubator/qpid/branches/M2/java/systests/pom.xml Thu Jun 21 09:14:03 2007
@@ -30,6 +30,7 @@
<groupId>org.apache.qpid</groupId>
<artifactId>qpid</artifactId>
<version>1.0-incubating-M2-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<properties>
@@ -53,6 +54,11 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>uk.co.thebadgerset</groupId>
+ <artifactId>junit-toolkit</artifactId>
</dependency>
<!-- Test Dependencies -->
