Modified: incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/protocol/ProtocolVersionAware.java URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/protocol/ProtocolVersionAware.java?rev=619823&r1=619822&r2=619823&view=diff ============================================================================== --- incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/protocol/ProtocolVersionAware.java (original) +++ incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/protocol/ProtocolVersionAware.java Fri Feb 8 02:09:37 2008 @@ -20,6 +20,8 @@ */ package org.apache.qpid.protocol; +import org.apache.qpid.framing.ProtocolVersion; + /** * ProtocolVersionAware is implemented by all AMQP handling classes, that need to provide an awareness to callers of * the version of the AMQP protocol that they are able to handle. @@ -32,6 +34,7 @@ public interface ProtocolVersionAware { /** + * @deprecated * Reports the AMQP minor version, that the implementer can handle. * * @return The AMQP minor version. @@ -39,9 +42,12 @@ public byte getProtocolMinorVersion(); /** + * @deprecated * Reports the AMQP major version, that the implementer can handle. * * @return The AMQP major version. */ public byte getProtocolMajorVersion(); + + public ProtocolVersion getProtocolVersion(); }
Modified: incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/util/ConcurrentLinkedMessageQueueAtomicSize.java URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/util/ConcurrentLinkedMessageQueueAtomicSize.java?rev=619823&r1=619822&r2=619823&view=diff ============================================================================== --- incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/util/ConcurrentLinkedMessageQueueAtomicSize.java (original) +++ incubator/qpid/branches/thegreatmerge/qpid/java/common/src/main/java/org/apache/qpid/util/ConcurrentLinkedMessageQueueAtomicSize.java Fri Feb 8 02:09:37 2008 @@ -215,6 +215,14 @@ public void remove() { last.remove(); + if(last == _mainIterator) + { + _size.decrementAndGet(); + } + else + { + _messageHeadSize.decrementAndGet(); + } } }; } Modified: incubator/qpid/branches/thegreatmerge/qpid/java/common/src/test/java/org/apache/mina/SocketIOTest/IOWriterClient.java URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/common/src/test/java/org/apache/mina/SocketIOTest/IOWriterClient.java?rev=619823&r1=616809&r2=619823&view=diff ============================================================================== (empty) Modified: incubator/qpid/branches/thegreatmerge/qpid/java/common/src/test/java/org/apache/mina/SocketIOTest/IOWriterServer.java URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/common/src/test/java/org/apache/mina/SocketIOTest/IOWriterServer.java?rev=619823&r1=616809&r2=619823&view=diff ============================================================================== (empty) Added: incubator/qpid/branches/thegreatmerge/qpid/java/common/templates/method/MethodBodyInterface.vm URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/common/templates/method/MethodBodyInterface.vm?rev=619823&view=auto ============================================================================== --- incubator/qpid/branches/thegreatmerge/qpid/java/common/templates/method/MethodBodyInterface.vm (added) +++ incubator/qpid/branches/thegreatmerge/qpid/java/common/templates/method/MethodBodyInterface.vm Fri Feb 8 02:09:37 2008 @@ -0,0 +1,62 @@ +#macro( UpperCamel $name ) +#set( $name = "${name.substring(0,1).toUpperCase()}${name.substring(1)}" ) +#end +#macro( toUpperCamel $name )${name.substring(0,1).toUpperCase()}${name.substring(1)}#end + + + +#set( $amqp_ClassName = $amqpClass.Name) +#UpperCamel( $amqp_ClassName ) +#set( $amqp_MethodName = $amqpMethod.Name ) +#UpperCamel( $amqp_MethodName ) +#set( $javaClassName = "${amqp_ClassName}${amqp_MethodName}Body" ) + + +#set( $filename = "${javaClassName}.java") +/* + * + * 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. + * + */ + +/* + * This file is auto-generated by ${generator} - do not modify. + * Supported AMQP version: + #foreach( $supportedVersion in $model.VersionSet ) + * $supportedVersion.getMajor()-$supportedVersion.getMinor() + #end + */ + + +package org.apache.qpid.framing; + + +public interface ${javaClassName} extends EncodableAMQDataBlock, AMQMethodBody +{ + + +#foreach( $field in $amqpMethod.Fields ) + +#if( $amqpMethod.isCommon( $field ) ) + public $field.ConsistentNativeType get#toUpperCamel( ${field.Name} )(); +#end +#end + + + +} Modified: incubator/qpid/branches/thegreatmerge/qpid/java/common/templates/method/version/MethodBodyClass.vm URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/common/templates/method/version/MethodBodyClass.vm?rev=619823&r1=616809&r2=619823&view=diff ============================================================================== (empty) Added: incubator/qpid/branches/thegreatmerge/qpid/java/common/templates/model/ClientMethodDispatcherInterface.vm URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/common/templates/model/ClientMethodDispatcherInterface.vm?rev=619823&view=auto ============================================================================== --- incubator/qpid/branches/thegreatmerge/qpid/java/common/templates/model/ClientMethodDispatcherInterface.vm (added) +++ incubator/qpid/branches/thegreatmerge/qpid/java/common/templates/model/ClientMethodDispatcherInterface.vm Fri Feb 8 02:09:37 2008 @@ -0,0 +1,56 @@ +#set( $filename = "ClientMethodDispatcher.java") +/* + * + * 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. + * + */ + +/* + * This file is auto-generated by $generator - do not modify. + * Supported AMQP version: + #foreach( $supportedVersion in $model.VersionSet ) + * $supportedVersion.getMajor()-$supportedVersion.getMinor() + #end + */ + +package org.apache.qpid.framing; + +import org.apache.qpid.AMQException; + + +public interface ClientMethodDispatcher +{ + +#foreach( $amqpClass in $model.getClasses() ) +#set( $amqpClassNameFirstChar = $amqpClass.getName().substring(0,1) ) +#set( $amqpClassNameFirstCharU = $amqpClassNameFirstChar.toUpperCase() ) +#set( $amqpClassNameUpperCamel = "$amqpClassNameFirstCharU$amqpClass.getName().substring(1)" ) +#foreach( $amqpMethodVersions in $amqpClass.getMethods() ) +#if( $amqpMethodVersions.inAllVersions() ) +#set( $amqpMethod = $amqpMethodVersions.asSingleVersionMethod($amqpMethodVersions.getVersionSet().first()) ) +#if( $amqpMethod.isClientMethod() ) +#set( $amqpMethodNameFirstChar = $amqpMethod.getName().substring(0,1) ) +#set( $amqpMethodNameFirstCharU = $amqpMethodNameFirstChar.toUpperCase() ) +#set( $amqpMethodNameUpperCamel = "$amqpMethodNameFirstCharU$amqpMethod.getName().substring(1)" ) + public boolean dispatch${amqpClassNameUpperCamel}${amqpMethodNameUpperCamel}(${amqpClassNameUpperCamel}${amqpMethodNameUpperCamel}Body body, int channelId) throws AMQException; +#end +#end +#end +#end + +} \ No newline at end of file Added: incubator/qpid/branches/thegreatmerge/qpid/java/common/templates/model/MethodDispatcherInterface.vm URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/common/templates/model/MethodDispatcherInterface.vm?rev=619823&view=auto ============================================================================== --- incubator/qpid/branches/thegreatmerge/qpid/java/common/templates/model/MethodDispatcherInterface.vm (added) +++ incubator/qpid/branches/thegreatmerge/qpid/java/common/templates/model/MethodDispatcherInterface.vm Fri Feb 8 02:09:37 2008 @@ -0,0 +1,39 @@ +#set( $filename = "MethodDispatcher.java") +/* + * + * 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. + * + */ + +/* + * This file is auto-generated by $generator - do not modify. + * Supported AMQP version: + #foreach( $supportedVersion in $model.VersionSet ) + * $supportedVersion.getMajor()-$supportedVersion.getMinor() + #end + */ + +package org.apache.qpid.framing; + +import org.apache.qpid.AMQException; + + +public interface MethodDispatcher extends + ClientMethodDispatcher, ServerMethodDispatcher +{ +} \ No newline at end of file Added: incubator/qpid/branches/thegreatmerge/qpid/java/common/templates/model/MethodRegistryClass.vm URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/common/templates/model/MethodRegistryClass.vm?rev=619823&view=auto ============================================================================== --- incubator/qpid/branches/thegreatmerge/qpid/java/common/templates/model/MethodRegistryClass.vm (added) +++ incubator/qpid/branches/thegreatmerge/qpid/java/common/templates/model/MethodRegistryClass.vm Fri Feb 8 02:09:37 2008 @@ -0,0 +1,104 @@ +#set( $filename = "MethodRegistry.java") +/* + * + * 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. + * + */ + +/* + * This file is auto-generated by $generator - do not modify. + * Supported AMQP version: + #foreach( $supportedVersion in $model.VersionSet ) + * $supportedVersion.getMajor()-$supportedVersion.getMinor() + #end + */ + +package org.apache.qpid.framing; + +import org.apache.mina.common.ByteBuffer; + +import org.apache.qpid.framing.abstraction.ProtocolVersionMethodConverter; + +import java.util.Map; +import java.util.HashMap; + + +public abstract class MethodRegistry +{ + private static final Map<ProtocolVersion, MethodRegistry> _registries = + new HashMap<ProtocolVersion, MethodRegistry>(); + +#foreach( $supportedVersion in $model.VersionSet ) + +#set( $verName = "_$supportedVersion.getMajor()_$supportedVersion.getMinor()" ) +#set( $regPackage = "org.apache.qpid.framing.amqp$verName" ) + public static final MethodRegistry registry_$supportedVersion.getMajor()_$supportedVersion.getMinor() = + new ${regPackage}.MethodRegistry${verName}(); + +#end + + + public abstract AMQMethodBody convertToBody(ByteBuffer in, long size) + throws AMQFrameDecodingException; + + public abstract int getMaxClassId(); + + public abstract int getMaxMethodId(int classId); + + + protected MethodRegistry(ProtocolVersion pv) + { + _registries.put(pv, this); + } + + public static MethodRegistry getMethodRegistry(ProtocolVersion pv) + { + return _registries.get(pv); + } + +#foreach( $amqpClass in $model.getClasses() ) +#set( $amqpClassNameFirstChar = $amqpClass.getName().substring(0,1) ) +#set( $amqpClassNameFirstCharU = $amqpClassNameFirstChar.toUpperCase() ) +#set( $amqpClassNameUpperCamel = "$amqpClassNameFirstCharU$amqpClass.getName().substring(1)" ) + +#foreach( $amqpMethodVersions in $amqpClass.getMethods() ) +#if( $amqpMethodVersions.isVersionInterfaceConsistent() ) +#set( $amqpMethod = $amqpMethodVersions.asSingleVersionMethod($amqpMethodVersions.getVersionSet().first()) ) + +#set( $amqpMethodNameFirstChar = $amqpMethod.getName().substring(0,1) ) +#set( $amqpMethodNameFirstCharU = $amqpMethodNameFirstChar.toUpperCase() ) +#set( $amqpMethodNameUpperCamel = "$amqpMethodNameFirstCharU$amqpMethod.getName().substring(1)" ) + public abstract ${amqpClassNameUpperCamel}${amqpMethodNameUpperCamel}Body create${amqpClassNameUpperCamel}${amqpMethodNameUpperCamel}Body( +#foreach( $field in $amqpMethod.FieldList ) +#if( $velocityCount == $amqpMethod.getFieldList().size() ) + final $field.NativeType $field.Name +#else + final $field.NativeType $field.Name, +#end +#end + ); + + +#end +#end +#end + + + public abstract ProtocolVersionMethodConverter getProtocolVersionMethodConverter(); + +} \ No newline at end of file Added: incubator/qpid/branches/thegreatmerge/qpid/java/common/templates/model/ProtocolVersionListClass.vm URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/common/templates/model/ProtocolVersionListClass.vm?rev=619823&view=auto ============================================================================== --- incubator/qpid/branches/thegreatmerge/qpid/java/common/templates/model/ProtocolVersionListClass.vm (added) +++ incubator/qpid/branches/thegreatmerge/qpid/java/common/templates/model/ProtocolVersionListClass.vm Fri Feb 8 02:09:37 2008 @@ -0,0 +1,178 @@ +#set( $filename = "ProtocolVersion.java" ) +/* +* +* 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. +* +*/ + +/* +* This file is auto-generated by $generator - do not modify. +* Supported AMQP versions: +#foreach( $version in $model.getVersionSet() ) +* $version.getMajor()-$version.getMinor() +#end +*/ + +package org.apache.qpid.framing; + +import java.util.SortedSet; +import java.util.Collections; +import java.util.TreeSet; +import java.util.Map; +import java.util.HashMap; + + +public class ProtocolVersion implements Comparable +{ + private final byte _majorVersion; + private final byte _minorVersion; + + + public ProtocolVersion(byte majorVersion, byte minorVersion) + { + _majorVersion = majorVersion; + _minorVersion = minorVersion; + } + + public byte getMajorVersion() + { + return _majorVersion; + } + + public byte getMinorVersion() + { + return _minorVersion; + } + + + public int compareTo(Object o) + { + ProtocolVersion pv = (ProtocolVersion) o; + + /* + * 0-8 has it's major and minor numbers the wrong way round (it's actually 8-0)... + * so we need to deal with that case specially + */ + + if((_majorVersion == (byte) 8) && (_minorVersion == (byte) 0)) + { + ProtocolVersion fixedThis = new ProtocolVersion(_minorVersion, _majorVersion); + return fixedThis.compareTo(pv); + } + + if((pv.getMajorVersion() == (byte) 8) && (pv.getMinorVersion() == (byte) 0)) + { + ProtocolVersion fixedOther = new ProtocolVersion(pv.getMinorVersion(), pv.getMajorVersion()); + return this.compareTo(fixedOther); + } + + if(_majorVersion > pv.getMajorVersion()) + { + return 1; + } + else if(_majorVersion < pv.getMajorVersion()) + { + return -1; + } + else if(_minorVersion > pv.getMinorVersion()) + { + return 1; + } + else if(getMinorVersion() < pv.getMinorVersion()) + { + return -1; + } + else + { + return 0; + } + + } + + public boolean equals(Object o) + { + return o != null && (o == this || (compareTo(o) == 0)); + } + + public int hashCode() + { + return (0xFF & (int)_minorVersion) | ((0xFF & (int)_majorVersion) << 8); + } + + + public boolean isSupported() + { + return _supportedVersions.contains(this); + } + + public static ProtocolVersion getLatestSupportedVersion() + { + return _supportedVersions.last(); + } + + private static final SortedSet<ProtocolVersion> _supportedVersions; + private static final Map<String, ProtocolVersion> _nameToVersionMap = + new HashMap<String, ProtocolVersion>(); + private static final ProtocolVersion _defaultVersion; + + +#foreach( $version in $model.getVersionSet() ) +#set( $versionId = "v$version.getMajor()_$version.getMinor()" ) + public static final ProtocolVersion $versionId = new ProtocolVersion((byte)$version.getMajor(),(byte)$version.getMinor()); +#end + + static + { + SortedSet<ProtocolVersion> versions = new TreeSet<ProtocolVersion>(); + +#foreach( $version in $model.getVersionSet() ) +#set( $versionId = "v$version.getMajor()_$version.getMinor()" ) + versions.add($versionId); + _nameToVersionMap.put("${version.getMajor()}-${version.getMinor()}", $versionId); +#end + _supportedVersions = Collections.unmodifiableSortedSet(versions); + + + ProtocolVersion systemDefinedVersion = + _nameToVersionMap.get(System.getProperty("org.apache.qpid.amqp_version")); + + _defaultVersion = (systemDefinedVersion == null) + ? getLatestSupportedVersion() + : systemDefinedVersion; + } + + + public static SortedSet<ProtocolVersion> getSupportedProtocolVersions() + { + return _supportedVersions; + } + + + + public static ProtocolVersion parse(String name) + { + return _nameToVersionMap.get(name); + } + + public static ProtocolVersion defaultProtocolVersion() + { + return _defaultVersion; + } + + +} Added: incubator/qpid/branches/thegreatmerge/qpid/java/common/templates/model/ServerMethodDispatcherInterface.vm URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/common/templates/model/ServerMethodDispatcherInterface.vm?rev=619823&view=auto ============================================================================== --- incubator/qpid/branches/thegreatmerge/qpid/java/common/templates/model/ServerMethodDispatcherInterface.vm (added) +++ incubator/qpid/branches/thegreatmerge/qpid/java/common/templates/model/ServerMethodDispatcherInterface.vm Fri Feb 8 02:09:37 2008 @@ -0,0 +1,56 @@ +#set( $filename = "ServerMethodDispatcher.java") +/* + * + * 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. + * + */ + +/* + * This file is auto-generated by $generator - do not modify. + * Supported AMQP version: + #foreach( $supportedVersion in $model.VersionSet ) + * $supportedVersion.getMajor()-$supportedVersion.getMinor() + #end + */ + +package org.apache.qpid.framing; + +import org.apache.qpid.AMQException; + + +public interface ServerMethodDispatcher +{ + +#foreach( $amqpClass in $model.getClasses() ) +#set( $amqpClassNameFirstChar = $amqpClass.getName().substring(0,1) ) +#set( $amqpClassNameFirstCharU = $amqpClassNameFirstChar.toUpperCase() ) +#set( $amqpClassNameUpperCamel = "$amqpClassNameFirstCharU$amqpClass.getName().substring(1)" ) +#foreach( $amqpMethodVersions in $amqpClass.getMethods() ) +#if( $amqpMethodVersions.inAllVersions() ) +#set( $amqpMethod = $amqpMethodVersions.asSingleVersionMethod($amqpMethodVersions.getVersionSet().first()) ) +#if( $amqpMethod.isServerMethod() ) +#set( $amqpMethodNameFirstChar = $amqpMethod.getName().substring(0,1) ) +#set( $amqpMethodNameFirstCharU = $amqpMethodNameFirstChar.toUpperCase() ) +#set( $amqpMethodNameUpperCamel = "$amqpMethodNameFirstCharU$amqpMethod.getName().substring(1)" ) + public boolean dispatch${amqpClassNameUpperCamel}${amqpMethodNameUpperCamel}(${amqpClassNameUpperCamel}${amqpMethodNameUpperCamel}Body body, int channelId) throws AMQException; +#end +#end +#end +#end + +} \ No newline at end of file Modified: incubator/qpid/branches/thegreatmerge/qpid/java/common/templates/model/version/AmqpConstantsClass.vm URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/common/templates/model/version/AmqpConstantsClass.vm?rev=619823&r1=616809&r2=619823&view=diff ============================================================================== (empty) Modified: incubator/qpid/branches/thegreatmerge/qpid/java/common/templates/model/version/ClientMethodDispatcherInterface.vm URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/common/templates/model/version/ClientMethodDispatcherInterface.vm?rev=619823&r1=616809&r2=619823&view=diff ============================================================================== (empty) Modified: incubator/qpid/branches/thegreatmerge/qpid/java/common/templates/model/version/MethodDispatcherInterface.vm URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/common/templates/model/version/MethodDispatcherInterface.vm?rev=619823&r1=616809&r2=619823&view=diff ============================================================================== (empty) Modified: incubator/qpid/branches/thegreatmerge/qpid/java/common/templates/model/version/MethodRegistryClass.vm URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/common/templates/model/version/MethodRegistryClass.vm?rev=619823&r1=616809&r2=619823&view=diff ============================================================================== (empty) Modified: incubator/qpid/branches/thegreatmerge/qpid/java/common/templates/model/version/ServerMethodDispatcherInterface.vm URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/common/templates/model/version/ServerMethodDispatcherInterface.vm?rev=619823&r1=616809&r2=619823&view=diff ============================================================================== (empty) Modified: incubator/qpid/branches/thegreatmerge/qpid/java/integrationtests/pom.xml URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/integrationtests/pom.xml?rev=619823&r1=619822&r2=619823&view=diff ============================================================================== --- incubator/qpid/branches/thegreatmerge/qpid/java/integrationtests/pom.xml (original) +++ incubator/qpid/branches/thegreatmerge/qpid/java/integrationtests/pom.xml Fri Feb 8 02:09:37 2008 @@ -59,7 +59,6 @@ <dependency> <groupId>uk.co.thebadgerset</groupId> <artifactId>junit-toolkit</artifactId> - <version>0.6-SNAPSHOT</version> <scope>compile</scope> </dependency> Modified: incubator/qpid/branches/thegreatmerge/qpid/java/management/eclipse-plugin/pom.xml URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/management/eclipse-plugin/pom.xml?rev=619823&r1=619822&r2=619823&view=diff ============================================================================== --- incubator/qpid/branches/thegreatmerge/qpid/java/management/eclipse-plugin/pom.xml (original) +++ incubator/qpid/branches/thegreatmerge/qpid/java/management/eclipse-plugin/pom.xml Fri Feb 8 02:09:37 2008 @@ -66,6 +66,7 @@ <version>3.4.4</version> <scope>compile</scope> </dependency> + <dependency> <groupId>org.eclipse.jface</groupId> <artifactId>org.eclipse.jface</artifactId> Modified: incubator/qpid/branches/thegreatmerge/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java?rev=619823&r1=619822&r2=619823&view=diff ============================================================================== --- incubator/qpid/branches/thegreatmerge/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java (original) +++ incubator/qpid/branches/thegreatmerge/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java Fri Feb 8 02:09:37 2008 @@ -744,16 +744,16 @@ } TabularDataSupport tabularData = (TabularDataSupport)result; - Collection<CompositeData> records = tabularData.values(); + Collection<Object> records = tabularData.values(); List<String> list = new ArrayList<String>(); - for (CompositeData data : records) + for (Object o : records) { + CompositeData data = (CompositeData) o; if (data.containsKey(USERNAME)) { list.add(data.get(USERNAME).toString()); } } - return list; } Added: incubator/qpid/branches/thegreatmerge/qpid/java/perftests/etc/jndi/failovertest.properties URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/perftests/etc/jndi/failovertest.properties?rev=619823&view=auto ============================================================================== --- incubator/qpid/branches/thegreatmerge/qpid/java/perftests/etc/jndi/failovertest.properties (added) +++ incubator/qpid/branches/thegreatmerge/qpid/java/perftests/etc/jndi/failovertest.properties Fri Feb 8 02:09:37 2008 @@ -0,0 +1,2 @@ +java.naming.factory.initial = org.apache.qpid.jndi.PropertiesFileInitialContextFactory +connectionfactory.local = amqp://guest:[EMAIL PROTECTED]/test?brokerlist='tcp://localhost:5001;tcp://localhost:5002' Added: incubator/qpid/branches/thegreatmerge/qpid/java/perftests/etc/scripts/Connections.sh URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/perftests/etc/scripts/Connections.sh?rev=619823&view=auto ============================================================================== --- incubator/qpid/branches/thegreatmerge/qpid/java/perftests/etc/scripts/Connections.sh (added) +++ incubator/qpid/branches/thegreatmerge/qpid/java/perftests/etc/scripts/Connections.sh Fri Feb 8 02:09:37 2008 @@ -0,0 +1 @@ +find . -regex '\.\/[P|T].CT-.*\.sh' -exec {} -o results-Connections/ --csv \; Propchange: incubator/qpid/branches/thegreatmerge/qpid/java/perftests/etc/scripts/Connections.sh ------------------------------------------------------------------------------ svn:executable = * Added: incubator/qpid/branches/thegreatmerge/qpid/java/perftests/etc/scripts/JobQueue.sh URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/perftests/etc/scripts/JobQueue.sh?rev=619823&view=auto ============================================================================== --- incubator/qpid/branches/thegreatmerge/qpid/java/perftests/etc/scripts/JobQueue.sh (added) +++ incubator/qpid/branches/thegreatmerge/qpid/java/perftests/etc/scripts/JobQueue.sh Fri Feb 8 02:09:37 2008 @@ -0,0 +1 @@ +find . -regex '.*BL-.*\.sh' -exec {} -o results-JobQueue/ --csv \; Propchange: incubator/qpid/branches/thegreatmerge/qpid/java/perftests/etc/scripts/JobQueue.sh ------------------------------------------------------------------------------ svn:executable = * Added: incubator/qpid/branches/thegreatmerge/qpid/java/perftests/etc/scripts/Latency.sh URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/perftests/etc/scripts/Latency.sh?rev=619823&view=auto ============================================================================== --- incubator/qpid/branches/thegreatmerge/qpid/java/perftests/etc/scripts/Latency.sh (added) +++ incubator/qpid/branches/thegreatmerge/qpid/java/perftests/etc/scripts/Latency.sh Fri Feb 8 02:09:37 2008 @@ -0,0 +1 @@ +find . -regex '\.\/[P|T].CL-.*\.sh' -exec {} -o results-Latency/ --csv \; Propchange: incubator/qpid/branches/thegreatmerge/qpid/java/perftests/etc/scripts/Latency.sh ------------------------------------------------------------------------------ svn:executable = * Added: incubator/qpid/branches/thegreatmerge/qpid/java/perftests/etc/scripts/Reliability.sh URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/perftests/etc/scripts/Reliability.sh?rev=619823&view=auto ============================================================================== --- incubator/qpid/branches/thegreatmerge/qpid/java/perftests/etc/scripts/Reliability.sh (added) +++ incubator/qpid/branches/thegreatmerge/qpid/java/perftests/etc/scripts/Reliability.sh Fri Feb 8 02:09:37 2008 @@ -0,0 +1 @@ + find . -regex '.*R-Qpid-0[1-2].*\.sh' -exec {} -o results-Reliability/ --csv \; && for i in `seq 1 6` ; do find . -regex '.*R-Qpid-0[3-7].*\.sh' -exec {} -o results-Reliability/ --csv \; ; done Propchange: incubator/qpid/branches/thegreatmerge/qpid/java/perftests/etc/scripts/Reliability.sh ------------------------------------------------------------------------------ svn:executable = * Added: incubator/qpid/branches/thegreatmerge/qpid/java/perftests/etc/scripts/Throughput.sh URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/perftests/etc/scripts/Throughput.sh?rev=619823&view=auto ============================================================================== --- incubator/qpid/branches/thegreatmerge/qpid/java/perftests/etc/scripts/Throughput.sh (added) +++ incubator/qpid/branches/thegreatmerge/qpid/java/perftests/etc/scripts/Throughput.sh Fri Feb 8 02:09:37 2008 @@ -0,0 +1 @@ + find . -regex '.*T.BT-.*\.sh' -exec {} -o 2110rc3-throughput/ --csv $* \; Propchange: incubator/qpid/branches/thegreatmerge/qpid/java/perftests/etc/scripts/Throughput.sh ------------------------------------------------------------------------------ svn:executable = *
