You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ri...@apache.org on 2007/07/31 17:54:49 UTC
svn commit: r561365 [7/10] - in /incubator/qpid/trunk/qpid: ./ cpp/ dotnet/
dotnet/Qpid.Buffer.Tests/ dotnet/Qpid.Buffer.Tests/Properties/
dotnet/Qpid.Buffer/ dotnet/Qpid.Buffer/Properties/
dotnet/Qpid.Client.Tests/ dotnet/Qpid.Client.Tests/BrokerDetai...
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQShortString.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQShortString.java?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQShortString.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQShortString.java Tue Jul 31 08:53:37 2007
@@ -26,6 +26,10 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.Map;
+import java.util.WeakHashMap;
+import java.lang.ref.WeakReference;
+
/**
* A short string is a representation of an AMQ Short String
* Short strings differ from the Java String class by being limited to on ASCII characters (0-127)
@@ -34,6 +38,19 @@
*/
public final class AMQShortString implements CharSequence, Comparable<AMQShortString>
{
+
+ private static final ThreadLocal<Map<AMQShortString, WeakReference<AMQShortString>>> _localInternMap =
+ new ThreadLocal<Map<AMQShortString, WeakReference<AMQShortString>>>()
+ {
+ protected Map<AMQShortString, WeakReference<AMQShortString>> initialValue()
+ {
+ return new WeakHashMap<AMQShortString, WeakReference<AMQShortString>>();
+ };
+ };
+
+ private static final Map<AMQShortString, WeakReference<AMQShortString>> _globalInternMap =
+ new WeakHashMap<AMQShortString, WeakReference<AMQShortString>>();
+
private static final Logger _logger = LoggerFactory.getLogger(AMQShortString.class);
private final ByteBuffer _data;
@@ -375,5 +392,44 @@
return (length() == name.length()) ? 0 : -1;
}
+ }
+
+
+ public AMQShortString intern()
+ {
+
+ hashCode();
+
+ Map<AMQShortString, WeakReference<AMQShortString>> localMap =
+ _localInternMap.get();
+
+ WeakReference<AMQShortString> ref = localMap.get(this);
+ AMQShortString internString;
+
+ if(ref != null)
+ {
+ internString = ref.get();
+ if(internString != null)
+ {
+ return internString;
+ }
+ }
+
+
+ synchronized(_globalInternMap)
+ {
+
+ ref = _globalInternMap.get(this);
+ if((ref == null) || ((internString = ref.get()) == null))
+ {
+ internString = new AMQShortString(getBytes());
+ ref = new WeakReference(internString);
+ _globalInternMap.put(internString, ref);
+ }
+
+ }
+ localMap.put(internString, ref);
+ return internString;
+
}
}
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/abstraction/MessagePublishInfoConverter.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/abstraction/MessagePublishInfoConverter.java?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/abstraction/MessagePublishInfoConverter.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/abstraction/MessagePublishInfoConverter.java Tue Jul 31 08:53:37 2007
@@ -1,18 +1,21 @@
/*
*
- * 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.
*
*/
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/abstraction/ProtocolVersionMethodConverter.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/abstraction/ProtocolVersionMethodConverter.java?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/abstraction/ProtocolVersionMethodConverter.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/abstraction/ProtocolVersionMethodConverter.java Tue Jul 31 08:53:37 2007
@@ -1,18 +1,21 @@
/*
*
- * 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.
*
*/
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/util/CommandLineParser.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/util/CommandLineParser.java?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/util/CommandLineParser.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/util/CommandLineParser.java Tue Jul 31 08:53:37 2007
@@ -483,9 +483,9 @@
}
/**
- * If a command line has been parsed, calling this method sets all of its parsed options as system properties.
+ * If a command line has been parsed, calling this method sets all of its parsed options into the specified properties.
*/
- public void addCommandLineToSysProperties()
+ public void addCommandLineToProperties(Properties properties)
{
if (parsedProperties != null)
{
@@ -494,7 +494,7 @@
String name = (String) propKey;
String value = parsedProperties.getProperty(name);
- System.setProperty(name, value);
+ properties.setProperty(name, value);
}
}
}
@@ -607,7 +607,9 @@
* instrucitons and calling System.exit on errors. Extracts all trailing name=value pairs from the command line,
* and sets them all as system properties and also returns a map of properties containing them.
*
- * @param args The command line.
+ * @param args The command line.
+ * @param commandLine The command line parser.
+ * @param properties The properties object to inject all parsed properties into (optional may be <tt>null</tt>).
*
* @return A set of properties containing all name=value pairs from the command line.
*
@@ -619,7 +621,7 @@
* @todo Allow the Properties to add trailing options to be specified as an argument rather than hard coding
* system properties. Again, gives the caller the option to decide.
*/
- public static Properties processCommandLine(String[] args, CommandLineParser commandLine)
+ public static Properties processCommandLine(String[] args, CommandLineParser commandLine, Properties properties)
{
// Capture the command line arguments or display errors and correct usage and then exit.
Properties options = null;
@@ -630,7 +632,7 @@
// Add all the trailing command line options (name=value pairs) to system properties. They may be picked up
// from there.
- commandLine.addCommandLineToSysProperties();
+ commandLine.addCommandLineToProperties(properties);
}
catch (IllegalArgumentException e)
{
Modified: incubator/qpid/trunk/qpid/java/distribution/pom.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/distribution/pom.xml?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/java/distribution/pom.xml (original)
+++ incubator/qpid/trunk/qpid/java/distribution/pom.xml Tue Jul 31 08:53:37 2007
@@ -39,8 +39,11 @@
<java.source.version>1.5</java.source.version>
<qpid.version>${pom.version}</qpid.version>
<qpid.targetDir>${project.build.directory}</qpid.targetDir>
+
+ <!-- This is an assembly/distribution pom so no test code exists -->
+ <maven.test.skip>true</maven.test.skip>
</properties>
-
+
<repositories>
<repository>
<id>repo1.maven.org</id>
@@ -131,6 +134,8 @@
</executions>
</plugin>
</plugins>
+
+ <defaultGoal>assembly:assembly</defaultGoal>
</build>
<profiles>
Modified: incubator/qpid/trunk/qpid/java/distribution/src/main/assembly/bin-test.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/distribution/src/main/assembly/bin-test.xml?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/java/distribution/src/main/assembly/bin-test.xml (original)
+++ incubator/qpid/trunk/qpid/java/distribution/src/main/assembly/bin-test.xml Tue Jul 31 08:53:37 2007
@@ -27,38 +27,32 @@
</formats>
<fileSets>
+ <!-- Include the currently hardwired Apache Legal bits -->
<fileSet>
- <directory>src/main/release</directory>
+ <directory>../resources</directory>
<outputDirectory>qpid-${qpid.version}</outputDirectory>
<includes>
<include>DISCLAIMER</include>
- <include>LICENSE.txt</include>
- <include>NOTICE.txt</include>
- <include>README.txt</include>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ <include>README</include>
</includes>
+ <fileMode>0444</fileMode>
</fileSet>
+
+ <!-- Include any release information -->
<fileSet>
- <directory>..</directory>
+ <directory>src/main/release</directory>
<outputDirectory>qpid-${qpid.version}</outputDirectory>
- <includes>
- <include>*.txt</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>src/main/release/etc</directory>
- <outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
- <includes>
- <include>logging.properties</include>
- <include>log4j.properties</include>
- </includes>
</fileSet>
+
+ <!-- Include any release information -->
<fileSet>
- <directory>src/main/release/docs</directory>
- <outputDirectory>qpid-${qpid.version}/docs</outputDirectory>
- <includes>
- <include>RELEASE_NOTES.txt</include>
- </includes>
+ <directory>../release-docs</directory>
+ <outputDirectory>qpid-${qpid.version}</outputDirectory>
</fileSet>
+
+ <!-- Include the classpath jar qpid-incubating.jar -->
<fileSet>
<directory>target</directory>
<outputDirectory>qpid-${qpid.version}/lib</outputDirectory>
@@ -66,107 +60,40 @@
<include>qpid-incubating.jar</include>
</includes>
</fileSet>
- </fileSets>
- <files>
- <!-- due to a bug in the assembly plugin (MASSEMBLY-153) you have
- to use decimal numbers to specify fileMode -->
- <file>
- <source>../common/etc/qpid-run.conf</source>
- <outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
- <destName>qpid-run.conf</destName>
- <fileMode>420</fileMode>
- </file>
- <file>
- <source>../broker/etc/config.xml</source>
- <outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
- <destName>config.xml</destName>
- <fileMode>420</fileMode>
- </file>
- <file>
- <source>../broker/etc/log4j.xml</source>
- <outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
- <destName>log4j.xml</destName>
- <fileMode>420</fileMode>
- </file>
- <file>
- <source>../broker/etc/passwd</source>
- <outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
- <destName>passwd</destName>
- <fileMode>420</fileMode>
- </file>
- <file>
- <source>../broker/etc/qpid-server.conf</source>
+
+ <!-- Include etc -->
+ <fileSet>
+ <directory>../common/etc</directory>
<outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
- <destName>qpid-server.conf</destName>
- <fileMode>420</fileMode>
- </file>
- <file>
- <source>../broker/etc/virtualhosts.xml</source>
+ <fileMode>0640</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>../broker/etc</directory>
<outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
- <destName>virtualhosts.xml</destName>
- <fileMode>420</fileMode>
- </file>
- <file>
- <source>../broker/bin/qpid.start</source>
- <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
- <destName>qpid.start</destName>
- <fileMode>493</fileMode>
- </file>
- <file>
- <source>../broker/bin/qpid.stop</source>
- <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
- <destName>qpid.stop</destName>
- <fileMode>493</fileMode>
- </file>
- <file>
- <source>../broker/bin/qpid.stopall</source>
- <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
- <destName>qpid.stopall</destName>
- <fileMode>493</fileMode>
- </file>
- <file>
- <source>../common/bin/qpid-run</source>
- <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
- <destName>qpid-run</destName>
- <fileMode>493</fileMode>
- </file>
- <file>
- <source>../broker/bin/qpid-server</source>
- <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
- <destName>qpid-server</destName>
- <fileMode>493</fileMode>
- </file>
- <file>
- <source>../broker/bin/qpid-server.bat</source>
- <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
- <destName>qpid-server.bat</destName>
- <fileMode>493</fileMode>
- </file>
- <file>
- <source>../broker/bin/run.bat</source>
- <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
- <destName>run.bat</destName>
- <fileMode>493</fileMode>
- </file>
- <file>
- <source>../broker/bin/run.sh</source>
+ <fileMode>0640</fileMode>
+ </fileSet>
+
+ <!-- Include bin scripts-->
+ <fileSet>
+ <directory>../broker/bin</directory>
<outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
- <destName>run.sh</destName>
- <fileMode>493</fileMode>
- </file>
- <file>
- <source>../broker/bin/runAll</source>
+ <fileMode>0750</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>../common/bin</directory>
<outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
- <destName>runAll</destName>
- <fileMode>493</fileMode>
- </file>
- </files>
+ <fileMode>0750</fileMode>
+ </fileSet>
+ </fileSets>
+
<dependencySets>
<dependencySet>
<outputDirectory>qpid-${qpid.version}/lib</outputDirectory>
<unpack>false</unpack>
<excludes>
+ <!-- Exclude the jar output of this build process -->
<exclude>org.apache.qpid:qpid-distribution</exclude>
+ <!-- Exclude the Console dependancies -->
<exclude>org.apache.qpid.management:org.apache.qpid.management.ui</exclude>
<exclude>org.eclipse.core:org.eclipse.core.commands</exclude>
<exclude>org.eclipse.core:org.eclipse.core.contenttype</exclude>
Modified: incubator/qpid/trunk/qpid/java/distribution/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/distribution/src/main/assembly/bin.xml?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/java/distribution/src/main/assembly/bin.xml (original)
+++ incubator/qpid/trunk/qpid/java/distribution/src/main/assembly/bin.xml Tue Jul 31 08:53:37 2007
@@ -27,38 +27,38 @@
</formats>
<fileSets>
+ <!-- Include the currently hardwired Apache Legal bits -->
<fileSet>
- <directory>src/main/release</directory>
+ <directory>../resources</directory>
<outputDirectory>qpid-${qpid.version}</outputDirectory>
<includes>
<include>DISCLAIMER</include>
- <include>LICENSE.txt</include>
- <include>NOTICE.txt</include>
- <include>README.txt</include>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ <include>README</include>
</includes>
+ <fileMode>0444</fileMode>
</fileSet>
+
+ <!-- Include any release information -->
<fileSet>
- <directory>..</directory>
+ <directory>src/main/release</directory>
<outputDirectory>qpid-${qpid.version}</outputDirectory>
- <includes>
- <include>*.txt</include>
- </includes>
</fileSet>
+
+ <!-- Include any release information -->
<fileSet>
- <directory>src/main/release/etc</directory>
- <outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
- <includes>
- <include>logging.properties</include>
- <include>log4j.properties</include>
- </includes>
+ <directory>..//release-docs</directory>
+ <outputDirectory>qpid-${qpid.version}</outputDirectory>
</fileSet>
+
+ <!-- Include any release information -->
<fileSet>
- <directory>src/main/release/docs</directory>
- <outputDirectory>qpid-${qpid.version}/docs</outputDirectory>
- <includes>
- <include>RELEASE_NOTES.txt</include>
- </includes>
+ <directory>../release-docs</directory>
+ <outputDirectory>qpid-${qpid.version}</outputDirectory>
</fileSet>
+
+ <!-- Include the classpath jar qpid-incubating.jar -->
<fileSet>
<directory>target</directory>
<outputDirectory>qpid-${qpid.version}/lib</outputDirectory>
@@ -66,131 +66,41 @@
<include>qpid-incubating.jar</include>
</includes>
</fileSet>
- </fileSets>
- <files>
- <!-- due to a bug in the assembly 2.1 plugin (MASSEMBLY-153) you have
- to use octal numbers to specify fileMode note not valid in 2.2 assembly plugin -->
- <file>
- <source>../common/etc/qpid-run.conf</source>
- <outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
- <destName>qpid-run.conf</destName>
- <fileMode>420</fileMode>
- </file>
- <file>
- <source>../broker/etc/config.xml</source>
- <outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
- <destName>config.xml</destName>
- <fileMode>420</fileMode>
- </file>
- <file>
- <source>../broker/etc/jmxremote.access</source>
- <outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
- <destName>jmxremote.access</destName>
- <fileMode>420</fileMode>
- </file>
- <file>
- <source>../broker/etc/transient_config.xml</source>
- <outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
- <destName>transient_config.xml</destName>
- <fileMode>420</fileMode>
- </file>
- <file>
- <source>../broker/etc/persistent_config.xml</source>
- <outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
- <destName>persistent_config.xml</destName>
- <fileMode>420</fileMode>
- </file>
- <file>
- <source>../broker/etc/log4j.xml</source>
- <outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
- <destName>log4j.xml</destName>
- <fileMode>420</fileMode>
- </file>
- <file>
- <source>../broker/etc/passwd</source>
- <outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
- <destName>passwd</destName>
- <fileMode>420</fileMode>
- </file>
- <file>
- <source>../broker/etc/passwdVhost</source>
- <outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
- <destName>passwdVhost</destName>
- <fileMode>420</fileMode>
- </file>
- <file>
- <source>../broker/etc/qpid-server.conf</source>
+
+ <!-- Include etc -->
+ <fileSet>
+ <directory>../common/etc</directory>
<outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
- <destName>qpid-server.conf</destName>
- <fileMode>420</fileMode>
- </file>
- <file>
- <source>../broker/etc/virtualhosts.xml</source>
+ <fileMode>0640</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>../broker/etc</directory>
<outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
- <destName>virtualhosts.xml</destName>
- <fileMode>420</fileMode>
- </file>
- <file>
- <source>../broker/bin/qpid.start</source>
- <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
- <destName>qpid.start</destName>
- <fileMode>493</fileMode>
- </file>
- <file>
- <source>../broker/bin/qpid.stop</source>
- <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
- <destName>qpid.stop</destName>
- <fileMode>493</fileMode>
- </file>
- <file>
- <source>../broker/bin/qpid.stopall</source>
- <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
- <destName>qpid.stopall</destName>
- <fileMode>493</fileMode>
- </file>
- <file>
- <source>../common/bin/qpid-run</source>
- <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
- <destName>qpid-run</destName>
- <fileMode>493</fileMode>
- </file>
- <file>
- <source>../broker/bin/qpid-server</source>
- <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
- <destName>qpid-server</destName>
- <fileMode>493</fileMode>
- </file>
- <file>
- <source>../broker/bin/qpid-server.bat</source>
- <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
- <destName>qpid-server.bat</destName>
- <fileMode>493</fileMode>
- </file>
- <file>
- <source>../broker/bin/run.bat</source>
- <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
- <destName>run.bat</destName>
- <fileMode>493</fileMode>
- </file>
- <file>
- <source>../broker/bin/run.sh</source>
+ <fileMode>0640</fileMode>
+ </fileSet>
+
+ <!-- Include bin scripts-->
+ <fileSet>
+ <directory>../broker/bin</directory>
<outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
- <destName>run.sh</destName>
- <fileMode>493</fileMode>
- </file>
- <file>
- <source>../broker/bin/runAll</source>
+ <fileMode>0750</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>../common/bin</directory>
<outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
- <destName>runAll</destName>
- <fileMode>493</fileMode>
- </file>
- </files>
+ <fileMode>0750</fileMode>
+ </fileSet>
+
+ </fileSets>
+
<dependencySets>
<dependencySet>
<outputDirectory>qpid-${qpid.version}/lib</outputDirectory>
<unpack>false</unpack>
<excludes>
+ <!-- Exclude the jar output of this build process -->
<exclude>org.apache.qpid:qpid-distribution</exclude>
+ <!-- Exclude the Console dependancies -->
<exclude>org.apache.qpid.management:org.apache.qpid.management.ui</exclude>
<exclude>org.eclipse.core:org.eclipse.core.commands</exclude>
<exclude>org.eclipse.core:org.eclipse.core.contenttype</exclude>
Modified: incubator/qpid/trunk/qpid/java/distribution/src/main/assembly/management-eclipse-plugin-unix.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/distribution/src/main/assembly/management-eclipse-plugin-unix.xml?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/java/distribution/src/main/assembly/management-eclipse-plugin-unix.xml (original)
+++ incubator/qpid/trunk/qpid/java/distribution/src/main/assembly/management-eclipse-plugin-unix.xml Tue Jul 31 08:53:37 2007
@@ -38,13 +38,21 @@
</moduleSets>
-->
<fileSets>
+
+
+ <!-- Include the currently hardwired Apache Legal bits -->
<fileSet>
- <directory>src/main/release</directory>
- <outputDirectory>qpidmc</outputDirectory>
+ <directory>../resources</directory>
+ <outputDirectory>qpid-${qpid.version}</outputDirectory>
<includes>
- <include>DISCLAIMER</include>
+ <include>DISCLAIMER</include>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ <include>README</include>
</includes>
+ <fileMode>0444</fileMode>
</fileSet>
+
<fileSet>
<directory>..</directory>
<outputDirectory>qpidmc</outputDirectory>
@@ -52,20 +60,23 @@
<include>*.txt</include>
</includes>
</fileSet>
+
<fileSet>
- <directory>src/main/release/docs</directory>
- <outputDirectory>qpidmc/docs</outputDirectory>
- <includes>
- <include>RELEASE_NOTES.txt</include>
- </includes>
+ <directory>src/main/release</directory>
+ <outputDirectory>qpidmc</outputDirectory>
</fileSet>
+
+ <!-- Include any release information -->
+ <fileSet>
+ <directory>../release-docs</directory>
+ <outputDirectory>qpidmc</outputDirectory>
+ </fileSet>
+
<fileSet>
<directory>../management/eclipse-plugin/src/main/resources/unix/configuration</directory>
<outputDirectory>qpidmc/configuration</outputDirectory>
- <includes>
- <include>**</include>
- </includes>
</fileSet>
+
<fileSet>
<directory>../management/eclipse-plugin/src/main/resources</directory>
<outputDirectory>qpidmc</outputDirectory>
@@ -73,6 +84,7 @@
<include>license.eclipse.txt</include>
</includes>
</fileSet>
+
<fileSet>
<directory>../management/eclipse-plugin</directory>
<outputDirectory>qpidmc</outputDirectory>
@@ -80,13 +92,14 @@
<include>README.txt</include>
</includes>
</fileSet>
+
<fileSet>
<directory>../management/eclipse-plugin/bin</directory>
<outputDirectory>qpidmc/bin</outputDirectory>
<includes>
<include>qpidmc*.sh</include>
</includes>
- <fileMode>777</fileMode>
+ <fileMode>0777</fileMode>
</fileSet>
</fileSets>
@@ -100,7 +113,7 @@
</includes>
<scope>runtime</scope>
</dependencySet>
-
+
<dependencySet>
<outputDirectory>qpidmc/eclipse/plugins</outputDirectory>
<outputFileNameMapping>${artifactId}_${version}.${extension}</outputFileNameMapping>
Modified: incubator/qpid/trunk/qpid/java/distribution/src/main/assembly/management-eclipse-plugin.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/distribution/src/main/assembly/management-eclipse-plugin.xml?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/java/distribution/src/main/assembly/management-eclipse-plugin.xml (original)
+++ incubator/qpid/trunk/qpid/java/distribution/src/main/assembly/management-eclipse-plugin.xml Tue Jul 31 08:53:37 2007
@@ -24,55 +24,55 @@
<formats>
<format>zip</format>
</formats>
-<!--
- <moduleSets>
- <moduleSet>
- <includes>
- <include>org.apache.qpid.management:org.apache.qpid.management.ui</include>
- </includes>
- <binaries>
- <includeDependencies>true</includeDependencies>
- <unpack>false</unpack>
- </binaries>
- </moduleSet>
- </moduleSets>
- -->
+
<fileSets>
+
+ <!-- Include the currently hardwired Apache Legal bits -->
<fileSet>
- <directory>src/main/release</directory>
+ <directory>../resources</directory>
<outputDirectory>qpidmc</outputDirectory>
<includes>
- <include>DISCLAIMER</include>
+ <include>DISCLAIMER</include>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ <include>README</include>
</includes>
+ <fileMode>0444</fileMode>
</fileSet>
+
<fileSet>
- <directory>..</directory>
+ <directory>src/main/release</directory>
<outputDirectory>qpidmc</outputDirectory>
- <includes>
- <include>*.txt</include>
- </includes>
</fileSet>
+
+ <!-- Include any release information -->
+ <fileSet>
+ <directory>../release-docs</directory>
+ <outputDirectory>qpidmc</outputDirectory>
+ </fileSet>
+
+
<fileSet>
- <directory>src/main/release/docs</directory>
- <outputDirectory>qpidmc/docs</outputDirectory>
+ <directory>..</directory>
+ <outputDirectory>qpidmc</outputDirectory>
<includes>
- <include>RELEASE_NOTES.txt</include>
+ <include>*.txt</include>
</includes>
</fileSet>
+
<fileSet>
<directory>../management/eclipse-plugin/src/main/resources/win32/configuration</directory>
<outputDirectory>qpidmc/configuration</outputDirectory>
- <includes>
- <include>**</include>
- </includes>
</fileSet>
+
<fileSet>
<directory>../management/eclipse-plugin/src/main/resources</directory>
<outputDirectory>qpidmc/eclipse</outputDirectory>
<includes>
<include>*.*</include>
- </includes>
+ </includes>
</fileSet>
+
<fileSet>
<directory>../management/eclipse-plugin</directory>
<outputDirectory>qpidmc</outputDirectory>
@@ -80,14 +80,20 @@
<include>README.txt</include>
</includes>
</fileSet>
+
<fileSet>
<directory>../management/eclipse-plugin/bin</directory>
<outputDirectory>qpidmc/bin</outputDirectory>
- <includes>
- <include>**</include>
- </includes>
- <fileMode>777</fileMode>
+ <excludes>
+ <!-- Exclude the Unix scripts -->
+ <exclude>qpidmc*.sh</exclude>
+ </excludes>
+ <fileMode>0777</fileMode>
</fileSet>
+
+ <!-- Required to make eclipse load the JMXRemote SASL pluging -->
+ <!-- This should be removed as JMXRemote SASL module is not ASF license friendly -->
+ <!-- However management console doesn't seem to work without it -->
<fileSet>
<directory>../management/eclipse-plugin/src/main/resources/sasl</directory>
<outputDirectory>qpidmc/eclipse/plugins/jmxremote.sasl_1.0.1/META-INF</outputDirectory>
@@ -107,7 +113,7 @@
<exclude>org.apache.qpid:qpid-common</exclude>
<exclude>org.apache.qpid:qpid-broker</exclude>
<exclude>org.apache.qpid:qpid-client</exclude>
- <exclude>commons-cli:commons-cli</exclude>
+ <exclude>commons-cli:commons-cli</exclude>
<exclude>commons-configuration:commons-configuration</exclude>
<exclude>commons-lang:commons-lang</exclude>
<exclude>org.apache.mina:mina-filter-ssl</exclude>
Modified: incubator/qpid/trunk/qpid/java/distribution/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/distribution/src/main/assembly/src.xml?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/java/distribution/src/main/assembly/src.xml (original)
+++ incubator/qpid/trunk/qpid/java/distribution/src/main/assembly/src.xml Tue Jul 31 08:53:37 2007
@@ -27,24 +27,31 @@
</formats>
<fileSets>
- <fileSet>
- <directory>src/main/release</directory>
+ <fileSet>
+ <directory>../resources</directory>
<outputDirectory>qpid-${qpid.version}-src</outputDirectory>
<includes>
- <include>DISCLAIMER</include>
- <include>LICENSE.txt</include>
- <include>licenses/*.*</include>
- <include>NOTICE.txt</include>
- <include>README.txt</include>
- <include>BUILDING.txt</include>
+ <include>DISCLAIMER</include>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ <include>README</include>
</includes>
</fileSet>
+
+ <fileSet>
+ <directory>src/main/release</directory>
+ <outputDirectory>qpid-${qpid.version}-src</outputDirectory>
+ </fileSet>
+
+ <!-- Include any release information -->
+ <fileSet>
+ <directory>../release-docs</directory>
+ <outputDirectory>qpid-${qpid.version}-src</outputDirectory>
+ </fileSet>
+
<fileSet>
<directory>..</directory>
<outputDirectory>qpid-${qpid.version}-src/java</outputDirectory>
- <includes>
- <include>**/*</include>
- </includes>
<excludes>
<exclude>build.xml</exclude>
<exclude>distribution/build.xml</exclude>
@@ -71,24 +78,29 @@
<exclude>**/eclipse-plugin/src/main/resources/**</exclude>
</excludes>
</fileSet>
+
<fileSet>
<directory>../../gentools</directory>
<outputDirectory>qpid-${qpid.version}-src/gentools</outputDirectory>
- <includes>
- <include>**/*</include>
- </includes>
<excludes>
<exclude>**/build</exclude>
<exclude>**/build/**/*</exclude>
<exclude>**/*.class</exclude>
</excludes>
</fileSet>
+
<fileSet>
<directory>../../specs</directory>
<outputDirectory>qpid-${qpid.version}-src/specs</outputDirectory>
<includes>
- <include>**/*</include>
+ <include>amqp.0-8.xml</include>
+ <include>cluster.0-8.xml</include>
</includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>../../python</directory>
+ <outputDirectory>qpid-${qpid.version}-src/python</outputDirectory>
</fileSet>
</fileSets>
</assembly>
Modified: incubator/qpid/trunk/qpid/java/etc/coding_standards.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/etc/coding_standards.xml?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/java/etc/coding_standards.xml (original)
+++ incubator/qpid/trunk/qpid/java/etc/coding_standards.xml Tue Jul 31 08:53:37 2007
@@ -1,8 +1,9 @@
<?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="PackageHtml"/> -->
<module name="TreeWalker">
Modified: incubator/qpid/trunk/qpid/java/integrationtests/docs/RunningSustainedTests.txt
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/integrationtests/docs/RunningSustainedTests.txt?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/java/integrationtests/docs/RunningSustainedTests.txt (original)
+++ incubator/qpid/trunk/qpid/java/integrationtests/docs/RunningSustainedTests.txt Tue Jul 31 08:53:37 2007
@@ -1,15 +1,17 @@
In addition to the integration tests the framework provided by this package also allows for
sustained tests to be run. Currently avaible tests:
-- org.apache.qpid.sustained.SustainedTestClient : Pub Sub test to determine steady state throughput.
+- org.apache.qpid.sustained.SustainedClientTestCase : Pub Sub test to determine steady state throughput.
Running Tests.
Run the tests as per the integration tests.
- - Start a broker
- - Start at least one Client [java org.apache.qpid.sustained.TestClient], ensuring unique naming
- - Start Test Controller [java org.apache.qpid.sustained.TestCoordinator]
- - Additional Test clients can be started:
- [java org.apache.qpid.sustained.TestClient -j org.apache.qpid.sustained.SustainedTestClient]
+- Start a broker
+- Start at least one test client [java org.apache.qpid.interop.TestClient], ensuring unique naming.
+
+- Start the test coordinator with the 'fanout' engine, on the sustained test case [java org.apache.qpid.test.framework.distributedtesting.Coordinator]
+
+- Additional Test clients can be started and joined into the running test: [java org.apache.qpid.interop.TestClient -j]
+
Modified: incubator/qpid/trunk/qpid/java/integrationtests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/integrationtests/pom.xml?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/java/integrationtests/pom.xml (original)
+++ incubator/qpid/trunk/qpid/java/integrationtests/pom.xml Tue Jul 31 08:53:37 2007
@@ -40,10 +40,14 @@
<dependencies>
- <!-- These tests depend on the client API only. -->
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-client</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.qpid</groupId>
+ <artifactId>qpid-systests</artifactId>
</dependency>
<dependency>
Modified: incubator/qpid/trunk/qpid/java/integrationtests/src/main/java/org/apache/qpid/sustained/SustainedTestClient.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/integrationtests/src/main/java/org/apache/qpid/sustained/SustainedTestClient.java?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/java/integrationtests/src/main/java/org/apache/qpid/sustained/SustainedTestClient.java (original)
+++ incubator/qpid/trunk/qpid/java/integrationtests/src/main/java/org/apache/qpid/sustained/SustainedTestClient.java Tue Jul 31 08:53:37 2007
@@ -425,7 +425,7 @@
class SustainedRateAdapter implements MessageListener, Runnable
{
private SustainedTestClient _client;
- private long _batchVariance = 3; //no. batches to allow drifting
+ private long _batchVariance = Integer.getInteger("batchVariance", 3); //no. batches to allow drifting
private long _timeVariance = TEN_MILLI_SEC * 5; // no. nanos between send and report delay (10ms)
private volatile long _delay; //in nanos
private long _sent;
@@ -434,9 +434,11 @@
private static final long NO_CLIENT_SLEEP = 1000; // 1s
private volatile boolean NO_CLIENTS = true;
private int _delayShifting;
- private static final int REPORTS_WITHOUT_CHANGE = 5;
+ private final int REPORTS_WITHOUT_CHANGE = Integer.getInteger("stableReportCount", 5);
private boolean _warmedup = false;
private static final long EXPECTED_TIME_PER_BATCH = 100000L;
+ private int _warmUpBatches = Integer.getInteger("warmUpBatches", 10);
+
SustainedRateAdapter(SustainedTestClient client)
{
@@ -492,8 +494,6 @@
}
CountDownLatch _warmup = new CountDownLatch(1);
-
- int _warmUpBatches = Integer.getInteger("warmUpBatches", 10);
int _numBatches = 10000;
Modified: incubator/qpid/trunk/qpid/java/management/eclipse-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/eclipse-plugin/pom.xml?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/java/management/eclipse-plugin/pom.xml (original)
+++ incubator/qpid/trunk/qpid/java/management/eclipse-plugin/pom.xml Tue Jul 31 08:53:37 2007
@@ -15,7 +15,7 @@
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">
@@ -38,17 +38,17 @@
</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>
@@ -197,43 +197,46 @@
<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>
+ -->
+ <!-- This is required to identify the JAR to eclipse as a 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>
<artifactId>maven-surefire-plugin</artifactId>
Modified: incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ManagementConsoleTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ManagementConsoleTest.java?view=diff&rev=561365&r1=561364&r2=561365
==============================================================================
--- incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ManagementConsoleTest.java (original)
+++ incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ManagementConsoleTest.java Tue Jul 31 08:53:37 2007
@@ -1,17 +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
+ * 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
+ * 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.management.ui;