QPID-2498: Changes from ebourg added

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/grkvlt-network-20101013@1024143 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 38 insertions, 57 deletions

diff --git a/qpid/java/client/example/bin/set_classpath.bat b/qpid/java/client/example/bin/set_classpath.bat
index d528967024..862e8e467a 100644
--- a/qpid/java/client/example/bin/set_classpath.bat
+++ b/qpid/java/client/example/bin/set_classpath.bat
@@ -27,7 +27,6 @@ set QPIDLIB=%QPID_HOME%\lib
 

 if "%CLASSPATH%" == "" GOTO ERROR_CLASSPATH

 

-set CLASSPATH=%CLASSPATH%;%QPIDLIB%\backport-util-concurrent-2.2.jar

 set CLASSPATH=%CLASSPATH%;%QPIDLIB%\geronimo-jms_1.1_spec-1.0.jar

 set CLASSPATH=%CLASSPATH%;%QPIDLIB%\commons-collections-3.1.jar

 set CLASSPATH=%CLASSPATH%;%QPIDLIB%\commons-configuration-1.2.jar

@@ -36,8 +35,8 @@ set CLASSPATH=%CLASSPATH%;%QPIDLIB%\commons-lang-2.1.jar
 set CLASSPATH=%CLASSPATH%;%QPIDLIB%\commons-logging-api-1.0.4.jar

 set CLASSPATH=%CLASSPATH%;%QPIDLIB%\commons-logging-1.0.jar

 set CLASSPATH=%CLASSPATH%;%QPIDLIB%\log4j-1.2.12.jar

-set CLASSPATH=%CLASSPATH%;%QPIDLIB%\mina-core-1.0.0.jar

-set CLASSPATH=%CLASSPATH%;%QPIDLIB%\mina-filter-ssl-1.0.0.jar

+set CLASSPATH=%CLASSPATH%;%QPIDLIB%\mina-core-1.1.7.jar

+set CLASSPATH=%CLASSPATH%;%QPIDLIB%\mina-filter-ssl-1.1.7.jar

 set CLASSPATH=%CLASSPATH%;%QPIDLIB%\mina-java5-1.0.0.jar

 set CLASSPATH=%CLASSPATH%;%QPIDLIB%\slf4j-simple-1.0.jar

 

diff --git a/qpid/java/client/example/bin/set_classpath.sh b/qpid/java/client/example/bin/set_classpath.sh
index 89e9bc8242..a4f1b93625 100755
--- a/qpid/java/client/example/bin/set_classpath.sh
+++ b/qpid/java/client/example/bin/set_classpath.sh
@@ -50,7 +50,6 @@ fi
 if $cygwin; then
     SEP=";"
     CLASSPATH=`cygpath -w $CLASSPATH`
-    CLASSPATH=$CLASSPATH$SEP`cygpath -w $QPIDLIB/backport-util-concurrent-2.2.jar`
     CLASSPATH=$CLASSPATH$SEP`cygpath -w $QPIDLIB/geronimo-jms_1.1_spec-1.0.jar`
     CLASSPATH=$CLASSPATH$SEP`cygpath -w $QPIDLIB/commons-collections-3.1.jar`
     CLASSPATH=$CLASSPATH$SEP`cygpath -w $QPIDLIB/commons-configuration-1.2.jar`
@@ -59,8 +58,8 @@ if $cygwin; then
     CLASSPATH=$CLASSPATH$SEP`cygpath -w $QPIDLIB/commons-logging-api-1.0.4.jar`
     CLASSPATH=$CLASSPATH$SEP`cygpath -w $QPIDLIB/commons-logging-1.0.jar`
     CLASSPATH=$CLASSPATH$SEP`cygpath -w $QPIDLIB/log4j-1.2.12.jar`
-    CLASSPATH=$CLASSPATH$SEP`cygpath -w $QPIDLIB/mina-core-1.0.0.jar`
-    CLASSPATH=$CLASSPATH$SEP`cygpath -w $QPIDLIB/mina-filter-ssl-1.0.0.jar`
+    CLASSPATH=$CLASSPATH$SEP`cygpath -w $QPIDLIB/mina-core-1.1.7.jar`
+    CLASSPATH=$CLASSPATH$SEP`cygpath -w $QPIDLIB/mina-filter-ssl-1.1.7.jar`
     CLASSPATH=$CLASSPATH$SEP`cygpath -w $QPIDLIB/mina-java5-1.0.0.jar`
     CLASSPATH=$CLASSPATH$SEP`cygpath -w $QPIDLIB/slf4j-simple-1.0.jar`
     export CLASSPATH
diff --git a/qpid/java/lib/poms/backport-util-concurrent-2.2.pom b/qpid/java/lib/poms/backport-util-concurrent-2.2.pom
deleted file mode 100644
index ea281da344..0000000000
--- a/qpid/java/lib/poms/backport-util-concurrent-2.2.pom
+++ /dev/null
@@ -1,25 +0,0 @@
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>backport-util-concurrent</groupId>
-    <artifactId>backport-util-concurrent</artifactId>
-    <version>2.2</version>
-    <packaging>jar</packaging>
-    <name>Backport of JSR 166</name>
-    <url>http://www.mathcs.emory.edu/dcl/util/backport-util-concurrent/</url>
-    <description>Dawid Kurzyniec's backport of JSR 166</description>
-    <licenses>
-        <license>
-            <name>Public Domain</name>
-            <url>http://creativecommons.org/licenses/publicdomain</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-    <scm>
-        <url>http://dcl.mathcs.emory.edu/cgi-bin/viewcvs.cgi/software/util/backport-util-concurrent/</url>
-    </scm>
-    <organization>
-        <name>Dawid Kurzyniec</name>
-        <url>http://www.mathcs.emory.edu/~dawidk/</url>
-    </organization>
-    <dependencies/>
-</project>
diff --git a/qpid/java/lib/poms/mina-core-1.0.1.pom b/qpid/java/lib/poms/mina-core-1.1.7.pom
index def70418c9..163d6e2bb8 100644
--- a/qpid/java/lib/poms/mina-core-1.0.1.pom
+++ b/qpid/java/lib/poms/mina-core-1.1.7.pom
@@ -1,34 +1,38 @@
-<?xml version="1.0" encoding="ISO-8859-1"?><project>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<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>
   <parent>
-    <artifactId>build</artifactId>
     <groupId>org.apache.mina</groupId>
-    <version>1.0.1</version>
+    <artifactId>build</artifactId>
+    <version>1.1.7</version>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
   <artifactId>mina-core</artifactId>
   <name>Apache MINA Core API</name>
-  <version>1.0.1</version>
+  <packaging>jar</packaging>
+
   <dependencies>
+
     <dependency>
       <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-simple</artifactId>
-      <version>1.0</version>
-      <scope>provided</scope>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.4.3</version>
+      <scope>compile</scope>
     </dependency>
+
     <dependency>
-      <groupId>backport-util-concurrent</groupId>
-      <artifactId>backport-util-concurrent</artifactId>
-      <version>2.2</version>
-      <scope>compile</scope>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <version>1.4.3</version>
+      <scope>test</scope>
     </dependency>
+
     <dependency>
       <groupId>easymock</groupId>
       <artifactId>easymock</artifactId>
       <version>1.2_Java1.3</version>
       <scope>test</scope>
     </dependency>
+
   </dependencies>
-  <distributionManagement>
-    <status>deployed</status>
-  </distributionManagement>
+
 </project>
\ No newline at end of file
diff --git a/qpid/java/lib/poms/mina-filter-ssl-1.0.1.pom b/qpid/java/lib/poms/mina-filter-ssl-1.1.7.pom
index 1d5a1ec18c..77d62b432f 100644
--- a/qpid/java/lib/poms/mina-filter-ssl-1.0.1.pom
+++ b/qpid/java/lib/poms/mina-filter-ssl-1.1.7.pom
@@ -1,27 +1,31 @@
-<?xml version="1.0" encoding="ISO-8859-1"?><project>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<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>
   <parent>
-    <artifactId>build</artifactId>
     <groupId>org.apache.mina</groupId>
-    <version>1.0.1</version>
+    <artifactId>build</artifactId>
+    <version>1.1.7</version>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
   <artifactId>mina-filter-ssl</artifactId>
   <name>Apache MINA SSL Filter</name>
-  <version>1.0.1</version>
+  <packaging>jar</packaging>  
+
   <dependencies>
+
     <dependency>
       <groupId>org.apache.mina</groupId>
       <artifactId>mina-core</artifactId>
-      <version>1.0.1</version>
+      <version>${pom.version}</version>
+      <scope>compile</scope>
     </dependency>
+
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
-      <version>1.0</version>
-      <scope>provided</scope>
+      <version>1.4.3</version>
+      <scope>test</scope>
     </dependency>
+
   </dependencies>
-  <distributionManagement>
-    <status>deployed</status>
-  </distributionManagement>
+
 </project>
\ No newline at end of file