summaryrefslogtreecommitdiff
path: root/java/common
diff options
context:
space:
mode:
Diffstat (limited to 'java/common')
-rw-r--r--java/common/pom.xml24
-rw-r--r--java/common/src/main/java/org/apache/qpid/url/URLHelper.java8
-rw-r--r--java/common/src/main/java/org/apache/qpid/url/URLSyntaxException.java4
-rw-r--r--java/common/src/main/xsl/java.xsl2
4 files changed, 8 insertions, 30 deletions
diff --git a/java/common/pom.xml b/java/common/pom.xml
index 0d48a24646..e655054453 100644
--- a/java/common/pom.xml
+++ b/java/common/pom.xml
@@ -46,7 +46,7 @@
</properties>
<build>
- <plugins>
+ <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
@@ -77,19 +77,6 @@
</plugins>
</build>
- <repositories>
- <repository>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <id>java.net repository</id>
- <name>Maven 1.x Repository</name>
- <url>httsp://maven-repository.dev.java.net/nonav/repository/</url>
- <layout>legacy</layout>
- </repository>
-
-
- </repositories>
<dependencies>
<dependency>
<groupId>log4j</groupId>
@@ -99,16 +86,7 @@
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
</dependency>
- <!-- dependency>
- <groupId>grizzly</groupId>
- <artifactId>grizzly</artifactId>
- <version>1.0.4</version>
- </dependency -->
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
diff --git a/java/common/src/main/java/org/apache/qpid/url/URLHelper.java b/java/common/src/main/java/org/apache/qpid/url/URLHelper.java
index f8c621e413..2121346c02 100644
--- a/java/common/src/main/java/org/apache/qpid/url/URLHelper.java
+++ b/java/common/src/main/java/org/apache/qpid/url/URLHelper.java
@@ -64,9 +64,9 @@ public class URLHelper
if (valueIndex + 1 < options.length())
{
if (options.charAt(valueIndex + 1) == DEFAULT_OPTION_SEPERATOR ||
- options.charAt(valueIndex + 1) == ALTERNATIVE_OPTION_SEPARATOR ||
- options.charAt(valueIndex + 1) == BROKER_SEPARATOR ||
- options.charAt(valueIndex + 1) == '\'')
+ options.charAt(valueIndex + 1) == ALTERNATIVE_OPTION_SEPARATOR ||
+ options.charAt(valueIndex + 1) == BROKER_SEPARATOR ||
+ options.charAt(valueIndex + 1) == '\'')
{
nestedQuotes--;
// System.out.println(
@@ -119,7 +119,7 @@ public class URLHelper
else
{
parseError(sepIndex, "Unterminated option. Possible illegal option separator:'" +
- options.charAt(sepIndex) + "'", options);
+ options.charAt(sepIndex) + "'", options);
}
}
diff --git a/java/common/src/main/java/org/apache/qpid/url/URLSyntaxException.java b/java/common/src/main/java/org/apache/qpid/url/URLSyntaxException.java
index 5cac2505a8..3ff7195794 100644
--- a/java/common/src/main/java/org/apache/qpid/url/URLSyntaxException.java
+++ b/java/common/src/main/java/org/apache/qpid/url/URLSyntaxException.java
@@ -62,12 +62,12 @@ public class URLSyntaxException extends URISyntaxException
if (getIndex() > -1)
{
- if (_length > 1)
+ if (_length != -1)
{
sb.append(" between indicies ");
sb.append(getIndex());
sb.append(" and ");
- sb.append(getIndex() + _length);
+ sb.append(_length);
}
else
{
diff --git a/java/common/src/main/xsl/java.xsl b/java/common/src/main/xsl/java.xsl
index e98370fd7b..685a9a27ed 100644
--- a/java/common/src/main/xsl/java.xsl
+++ b/java/common/src/main/xsl/java.xsl
@@ -69,7 +69,7 @@ import org.apache.qpid.framing.EncodableAMQDataBlock;
import org.apache.qpid.framing.EncodingUtils;
import org.apache.qpid.framing.FieldTable;
- /**
+/**
* This class is autogenerated, do not modify. [From <xsl:value-of select="$f/parent::frames/@protocol"/>]
*/
public class <xsl:value-of select="$f/@name"/> extends AMQMethodBody implements EncodableAMQDataBlock