qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kgiu...@apache.org
Subject svn commit: r1333027 [12/13] - in /qpid/branches/qpid-3767/qpid: ./ cpp/ cpp/bindings/ cpp/bindings/qmf/ruby/ cpp/bindings/qpid/python/ cpp/bindings/qpid/ruby/ cpp/bindings/qpid/ruby/features/step_definitions/ cpp/bindings/qpid/ruby/lib/qpid/ cpp/docs/...
Date Wed, 02 May 2012 13:10:03 GMT
Modified: qpid/branches/qpid-3767/qpid/java/jca/example/.gitignore
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/jca/example/.gitignore?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/jca/example/.gitignore (original)
+++ qpid/branches/qpid-3767/qpid/java/jca/example/.gitignore Wed May  2 13:09:18 2012
@@ -1,3 +1,23 @@
+#
+# 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.
+#
+
 build/*
 lib/*
+*.swp
 build-properties.xml

Modified: qpid/branches/qpid-3767/qpid/java/jca/example/build-geronimo-properties.xml
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/jca/example/build-geronimo-properties.xml?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/jca/example/build-geronimo-properties.xml (original)
+++ qpid/branches/qpid-3767/qpid/java/jca/example/build-geronimo-properties.xml Wed May  2 13:09:18 2012
@@ -22,10 +22,19 @@
 
     <property name="jndi.scheme" value="name"/>
 
-    <!--
-    <property name="qpid.xacf.jndi.name" value="jca:/qpid.jca/QpidJCAAdapter/JCAManagedConnectionFactory/QpidJMSXA"/>
-    -->
     <property name="qpid.xacf.jndi.name" value="QpidJMSXA"/>
+
+    <property name="jndi.prefix" value="jca:/qpid.jca/QpidJCAAdapter/JCAAdminObject/"/>
+
+
+    <property name="qpid.hello.queue.jndi.name" value="HelloQueue"/>
+    <property name="qpid.goodbye.queue.jndi.name" value="GoodByeQueue"/>
+    <property name="qpid.hello.topic.jndi.name" value="HelloTopic"/>
+    <property name="qpid.goodbye.topic.jndi.name" value="GoodByeTopic"/>
+    <property name="qpid.request.queue.jndi.name" value="RequestQueue"/>
+    <property name="qpid.response.queue.jndi.name" value="ResponseQueue"/>
+
+    <!--
     <property name="qpid.cf.jndi.name" value="jca:/qpid.jca/QpidJCAAdapter/JCAAdminObject/QpidConnectionFactory"/>
     <property name="qpid.hello.queue.jndi.name" value="jca:/qpid.jca/QpidJCAAdapter/JCAAdminObject/HelloQueue"/>
     <property name="qpid.goodbye.queue.jndi.name" value="jca:/qpid.jca/QpidJCAAdapter/JCAAdminObject/GoodByeQueue"/>
@@ -33,9 +42,11 @@
     <property name="qpid.goodbye.topic.jndi.name" value="jca:/qpid.jca/QpidJCAAdapter/JCAAdminObject/GoodByeTopic"/>
     <property name="qpid.request.queue.jndi.name" value="jca:/qpid.jca/QpidJCAAdapter/JCAAdminObject/RequestQueue"/>
     <property name="qpid.response.queue.jndi.name" value="jca:/qpid.jca/QpidJCAAdapter/JCAAdminObject/ResponseQueue"/>
-
+    -->
     <property name="qpid.ejb.jndi.name" value="name=&quot;QpidTestEJB&quot;"/>
     <property name="qpid.ejb.name" value="QpidTestBeanRemote"/>
+    <property name="qpid.client.cf.jndi.name" value="${jndi.prefix}/QpidConnectionFactory"/>
+    <property name="qpid.client.dest.jndi.name" value="${jndi.prefix}/${qpid.hello.queue.jndi.name}"/>
 
     <property name="jndi.context" value="org.openejb.client.RemoteInitialContextFactory"/>
     <property name="server.host" value="ejbd://localhost:4201"/>

Modified: qpid/branches/qpid-3767/qpid/java/jca/example/build-jboss-properties.xml
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/jca/example/build-jboss-properties.xml?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/jca/example/build-jboss-properties.xml (original)
+++ qpid/branches/qpid-3767/qpid/java/jca/example/build-jboss-properties.xml Wed May  2 13:09:18 2012
@@ -21,6 +21,7 @@
 <project name="qpid-jca-example-jboss-properties" basedir="." default="">
 
     <property name="jndi.scheme" value="mappedName"/>
+    <property name="jndi.prefix" value=""/>
 
     <property name="qpid.xacf.jndi.name" value="java:QpidJMSXA"/>
     <property name="qpid.cf.jndi.name" value="QpidConnectionFactory"/>
@@ -29,9 +30,12 @@
     <property name="qpid.hello.queue.jndi.name" value="HelloQueue"/>
     <property name="qpid.goodbye.queue.jndi.name" value="GoodByeQueue"/>
     <property name="qpid.request.queue.jndi.name" value="QpidRequestQueue"/>
+    <property name="qpid.response.queue.jndi.name" value="QpidResponseQueue"/>
     <property name="qpid.ejb.jndi.name" value="mappedName=&quot;QpidTestEJB&quot;"/>
     <property name="qpid.ejb.ref.name" value="QpidTestBean/local"/>
     <property name="qpid.ejb.name" value="qpid-jcaex/QpidTestBean/remote"/>
+    <property name="qpid.client.cf.jndi.name" value="${jndi.prefix}/QpidConnectionFactory"/>
+    <property name="qpid.client.dest.jndi.name" value="${jndi.prefix}/${qpid.hello.queue.jndi.name}"/>
 
     <property name="jndi.context" value="org.jnp.interfaces.NamingContextFactory"/>
     <property name="server.host" value="jnp://localhost:1099"/>

Modified: qpid/branches/qpid-3767/qpid/java/jca/example/build-jboss7-properties.xml
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/jca/example/build-jboss7-properties.xml?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/jca/example/build-jboss7-properties.xml (original)
+++ qpid/branches/qpid-3767/qpid/java/jca/example/build-jboss7-properties.xml Wed May  2 13:09:18 2012
@@ -21,20 +21,25 @@
 <project name="qpid-jca-example-jboss7-properties" basedir="." default="">
 
     <property name="jndi.scheme" value="name"/>
+    <property name="jndi.prefix" value=""/>
 
     <property name="qpid.xacf.jndi.name" value="java:/QpidJMSXA"/>
     <property name="qpid.cf.jndi.name" value="QpidConnectionFactory"/>
-    <property name="qpid.hello.topic.jndi.name" value="java:/HelloTopic"/>
-    <property name="qpid.goodbye.topic.jndi.name" value="java:/GoodByeTopic"/>
-    <property name="qpid.hello.queue.jndi.name" value="java:/HelloQueue"/>
-    <property name="qpid.goodbye.queue.jndi.name" value="java:/GoodByeQueue"/>
-    <property name="qpid.responder.queue.jndi.name" value="java:/QpidResponderQueue"/>
+    <property name="qpid.hello.topic.jndi.name" value="java:jboss/exported/HelloTopic"/>
+    <property name="qpid.goodbye.topic.jndi.name" value="java:jboss/exported/GoodByeTopic"/>
+    <property name="qpid.hello.queue.jndi.name" value="java:jboss/exported/HelloQueue"/>
+    <property name="qpid.goodbye.queue.jndi.name" value="java:jboss/exported/GoodByeQueue"/>
+    <property name="qpid.request.queue.jndi.name" value="java:jboss/exported/QpidRequestQueue"/>
+    <property name="qpid.response.queue.jndi.name" value="java:jboss/exported/QpidResponseQueue"/>
+
     <property name="qpid.ejb.jndi.name" value="mappedName=&quot;QpidTestEJB&quot;"/>
     <property name="qpid.ejb.ref.name" value="QpidTestBean/local"/>
-    <property name="qpid.ejb.name" value="qpid-jcaex/QpidTestBean/remote"/>
+    <property name="qpid.ejb.name" value="ejb:qpid-jcaex/qpid-jcaex-ejb/QpidTestBean!org.apache.qpid.jca.example.ejb.QpidTestRemote"/>
 
-    <property name="jndi.context" value="org.jnp.interfaces.NamingContextFactory"/>
-    <property name="server.host" value="jnp://localhost:1099"/>
+    <property name="qpid.client.cf.jndi.name" value="${jndi.prefix}/QpidConnectionFactory"/>
+    <property name="qpid.client.dest.jndi.name" value="${jndi.prefix}/HelloQueue"/>
+    <property name="jndi.context" value="org.jboss.naming.remote.client.InitialContextFactory"/>
+    <property name="server.host" value="remote://localhost:4447"/>
 
 
     <property name="jboss.server.config" value="standalone"/>
@@ -44,19 +49,20 @@
     <property name="jboss.deploy" location="${jboss.home}/${jboss.server}/deployments"/>
     <property name="jboss.modules" location="${jboss.home}/modules"/>
     <property name="jboss.config.dir" location="${jboss.home}/${jboss.server}/configuration/"/>
+    <property name="jboss.client" location="${jboss.home}/bin/client"/>
 
     <path id="compile.classpath">
         <fileset dir="${jboss.modules}/javax/jms/api/main">
-            <include name="jboss-jms-api_1.1_spec-1.0.0.Final.jar"/>
+            <include name="jboss-jms-api_1.1_spec-1.0.1.Final.jar"/>
         </fileset>
         <fileset dir="${jboss.modules}/javax/ejb/api/main">
-            <include name="jboss-ejb-api_3.1_spec-1.0.1.Final.jar"/>
+            <include name="jboss-ejb-api_3.1_spec-1.0.2.Final.jar"/>
         </fileset>
         <fileset dir="${jboss.modules}/javax/servlet/api/main">
-            <include name="jboss-servlet-api_3.0_spec-1.0.0.Final.jar"/>
+            <include name="jboss-servlet-api_3.0_spec-1.0.1.Final.jar"/>
         </fileset>
         <fileset dir="${jboss.modules}/javax/transaction/api/main">
-            <include name="jboss-transaction-api_1.1_spec-1.0.0.Final.jar"/>
+            <include name="jboss-transaction-api_1.1_spec-1.0.1.Final.jar"/>
         </fileset>
         <fileset dir="${jboss.modules}/org/slf4j/main">
             <include name="slf4j-api-1.6.1.jar"/>
@@ -64,15 +70,25 @@
     </path>
 
     <path id="run.classpath">
+        <fileset dir="${jboss.client}">
+            <include name="jboss-client.jar"/>
+        </fileset>
         <fileset dir="${lib.dir}">
             <include name="qpid-ra-*.jar"/>
             <include name="qpid-client-*.jar"/>
             <include name="qpid-common-*.jar"/>
         </fileset>
-        <fileset dir="${jboss.client}">
-            <!-- Shortcut to get it working!-->
-            <include name="jbossall-client.jar"/>
+        <fileset dir="${jboss.modules}/org/slf4j/main">
+            <include name="slf4j-api-1.6.1.jar"/>
+        </fileset>
+        <fileset dir="../../build/lib">
+            <include name="slf4j*.jar"/>
+            <include name="log4j*.jar"/>
         </fileset>
+        <fileset dir="${jboss.modules}/org/jboss/ejb-client/main/">
+            <include name="jboss-ejb-client-1.0.6.CR1.jar"/>
+        </fileset>
+
     </path>
 
     <filterset id="extra.filterset"/>

Modified: qpid/branches/qpid-3767/qpid/java/jca/example/build.xml
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/jca/example/build.xml?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/jca/example/build.xml (original)
+++ qpid/branches/qpid-3767/qpid/java/jca/example/build.xml Wed May  2 13:09:18 2012
@@ -20,7 +20,7 @@
  -->
 <project name="qpid-jca-example" default="help" basedir="">
 
-    <!-- Valid target platforms are currently geronimo & jboss -->
+    <!-- Valid target platforms are currently geronimo, jboss, jboss7, glassfish -->
     <property name="target.platform" value="geronimo"/>
 
     <!-- Change to BURL for older syntax support -->
@@ -72,7 +72,6 @@
                 <filter token="rar.name" value="${rar.name}"/>
                 <filter token="ejb.name" value="${ejb.name}"/>
                 <filter token="war.name" value="${war.name}"/>
-
                 <filter token="broker.url" value="${broker.url}"/>
 
                 <filter token="qpid.hello.topic.dest.address" value="${qpid.hello.topic.dest.address}"/>
@@ -92,12 +91,14 @@
                 <filter token="rar.name" value="${rar.name}"/>
                 <filter token="broker.url" value="${broker.url}"/>
                 <filter token="jndi.scheme" value="${jndi.scheme}"/>
+                <filter token="jndi.prefix" value="${jndi.prefix}"/>
                 <filter token="qpid.xacf.jndi.name" value="${qpid.xacf.jndi.name}"/>
                 <filter token="qpid.hello.topic.jndi.name" value="${qpid.hello.topic.jndi.name}"/>
                 <filter token="qpid.goodbye.topic.jndi.name" value="${qpid.goodbye.topic.jndi.name}"/>
                 <filter token="qpid.hello.queue.jndi.name" value="${qpid.hello.queue.jndi.name}"/>
                 <filter token="qpid.goodbye.queue.jndi.name" value="${qpid.goodbye.queue.jndi.name}"/>
                 <filter token="qpid.request.queue.jndi.name" value="${qpid.request.queue.jndi.name}"/>
+                <filter token="qpid.response.queue.jndi.name" value="${qpid.response.queue.jndi.name}"/>
                 <filter token="qpid.ejb.jndi.name" value="${qpid.ejb.jndi.name}"/>
             </filterset>
         </copy>
@@ -112,6 +113,9 @@
             <classes dir="${build.classes.dir}">
                 <include name="org/apache/qpid/jca/example/web/**"/>
             </classes>
+            <metainf dir="${gen.dir}">
+                <include name="glassfish-web.xml"/>
+            </metainf>
         </war>
     </target>
 
@@ -120,6 +124,7 @@
             <include name="org/apache/qpid/jca/example/ejb/**/*.class"/>
             <metainf dir="${gen.dir}">
                 <include name="jboss.xml"/>
+                <include name="glassfish-ejb-jar.xml"/>
             </metainf>
         </jar>
     </target>
@@ -142,10 +147,13 @@
             </classpath>
             <sysproperty key="java.naming.factory.initial" value="${jndi.context}"/>
             <sysproperty key="java.naming.provider.url" value="${server.host}"/>
+            <sysproperty key="java.naming.factory.url.pkgs" value="org.jboss.ejb.client.naming"/>
+            <sysproperty key="jboss.ejb.client.properties.file.path" value="${conf.dir}/jboss-ejb-client.properties"/>
+
             <sysproperty key="qpid.ejb.name" value="${qpid.ejb.name}"/>
-            <sysproperty key="qpid.cf.name" value="${qpid.cf.jndi.name}"/>
+            <sysproperty key="qpid.cf.name" value="${qpid.client.cf.jndi.name}"/>
+            <sysproperty key="qpid.dest.name" value="${qpid.client.dest.jndi.name}"/>
             <sysproperty key="qpid.dest_syntax" value="${qpid.dest_syntax}"/>
-            <sysproperty key="qpid.dest.name" value="${qpid.hello.queue.jndi.name}"/>
             <sysproperty key="log4j.configuration" value="file://${conf.dir}/log4j.properties"/>
 
             <sysproperty key="qpid.message" value="${client.message}"/>
@@ -167,8 +175,8 @@
             <sysproperty key="qpid.message" value="Hello, World"/>
             <sysproperty key="message.count" value="1"/>
             <sysproperty key="thread.count" value="5"/>
-            <sysproperty key="qpid.cf.name" value="${qpid.cf.jndi.name}"/>
-            <sysproperty key="qpid.dest.name" value="${qpid.responder.queue.jndi.name}"/>
+            <sysproperty key="qpid.cf.name" value="${qpid.client.cf.jndi.name}"/>
+            <sysproperty key="qpid.dest.name" value="${qpid.client.dest.jndi.name}"/>
             <sysproperty key="log4j.configuration" value="file://${conf.dir}/log4j.properties"/>
             <sysproperty key="qpid.dest_syntax" value="${qpid.dest_syntax}"/>
         </java>

Modified: qpid/branches/qpid-3767/qpid/java/jca/example/conf/geronimo-application.xml
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/jca/example/conf/geronimo-application.xml?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/jca/example/conf/geronimo-application.xml (original)
+++ qpid/branches/qpid-3767/qpid/java/jca/example/conf/geronimo-application.xml Wed May  2 13:09:18 2012
@@ -21,7 +21,7 @@
  -->
 <application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-2.0"
     xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2"
-    xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
+    xmlns:nam="http://geronimo.apache.org/xml/ns/naming-1.2"
     application-name="QpidJCAExampleApplication">
 
     <sys:environment>

Modified: qpid/branches/qpid-3767/qpid/java/jca/example/conf/geronimo-ra.xml
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/jca/example/conf/geronimo-ra.xml?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/jca/example/conf/geronimo-ra.xml (original)
+++ qpid/branches/qpid-3767/qpid/java/jca/example/conf/geronimo-ra.xml Wed May  2 13:09:18 2012
@@ -67,71 +67,73 @@
       <adminobject-class>org.apache.qpid.ra.admin.QpidTopicImpl</adminobject-class>
       <adminobject-instance>
          <message-destination-name>Dummy</message-destination-name>
-         <config-property-setting name="destinationAddress">amq.topic</config-property-setting>
+         <config-property-setting name="DestinationAddress">amq.topic</config-property-setting>
       </adminobject-instance>
     </adminobject>
     <adminobject>
       <adminobject-interface>org.apache.qpid.ra.admin.QpidTopic</adminobject-interface>
       <adminobject-class>org.apache.qpid.ra.admin.QpidTopicImpl</adminobject-class>
       <adminobject-instance>
-         <message-destination-name>HelloTopic</message-destination-name>
-         <config-property-setting name="destinationAddress">@qpid.hello.topic.dest.address@</config-property-setting>
+          <message-destination-name>HelloTopic</message-destination-name>
+         <config-property-setting name="DestinationAddress">@qpid.hello.topic.dest.address@</config-property-setting>
       </adminobject-instance>
     </adminobject>
     <adminobject>
       <adminobject-interface>org.apache.qpid.ra.admin.QpidTopic</adminobject-interface>
       <adminobject-class>org.apache.qpid.ra.admin.QpidTopicImpl</adminobject-class>
       <adminobject-instance>
-         <message-destination-name>GoodByeTopic</message-destination-name>
-         <config-property-setting name="destinationAddress">@qpid.goodbye.topic.dest.address@</config-property-setting>
+          <message-destination-name>GoodByeTopic</message-destination-name>
+         <config-property-setting name="DestinationAddress">@qpid.goodbye.topic.dest.address@</config-property-setting>
       </adminobject-instance>
     </adminobject>
+    <!--
     <adminobject>
       <adminobject-interface>org.apache.qpid.ra.admin.QpidTopic</adminobject-interface>
       <adminobject-class>org.apache.qpid.ra.admin.QpidTopicImpl</adminobject-class>
       <adminobject-instance>
-         <message-destination-name>HelloGoodByeTopic</message-destination-name>
-         <config-property-setting name="destinationAddress">@qpid.hellogoodbye.topic.dest.address@</config-property-setting>
+          <message-destination-name>jms/HelloGoodByeTopic</message-destination-name>
+         <config-property-setting name="DestinationAddress">@qpid.hellogoodbye.topic.dest.address@</config-property-setting>
       </adminobject-instance>
     </adminobject>
+    -->
     <adminobject>
       <adminobject-interface>org.apache.qpid.ra.admin.QpidQueue</adminobject-interface>
       <adminobject-class>org.apache.qpid.ra.admin.QpidQueueImpl</adminobject-class>
       <adminobject-instance>
-         <message-destination-name>HelloQueue</message-destination-name>
-         <config-property-setting name="destinationAddress">@qpid.hello.queue.dest.address@</config-property-setting>
+          <message-destination-name>HelloQueue</message-destination-name>
+         <config-property-setting name="DestinationAddress">@qpid.hello.queue.dest.address@</config-property-setting>
       </adminobject-instance>
     </adminobject>
     <adminobject>
       <adminobject-interface>org.apache.qpid.ra.admin.QpidQueue</adminobject-interface>
       <adminobject-class>org.apache.qpid.ra.admin.QpidQueueImpl</adminobject-class>
       <adminobject-instance>
-         <message-destination-name>GoodByeQueue</message-destination-name>
-         <config-property-setting name="destinationAddress">@qpid.goodbye.queue.dest.address@</config-property-setting>
+          <message-destination-name>GoodByeQueue</message-destination-name>
+         <config-property-setting name="DestinationAddress">@qpid.goodbye.queue.dest.address@</config-property-setting>
       </adminobject-instance>
     </adminobject>
     <adminobject>
       <adminobject-interface>org.apache.qpid.ra.admin.QpidQueue</adminobject-interface>
       <adminobject-class>org.apache.qpid.ra.admin.QpidQueueImpl</adminobject-class>
       <adminobject-instance>
-         <message-destination-name>RequestQueue</message-destination-name>
-         <config-property-setting name="destinationAddress">@qpid.request.queue.dest.address@</config-property-setting>
+          <message-destination-name>RequestQueue</message-destination-name>
+         <config-property-setting name="DestinationAddress">@qpid.request.queue.dest.address@</config-property-setting>
       </adminobject-instance>
     </adminobject>
     <adminobject>
       <adminobject-interface>org.apache.qpid.ra.admin.QpidQueue</adminobject-interface>
       <adminobject-class>org.apache.qpid.ra.admin.QpidQueueImpl</adminobject-class>
       <adminobject-instance>
-         <message-destination-name>ResponseQueue</message-destination-name>
-         <config-property-setting name="destinationAddress">@qpid.response.queue.dest.address@</config-property-setting>
+          <message-destination-name>ResponseQueue</message-destination-name>
+         <config-property-setting name="DestinationAddress">@qpid.response.queue.dest.address@</config-property-setting>
       </adminobject-instance>
     </adminobject>
     <adminobject>
       <adminobject-interface>javax.jms.ConnectionFactory</adminobject-interface>
       <adminobject-class>org.apache.qpid.ra.admin.QpidConnectionFactoryProxy</adminobject-class>
       <adminobject-instance>
-         <message-destination-name>QpidConnectionFactory</message-destination-name>
-         <config-property-setting name="connectionURL">@broker.url@</config-property-setting>
+          <message-destination-name>QpidConnectionFactory</message-destination-name>
+         <config-property-setting name="ConnectionURL">@broker.url@</config-property-setting>
       </adminobject-instance>
     </adminobject>
   </resourceadapter>

Modified: qpid/branches/qpid-3767/qpid/java/jca/example/conf/log4j.properties
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/jca/example/conf/log4j.properties?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/jca/example/conf/log4j.properties (original)
+++ qpid/branches/qpid-3767/qpid/java/jca/example/conf/log4j.properties Wed May  2 13:09:18 2012
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 log4j.rootLogger=DEBUG, CONSOLE, FILE
 
 #Console Appender

Modified: qpid/branches/qpid-3767/qpid/java/jca/example/conf/qpid-jca-ds.xml
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/jca/example/conf/qpid-jca-ds.xml?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/jca/example/conf/qpid-jca-ds.xml (original)
+++ qpid/branches/qpid-3767/qpid/java/jca/example/conf/qpid-jca-ds.xml Wed May  2 13:09:18 2012
@@ -27,7 +27,7 @@
      <depends optional-attribute-name="RARName">jboss.jca:service=RARDeployment,name='@rar.name@'</depends>
      <attribute name="Type">org.apache.qpid.ra.admin.QpidTopic</attribute>
      <attribute name="Properties">
-        destinationAddress=@qpid.hello.topic.dest.address@
+        DestinationAddress=@qpid.hello.topic.dest.address@
      </attribute>
   </mbean>
 
@@ -37,7 +37,7 @@
      <depends optional-attribute-name="RARName">jboss.jca:service=RARDeployment,name='@rar.name@'</depends>
      <attribute name="Type">org.apache.qpid.ra.admin.QpidTopic</attribute>
      <attribute name="Properties">
-        destinationAddress=@qpid.goodbye.topic.dest.address@
+        DestinationAddress=@qpid.goodbye.topic.dest.address@
      </attribute>
   </mbean>
 
@@ -47,7 +47,7 @@
      <depends optional-attribute-name="RARName">jboss.jca:service=RARDeployment,name='@rar.name@'</depends>
      <attribute name="Type">org.apache.qpid.ra.admin.QpidTopic</attribute>
      <attribute name="Properties">
-        destinationAddress=@qpid.hellogoodbye.topic.dest.address@
+        DestinationAddress=@qpid.hellogoodbye.topic.dest.address@
      </attribute>
   </mbean>
 
@@ -57,7 +57,7 @@
      <depends optional-attribute-name="RARName">jboss.jca:service=RARDeployment,name='@rar.name@'</depends>
      <attribute name="Type">org.apache.qpid.ra.admin.QpidQueue</attribute>
      <attribute name="Properties">
-        destinationAddress=@qpid.hello.queue.dest.address@
+        DestinationAddress=@qpid.hello.queue.dest.address@
      </attribute>
   </mbean>
 
@@ -67,7 +67,7 @@
      <depends optional-attribute-name="RARName">jboss.jca:service=RARDeployment,name='@rar.name@'</depends>
      <attribute name="Type">org.apache.qpid.ra.admin.QpidQueue</attribute>
      <attribute name="Properties">
-        destinationAddress=@qpid.goodbye.queue.dest.address@
+        DestinationAddress=@qpid.goodbye.queue.dest.address@
      </attribute>
   </mbean>
 
@@ -77,7 +77,7 @@
      <depends optional-attribute-name="RARName">jboss.jca:service=RARDeployment,name='@rar.name@'</depends>
      <attribute name="Type">org.apache.qpid.ra.admin.QpidQueue</attribute>
      <attribute name="Properties">
-        destinationAddress=@qpid.request.queue.dest.address@
+        DestinationAddress=@qpid.request.queue.dest.address@
      </attribute>
   </mbean>
 
@@ -87,7 +87,7 @@
      <depends optional-attribute-name="RARName">jboss.jca:service=RARDeployment,name='@rar.name@'</depends>
      <attribute name="Type">org.apache.qpid.ra.admin.QpidQueue</attribute>
      <attribute name="Properties">
-        destinationAddress=@qpid.response.queue.dest.address@
+        DestinationAddress=@qpid.response.queue.dest.address@
      </attribute>
   </mbean>
   <mbean code="org.jboss.resource.deployment.AdminObject"
@@ -96,7 +96,7 @@
      <depends optional-attribute-name="RARName">jboss.jca:service=RARDeployment,name='@rar.name@'</depends>
      <attribute name="Type">javax.jms.ConnectionFactory</attribute>
      <attribute name="Properties">
-        connectionURL=@broker.url@
+        ConnectionURL=@broker.url@
      </attribute>
   </mbean>
 

Modified: qpid/branches/qpid-3767/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/client/QpidRequestResponseClient.java
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/client/QpidRequestResponseClient.java?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/client/QpidRequestResponseClient.java (original)
+++ qpid/branches/qpid-3767/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/client/QpidRequestResponseClient.java Wed May  2 13:09:18 2012
@@ -42,7 +42,7 @@ public class QpidRequestResponseClient i
     private static final Logger _log = LoggerFactory.getLogger(QpidRequestResponseClient.class);
 
     private static final String DEFAULT_CF_JNDI = "QpidConnectionFactory";
-    private static final String DEFAULT_DESTINATION_JNDI = "QpidResponderQueue";
+    private static final String DEFAULT_DESTINATION_JNDI = "QpidRequestQueue";
     private static final String DEFAULT_MESSAGE = "Hello, World!";
     private static final int DEFAULT_MESSAGE_COUNT = 1;
     private static final int DEFAULT_THREAD_COUNT = 1;

Modified: qpid/branches/qpid-3767/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidGoodByeListenerBean.java
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidGoodByeListenerBean.java?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidGoodByeListenerBean.java (original)
+++ qpid/branches/qpid-3767/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidGoodByeListenerBean.java Wed May  2 13:09:18 2012
@@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory;
 @MessageDriven(activationConfig = {
     @ActivationConfigProperty(propertyName = "acknowledgeMode", propertyValue = "Auto-acknowledge"),
     @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue"),
-    @ActivationConfigProperty(propertyName = "destination", propertyValue = "@qpid.goodbye.queue.jndi.name@"),
+    @ActivationConfigProperty(propertyName = "destination", propertyValue = "@jndi.prefix@@qpid.goodbye.queue.jndi.name@"),
     @ActivationConfigProperty(propertyName = "connectionURL", propertyValue = "@broker.url@"),
     @ActivationConfigProperty(propertyName = "useLocalTx", propertyValue = "false"),
     @ActivationConfigProperty(propertyName = "maxSession", propertyValue = "10")

Modified: qpid/branches/qpid-3767/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidGoodByeSubscriberBean.java
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidGoodByeSubscriberBean.java?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidGoodByeSubscriberBean.java (original)
+++ qpid/branches/qpid-3767/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidGoodByeSubscriberBean.java Wed May  2 13:09:18 2012
@@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory;
 @MessageDriven(activationConfig = {
     @ActivationConfigProperty(propertyName = "acknowledgeMode", propertyValue = "Auto-acknowledge"),
     @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Topic"),
-    @ActivationConfigProperty(propertyName = "destination", propertyValue = "@qpid.goodbye.topic.jndi.name@"),
+    @ActivationConfigProperty(propertyName = "destination", propertyValue = "@jndi.prefix@@qpid.goodbye.topic.jndi.name@"),
     @ActivationConfigProperty(propertyName = "connectionURL", propertyValue = "@broker.url@"),
     @ActivationConfigProperty(propertyName = "subscriptionDurability", propertyValue = "NotDurable"),
     @ActivationConfigProperty(propertyName = "maxSession", propertyValue = "10")

Modified: qpid/branches/qpid-3767/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidHelloListenerBean.java
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidHelloListenerBean.java?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidHelloListenerBean.java (original)
+++ qpid/branches/qpid-3767/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidHelloListenerBean.java Wed May  2 13:09:18 2012
@@ -42,7 +42,7 @@ import org.slf4j.LoggerFactory;
 @MessageDriven(activationConfig = {
    @ActivationConfigProperty(propertyName = "acknowledgeMode", propertyValue = "Auto-acknowledge"),
    @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue"),
-   @ActivationConfigProperty(propertyName = "destination", propertyValue = "@qpid.hello.queue.jndi.name@"),
+   @ActivationConfigProperty(propertyName = "destination", propertyValue = "@jndi.prefix@@qpid.hello.queue.jndi.name@"),
    @ActivationConfigProperty(propertyName = "connectionURL", propertyValue = "@broker.url@"),
    @ActivationConfigProperty(propertyName = "maxSession", propertyValue = "10")
 })

Modified: qpid/branches/qpid-3767/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidHelloSubscriberBean.java
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidHelloSubscriberBean.java?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidHelloSubscriberBean.java (original)
+++ qpid/branches/qpid-3767/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidHelloSubscriberBean.java Wed May  2 13:09:18 2012
@@ -42,7 +42,7 @@ import org.slf4j.LoggerFactory;
 @MessageDriven(activationConfig = {
    @ActivationConfigProperty(propertyName = "acknowledgeMode", propertyValue = "Auto-acknowledge"),
    @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Topic"),
-   @ActivationConfigProperty(propertyName = "destination", propertyValue = "@qpid.hello.topic.jndi.name@"),
+   @ActivationConfigProperty(propertyName = "destination", propertyValue = "@jndi.prefix@@qpid.hello.topic.jndi.name@"),
    @ActivationConfigProperty(propertyName = "connectionURL", propertyValue = "@broker.url@"),
    @ActivationConfigProperty(propertyName = "subscriptionDurability", propertyValue = "NotDurable"),
    @ActivationConfigProperty(propertyName = "maxSession", propertyValue = "10")

Modified: qpid/branches/qpid-3767/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidJMSResponderBean.java
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidJMSResponderBean.java?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidJMSResponderBean.java (original)
+++ qpid/branches/qpid-3767/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidJMSResponderBean.java Wed May  2 13:09:18 2012
@@ -41,7 +41,7 @@ import org.slf4j.LoggerFactory;
 @MessageDriven(activationConfig = {
     @ActivationConfigProperty(propertyName = "acknowledgeMode", propertyValue = "Auto-acknowledge"),
     @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue"),
-    @ActivationConfigProperty(propertyName = "destination", propertyValue = "@qpid.request.queue.jndi.name@"),
+    @ActivationConfigProperty(propertyName = "destination", propertyValue = "@jndi.prefix@@qpid.request.queue.jndi.name@"),
     @ActivationConfigProperty(propertyName = "connectionURL", propertyValue = "@broker.url@"),
     @ActivationConfigProperty(propertyName = "maxSession", propertyValue = "10")
 })

Modified: qpid/branches/qpid-3767/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidTestBean.java
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidTestBean.java?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidTestBean.java (original)
+++ qpid/branches/qpid-3767/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidTestBean.java Wed May  2 13:09:18 2012
@@ -43,10 +43,10 @@ public class QpidTestBean implements Qpi
     @Resource(@jndi.scheme@="@qpid.xacf.jndi.name@")
     private ConnectionFactory _connectionFactory;
 
-    @Resource(@jndi.scheme@="HelloQueue")
+    @Resource(@jndi.scheme@="@qpid.hello.queue.jndi.name@")
     private Destination _queue;
 
-    @Resource(@jndi.scheme@="HelloTopic")
+    @Resource(@jndi.scheme@="@qpid.hello.topic.jndi.name@")
     private Destination _topic;
 
     @Override

Modified: qpid/branches/qpid-3767/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/web/QpidRequestResponseServlet.java
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/web/QpidRequestResponseServlet.java?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/web/QpidRequestResponseServlet.java (original)
+++ qpid/branches/qpid-3767/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/web/QpidRequestResponseServlet.java Wed May  2 13:09:18 2012
@@ -59,10 +59,10 @@ public class QpidRequestResponseServlet 
     @Resource(@jndi.scheme@="@qpid.xacf.jndi.name@")
     private ConnectionFactory _connectionFactory;
 
-    @Resource(@jndi.scheme@="QpidRequestQueue")
+    @Resource(@jndi.scheme@="@qpid.request.queue.jndi.name@")
     private Destination _queue;
 
-    @Resource(@jndi.scheme@="QpidResponseQueue")
+    @Resource(@jndi.scheme@="@qpid.response.queue.jndi.name@")
     private Destination _responseQueue;
 
 

Modified: qpid/branches/qpid-3767/qpid/java/jca/src/main/java/org/apache/qpid/ra/ConnectionFactoryProperties.java
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/jca/src/main/java/org/apache/qpid/ra/ConnectionFactoryProperties.java?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/jca/src/main/java/org/apache/qpid/ra/ConnectionFactoryProperties.java (original)
+++ qpid/branches/qpid-3767/qpid/java/jca/src/main/java/org/apache/qpid/ra/ConnectionFactoryProperties.java Wed May  2 13:09:18 2012
@@ -34,7 +34,7 @@ public class ConnectionFactoryProperties
 
    private boolean _hasBeenUpdated = false;
 
-   private String _clientID;
+   private String _clientId;
 
    private String _connectionURL;
 
@@ -56,7 +56,7 @@ public class ConnectionFactoryProperties
       {
          _log.trace("getClientID()");
       }
-      return _clientID;
+      return _clientId;
    }
 
    public void setClientId(final String clientID)
@@ -66,7 +66,7 @@ public class ConnectionFactoryProperties
          _log.trace("setClientID(" + clientID + ")");
       }
       _hasBeenUpdated = true;
-      this._clientID = clientID;
+      this._clientId = clientID;
    }
 
    public boolean isHasBeenUpdated()

Modified: qpid/branches/qpid-3767/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAConnectionRequestInfo.java
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAConnectionRequestInfo.java?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAConnectionRequestInfo.java (original)
+++ qpid/branches/qpid-3767/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAConnectionRequestInfo.java Wed May  2 13:09:18 2012
@@ -45,7 +45,7 @@ public class QpidRAConnectionRequestInfo
    private String _password;
 
    /** The client id */
-   private String _clientID;
+   private String _clientId;
 
    /** The type */
    private final int _type;
@@ -76,13 +76,13 @@ public class QpidRAConnectionRequestInfo
          final ConnectionURL connectionURL = ra.getDefaultAMQConnectionFactory().getConnectionURL() ;
          _userName = connectionURL.getUsername();
          _password = connectionURL.getPassword();
-         _clientID = connectionURL.getClientName();
+         _clientId = connectionURL.getClientName();
       }
       else
       {
-         _userName = ra.getDefaultUserName();
-         _password = ra.getDefaultPassword();
-         _clientID = ra.getClientId();
+         _userName = ra.getUserName();
+         _password = ra.getPassword();
+         _clientId = ra.getClientId();
       }
       this._type = type;
       _transacted = true;
@@ -142,9 +142,9 @@ public class QpidRAConnectionRequestInfo
       {
          _password = connectionURL.getPassword();
       }
-      if (_clientID == null)
+      if (_clientId == null)
       {
-         _clientID = connectionURL.getClientName();
+         _clientId = connectionURL.getClientName();
       }
    }
 
@@ -170,15 +170,15 @@ public class QpidRAConnectionRequestInfo
       {
          if (_userName == null)
          {
-            _userName = ra.getDefaultUserName();
+            _userName = ra.getUserName();
          }
          if (_password == null)
          {
-            _password = ra.getDefaultPassword();
+            _password = ra.getPassword();
          }
-         if (_clientID == null)
+         if (_clientId == null)
          {
-            _clientID = ra.getClientId();
+            _clientId = ra.getClientId();
          }
       }
    }
@@ -243,28 +243,28 @@ public class QpidRAConnectionRequestInfo
     * Get the client id
     * @return The value
     */
-   public String getClientID()
+   public String getClientId()
    {
       if (_log.isTraceEnabled())
       {
          _log.trace("getClientID()");
       }
 
-      return _clientID;
+      return _clientId;
    }
 
    /**
     * Set the client id
     * @param clientID The value
     */
-   public void setClientID(final String clientID)
+   public void setClientId(final String clientID)
    {
       if (_log.isTraceEnabled())
       {
          _log.trace("setClientID(" + clientID + ")");
       }
 
-      this._clientID = clientID;
+      this._clientId = clientID;
    }
 
    /**
@@ -321,7 +321,7 @@ public class QpidRAConnectionRequestInfo
       {
          QpidRAConnectionRequestInfo you = (QpidRAConnectionRequestInfo)obj;
          return Util.compare(_userName, you.getUserName()) && Util.compare(_password, you.getPassword()) &&
-                Util.compare(_clientID, you.getClientID()) &&
+                Util.compare(_clientId, you.getClientId()) &&
                 _type == you.getType() &&
                 _transacted == you.isTransacted() &&
                 _acknowledgeMode == you.getAcknowledgeMode();
@@ -343,7 +343,7 @@ public class QpidRAConnectionRequestInfo
 
       hash += 31 * hash + (_userName != null ? _userName.hashCode() : 0);
       hash += 31 * hash + (_password != null ? _password.hashCode() : 0);
-      hash += 31 * hash + (_clientID != null ? _clientID.hashCode() : 0);
+      hash += 31 * hash + (_clientId != null ? _clientId.hashCode() : 0);
       hash += 31 * hash + _type;
       hash += 31 * hash + (_transacted ? 1 : 0);
       hash += 31 * hash + _acknowledgeMode;
@@ -356,6 +356,6 @@ public class QpidRAConnectionRequestInfo
    {
       return "QpidRAConnectionRequestInfo[type=" + _type +
          ", transacted=" + _transacted + ", acknowledgeMode=" + _acknowledgeMode +
-         ", clientID=" + _clientID + ", userName=" + _userName + ((_password != null) ? ", password=********]" :"]");
+         ", clientID=" + _clientId + ", userName=" + _userName + ((_password != null) ? ", password=********]" :"]");
    }
 }

Modified: qpid/branches/qpid-3767/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAManagedConnectionFactory.java
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAManagedConnectionFactory.java?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAManagedConnectionFactory.java (original)
+++ qpid/branches/qpid-3767/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAManagedConnectionFactory.java Wed May  2 13:09:18 2012
@@ -365,12 +365,12 @@ public class QpidRAManagedConnectionFact
       _mcfProperties.setSessionDefaultType(type);
    }
 
-   public String getClientID()
+   public String getClientId()
    {
       return _mcfProperties.getClientId();
    }
 
-   public void setClientID(final String clientID)
+   public void setClientId(final String clientID)
    {
       _mcfProperties.setClientId(clientID);
    }

Modified: qpid/branches/qpid-3767/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAProperties.java
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAProperties.java?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAProperties.java (original)
+++ qpid/branches/qpid-3767/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAProperties.java Wed May  2 13:09:18 2012
@@ -66,34 +66,6 @@ public class QpidRAProperties extends Co
       }
    }
 
-   /**
-    * Get the use XA flag
-    * @return The value
-    */
-   public Boolean getUseLocalTx()
-   {
-      if (_log.isTraceEnabled())
-      {
-         _log.trace("getUseLocalTx()");
-      }
-
-      return _localTx;
-   }
-
-   /**
-    * Set the use XA flag
-    * @param localTx The value
-    */
-   public void setUseLocalTx(final Boolean localTx)
-   {
-      if (_log.isTraceEnabled())
-      {
-         _log.trace("setUseLocalTx(" + localTx + ")");
-      }
-
-      this._localTx = localTx;
-   }
-
    public void setTransactionManagerLocatorClass(final String transactionManagerLocatorClass)
    {
       if (_log.isTraceEnabled())

Modified: qpid/branches/qpid-3767/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRASessionFactoryImpl.java
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRASessionFactoryImpl.java?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRASessionFactoryImpl.java (original)
+++ qpid/branches/qpid-3767/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRASessionFactoryImpl.java Wed May  2 13:09:18 2012
@@ -742,7 +742,7 @@ public class QpidRASessionFactoryImpl im
             QpidRAConnectionRequestInfo info = new QpidRAConnectionRequestInfo(sessionType);
             info.setUserName(_userName);
             info.setPassword(_password);
-            info.setClientID(_clientID);
+            info.setClientId(_clientID);
             info.setDefaults(_mcf.getDefaultAMQConnectionFactory().getConnectionURL());
 
             if (_log.isTraceEnabled())
@@ -839,7 +839,7 @@ public class QpidRASessionFactoryImpl im
                                                                                      sessionType);
             info.setUserName(_userName);
             info.setPassword(_password);
-            info.setClientID(_clientID);
+            info.setClientId(_clientID);
             info.setDefaults(_mcf.getDefaultAMQConnectionFactory().getConnectionURL());
 
             if (_log.isTraceEnabled())

Modified: qpid/branches/qpid-3767/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidResourceAdapter.java
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidResourceAdapter.java?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidResourceAdapter.java (original)
+++ qpid/branches/qpid-3767/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidResourceAdapter.java Wed May  2 13:09:18 2012
@@ -223,65 +223,6 @@ public class QpidResourceAdapter impleme
       _log.info("Qpid resource adapter stopped");
    }
 
-   /**
-    * Get the user name
-    *
-    * @return The value
-    */
-   public String getDefaultUserName()
-   {
-      if (_log.isTraceEnabled())
-      {
-         _log.trace("getUserName()");
-      }
-
-      return _raProperties.getUserName();
-   }
-
-   /**
-    * Set the user name
-    *
-    * @param userName The value
-    */
-   public void setDefaultUserName(final String userName)
-   {
-      if (_log.isTraceEnabled())
-      {
-         _log.trace("setUserName(" + userName + ")");
-      }
-
-      _raProperties.setUserName(userName);
-   }
-
-   /**
-    * Get the password
-    *
-    * @return The value
-    */
-   public String getDefaultPassword()
-   {
-      if (_log.isTraceEnabled())
-      {
-         _log.trace("getPassword()");
-      }
-
-      return _raProperties.getPassword();
-   }
-
-   /**
-    * Set the password
-    *
-    * @param password The value
-    */
-   public void setDefaultPassword(final String password)
-   {
-      if (_log.isTraceEnabled())
-      {
-         _log.trace("setPassword(****)");
-      }
-
-      _raProperties.setPassword(password);
-   }
 
    /**
     * Get the client ID
@@ -403,6 +344,26 @@ public class QpidResourceAdapter impleme
       _raProperties.setPath(path);
    }
 
+   public String getUserName()
+   {
+       return _raProperties.getUserName();
+   }
+
+   public void setUserName(String userName)
+   {
+      _raProperties.setUserName(userName);
+   }
+
+   public String getPassword()
+   {
+       return _raProperties.getPassword();
+   }
+
+   public void setPassword(String password)
+   {
+       _raProperties.setPassword(password);
+   }
+
    /**
     * Get the connection url
     *
@@ -493,14 +454,14 @@ public class QpidResourceAdapter impleme
     *
     * @return The value
     */
-   public Boolean getUseLocalTx()
+   public Boolean isUseLocalTx()
    {
       if (_log.isTraceEnabled())
       {
          _log.trace("getUseLocalTx()");
       }
 
-      return _raProperties.getUseLocalTx();
+      return _raProperties.isUseLocalTx();
    }
 
    /**
@@ -720,7 +681,7 @@ public class QpidResourceAdapter impleme
       return map;
    }
 
-   private void locateTM()
+   private void locateTM() throws ResourceAdapterInternalException
    {
       if(_raProperties.getTransactionManagerLocatorClass() != null && _raProperties.getTransactionManagerLocatorMethod() != null)
       {
@@ -742,8 +703,8 @@ public class QpidResourceAdapter impleme
 
       if (_tm == null)
       {
-         _log.warn("It wasn't possible to lookup a Transaction Manager through the configured properties TransactionManagerLocatorClass and TransactionManagerLocatorMethod");
-         _log.warn("Qpid Resource Adapter won't be able to set and verify transaction timeouts in certain cases.");
+         _log.error("It wasn't possible to locate javax.transaction.TransactionManager via the RA properties TransactionManagerLocatorClass and TransactionManagerLocatorMethod");
+         throw new ResourceAdapterInternalException("Could not locate javax.transaction.TransactionManager");
       }
       else
       {

Modified: qpid/branches/qpid-3767/qpid/java/jca/src/main/java/org/apache/qpid/ra/admin/QpidConnectionFactoryProxy.java
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/jca/src/main/java/org/apache/qpid/ra/admin/QpidConnectionFactoryProxy.java?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/jca/src/main/java/org/apache/qpid/ra/admin/QpidConnectionFactoryProxy.java (original)
+++ qpid/branches/qpid-3767/qpid/java/jca/src/main/java/org/apache/qpid/ra/admin/QpidConnectionFactoryProxy.java Wed May  2 13:09:18 2012
@@ -77,17 +77,17 @@ public class QpidConnectionFactoryProxy 
 
     public void writeExternal(ObjectOutput out) throws IOException
     {
-        if (_delegate == null)
-        {
-            _log.error("Null Destination ");
-            throw new IOException("Null ConnectionFactory!");
-        }
 
         try
         {
+            if(_delegate == null)
+            {
+                getReference();
+            }
+
             out.writeObject(((Referenceable) _delegate).getReference());
         }
-        catch (NamingException e)
+        catch (Exception e)
         {
             _log.error("Failed to dereference ConnectionFactory " + e.getMessage(), e);
             throw new IOException("Failed to dereference ConnectionFactory: " + e.getMessage());
@@ -137,7 +137,20 @@ public class QpidConnectionFactoryProxy 
     */
    public Connection createConnection() throws JMSException
    {
-       return _delegate.createConnection();
+       try
+       {
+           if(_delegate == null)
+           {
+               getReference();
+           }
+
+           return _delegate.createConnection();
+       }
+       catch(Exception e)
+       {
+          throw new JMSException(e.getMessage());
+       }
+
    }
 
    /**

Modified: qpid/branches/qpid-3767/qpid/java/jca/src/main/java/org/apache/qpid/ra/tm/JBoss7TransactionManagerLocator.java
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/jca/src/main/java/org/apache/qpid/ra/tm/JBoss7TransactionManagerLocator.java?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/jca/src/main/java/org/apache/qpid/ra/tm/JBoss7TransactionManagerLocator.java (original)
+++ qpid/branches/qpid-3767/qpid/java/jca/src/main/java/org/apache/qpid/ra/tm/JBoss7TransactionManagerLocator.java Wed May  2 13:09:18 2012
@@ -1,3 +1,23 @@
+/*
+ *
+ * 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.
+ *
+ */
 package org.apache.qpid.ra.tm;
 
 import javax.naming.InitialContext;

Modified: qpid/branches/qpid-3767/qpid/java/jca/src/main/resources/META-INF/ra.xml
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/jca/src/main/resources/META-INF/ra.xml?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/jca/src/main/resources/META-INF/ra.xml (original)
+++ qpid/branches/qpid-3767/qpid/java/jca/src/main/resources/META-INF/ra.xml Wed May  2 13:09:18 2012
@@ -69,7 +69,7 @@
     </config-property>
 
     <config-property>
-      <description>Interval between setup attempts</description>
+      <description>Interval between setup attempts in milliseconds</description>
       <config-property-name>SetupInterval</config-property-name>
       <config-property-type>java.lang.Long</config-property-type>
       <config-property-value>5000</config-property-value>
@@ -104,10 +104,10 @@
     </config-property>
 
     <config-property>
-      <description>connection URL</description>
+      <description>Connection URL</description>
       <config-property-name>ConnectionURL</config-property-name>
       <config-property-type>java.lang.String</config-property-type>
-      <config-property-value>amqp://guest:guest@/test?brokerlist='tcp://localhost:5672'</config-property-value>
+      <config-property-value>amqp://anonymous:passwd@client/test?brokerlist='tcp://localhost?sasl_mechs='PLAIN''</config-property-value>
     </config-property>
 
     <outbound-resourceadapter>
@@ -116,14 +116,14 @@
 
         <config-property>
           <description>Default session type</description>
-          <config-property-name>sessionDefaultType</config-property-name>
+          <config-property-name>SessionDefaultType</config-property-name>
           <config-property-type>java.lang.String</config-property-type>
           <config-property-value>javax.jms.Queue</config-property-value>
         </config-property>
 
         <config-property>
           <description>Specify lock timeout in seconds</description>
-          <config-property-name>useTryLock</config-property-name>
+          <config-property-name>UseTryLock</config-property-name>
           <config-property-type>java.lang.Integer</config-property-type>
           <config-property-value>0</config-property-value>
         </config-property>
@@ -137,7 +137,7 @@
 
         <config-property>
           <description>Client ID for the connection</description>
-          <config-property-name>ClientID</config-property-name>
+          <config-property-name>ClientId</config-property-name>
           <config-property-type>java.lang.String</config-property-type>
           <config-property-value>client_id</config-property-value>
         </config-property>
@@ -195,12 +195,11 @@
           </messagelistener>
         </messageadapter>
       </inbound-resourceadapter>
-
       <adminobject>
             <adminobject-interface>org.apache.qpid.ra.admin.QpidQueue</adminobject-interface>
             <adminobject-class> org.apache.qpid.ra.admin.QpidQueueImpl</adminobject-class>
             <config-property>
-                <config-property-name>destinationAddress </config-property-name>
+                <config-property-name>DestinationAddress </config-property-name>
                 <config-property-type>java.lang.String </config-property-type>
             </config-property>
         </adminobject>
@@ -208,30 +207,16 @@
             <adminobject-interface>org.apache.qpid.ra.admin.QpidTopic</adminobject-interface>
             <adminobject-class> org.apache.qpid.ra.admin.QpidTopicImpl</adminobject-class>
             <config-property>
-                <config-property-name>destinationAddress </config-property-name>
-                <config-property-type>java.lang.String </config-property-type>
-            </config-property>
-        </adminobject>
-      <!--
-      <adminobject>
-            <adminobject-interface>javax.jms.Destination</adminobject-interface>
-            <adminobject-class> org.apache.qpid.ra.admin.QpidDestinationProxy</adminobject-class>
-            <config-property>
-                <config-property-name>destinationAddress </config-property-name>
-                <config-property-type>java.lang.String </config-property-type>
-            </config-property>
-            <config-property>
-                <config-property-name>destinationType</config-property-name>
+                <config-property-name>DestinationAddress </config-property-name>
                 <config-property-type>java.lang.String </config-property-type>
             </config-property>
         </adminobject>
-      -->
       <adminobject>
             <adminobject-interface>javax.jms.ConnectionFactory</adminobject-interface>
             <adminobject-class> org.apache.qpid.ra.admin.QpidConnectionFactoryProxy</adminobject-class>
             <config-property>
-                <config-property-name>connectionURL</config-property-name>
-                <config-property-type>java.lang.String </config-property-type>
+                <config-property-name>ConnectionURL</config-property-name>
+                <config-property-type>java.lang.String</config-property-type>
             </config-property>
         </adminobject>
    </resourceadapter>

Modified: qpid/branches/qpid-3767/qpid/java/jca/src/test/java/org/apache/qpid/ra/QpidResourceAdapterTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/jca/src/test/java/org/apache/qpid/ra/QpidResourceAdapterTest.java?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/jca/src/test/java/org/apache/qpid/ra/QpidResourceAdapterTest.java (original)
+++ qpid/branches/qpid-3767/qpid/java/jca/src/test/java/org/apache/qpid/ra/QpidResourceAdapterTest.java Wed May  2 13:09:18 2012
@@ -20,9 +20,11 @@
  */
 package org.apache.qpid.ra;
 
+import javax.resource.spi.ResourceAdapterInternalException;
 
 import junit.framework.TestCase;
 
+
 public class QpidResourceAdapterTest extends TestCase
 {
     public void testGetXAResources() throws Exception
@@ -31,4 +33,33 @@ public class QpidResourceAdapterTest ext
         assertNull(ra.getXAResources(null));
     }
 
+    public void testTransactionManagerLocatorException() throws Exception
+    {
+
+        QpidResourceAdapter ra = new QpidResourceAdapter();
+        assertNull(ra.getTransactionManagerLocatorClass());
+        assertNull(ra.getTransactionManagerLocatorMethod());
+
+        try
+        {
+            ra.start(null);
+        }
+        catch(ResourceAdapterInternalException e)
+        {
+
+        }
+
+        ra.setTransactionManagerLocatorClass("DummyLocator");
+
+        try
+        {
+            ra.start(null);
+        }
+        catch(ResourceAdapterInternalException e)
+        {
+
+        }
+
+    }
+
 }

Propchange: qpid/branches/qpid-3767/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java:r1306564-1332660

Propchange: qpid/branches/qpid-3767/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java:r1306564-1332660

Propchange: qpid/branches/qpid-3767/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java:r1306564-1332660

Propchange: qpid/branches/qpid-3767/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java:r1306564-1332660

Propchange: qpid/branches/qpid-3767/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java:r1306564-1332660

Propchange: qpid/branches/qpid-3767/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java:r1306564-1332660

Propchange: qpid/branches/qpid-3767/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java:r1306564-1332660

Propchange: qpid/branches/qpid-3767/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java:r1306564-1332660

Propchange: qpid/branches/qpid-3767/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java:r1306564-1332660

Propchange: qpid/branches/qpid-3767/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java:r1306564-1332660

Propchange: qpid/branches/qpid-3767/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java:r1306564-1332660

Propchange: qpid/branches/qpid-3767/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java:r1306564-1332660

Propchange: qpid/branches/qpid-3767/qpid/java/management/eclipse-plugin/src/
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/management/eclipse-plugin/src:r1306564-1332660

Propchange: qpid/branches/qpid-3767/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java:r1306564-1332660

Propchange: qpid/branches/qpid-3767/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java:r1306564-1332660

Propchange: qpid/branches/qpid-3767/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java:r1306564-1332660

Propchange: qpid/branches/qpid-3767/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java:r1306564-1332660

Propchange: qpid/branches/qpid-3767/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc:r1306564-1332660

Modified: qpid/branches/qpid-3767/qpid/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ManagementConsoleTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ManagementConsoleTest.java?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ManagementConsoleTest.java (original)
+++ qpid/branches/qpid-3767/qpid/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ManagementConsoleTest.java Wed May  2 13:09:18 2012
@@ -24,6 +24,7 @@ import org.apache.qpid.exchange.Exchange
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.server.exchange.DirectExchange;
 import org.apache.qpid.server.management.AMQManagedObject;
+import org.apache.qpid.server.model.UUIDGenerator;
 import org.apache.qpid.server.queue.AMQQueue;
 import org.apache.qpid.server.queue.AMQQueueFactory;
 import org.apache.qpid.server.queue.AMQQueueMBean;
@@ -36,6 +37,7 @@ import javax.management.MBeanFeatureInfo
 import javax.management.MBeanInfo;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.UUID;
 
 
 /**
@@ -86,7 +88,7 @@ public class ManagementConsoleTest exten
         // If this test fails due to changes in the broker code,
         // then the constants in the Constants.java shoule be updated accordingly 
         DirectExchange exchange = new DirectExchange();
-        exchange.initialise(_virtualHost, ExchangeDefaults.DIRECT_EXCHANGE_NAME, false, 0, true);
+        exchange.initialise(UUIDGenerator.generateUUID(), _virtualHost, ExchangeDefaults.DIRECT_EXCHANGE_NAME, false, 0, true);
         AMQManagedObject mbean = (AMQManagedObject)exchange.getManagedObject();
         MBeanInfo mbeanInfo = mbean.getMBeanInfo();
 

Modified: qpid/branches/qpid-3767/qpid/java/module.xml
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/module.xml?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/module.xml (original)
+++ qpid/branches/qpid-3767/qpid/java/module.xml Wed May  2 13:09:18 2012
@@ -349,7 +349,7 @@
       <sysproperty key="log4j.configuration" value="${log4j.configuration}"/>
       <sysproperty key="java.naming.factory.initial" value="${java.naming.factory.initial}"/>
       <sysproperty key="java.naming.provider.url" value="${java.naming.provider.url}"/>
-      <sysproperty key="messagestore.class.name" value="${messagestore.class.name}" />
+      <sysproperty key="messagestorefactory.class.name" value="${messagestorefactory.class.name}" />
       <sysproperty key="test.output" value="${module.results}"/>
       <sysproperty key="qpid.amqp.version" value="${qpid.amqp.version}"/>
 

Modified: qpid/branches/qpid-3767/qpid/java/systests/build.xml
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/systests/build.xml?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/systests/build.xml (original)
+++ qpid/branches/qpid-3767/qpid/java/systests/build.xml Wed May  2 13:09:18 2012
@@ -27,7 +27,7 @@ nn - or more contributor license agreeme
         </and>
     </condition>
 
-    <property name="module.depends" value="client management/common broker broker/test common common/test junit-toolkit jca ${systests.optional.depends}"/>
+    <property name="module.depends" value="client management/common broker broker/test common amqp-1-0-common common/test jca ${systests.optional.depends}"/>
     <property name="module.test.src" location="src/main/java"/>
     <property name="module.test.excludes"
               value="**/DropInTest.java,**/TestClientControlledTest.java"/>

Modified: qpid/branches/qpid-3767/qpid/java/systests/etc/virtualhosts-systests-bdb-settings.xml
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/systests/etc/virtualhosts-systests-bdb-settings.xml?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/systests/etc/virtualhosts-systests-bdb-settings.xml (original)
+++ qpid/branches/qpid-3767/qpid/java/systests/etc/virtualhosts-systests-bdb-settings.xml Wed May  2 13:09:18 2012
@@ -26,7 +26,7 @@
         <name>localhost</name>
         <localhost>
             <store>
-                <class>org.apache.qpid.server.store.berkeleydb.BDBMessageStore</class>
+                <factoryclass>org.apache.qpid.server.store.berkeleydb.BDBMessageStoreFactory</factoryclass>
                 <environment-path>${work}/bdbstore/localhost-store</environment-path>
             </store>
         </localhost>
@@ -36,7 +36,7 @@
         <name>development</name>
         <development>
             <store>
-                <class>org.apache.qpid.server.store.berkeleydb.BDBMessageStore</class>
+                <factoryclass>org.apache.qpid.server.store.berkeleydb.BDBMessageStoreFactory</factoryclass>
                 <environment-path>${work}/bdbstore/development-store</environment-path>
             </store>
         </development>
@@ -46,7 +46,7 @@
         <name>test</name>
         <test>
             <store>
-                <class>org.apache.qpid.server.store.berkeleydb.BDBMessageStore</class>
+                <factoryclass>org.apache.qpid.server.store.berkeleydb.BDBMessageStoreFactory</factoryclass>
                 <environment-path>${work}/bdbstore/test-store</environment-path>
             </store>
         </test>

Modified: qpid/branches/qpid-3767/qpid/java/systests/etc/virtualhosts-systests-derby-settings.xml
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/systests/etc/virtualhosts-systests-derby-settings.xml?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/systests/etc/virtualhosts-systests-derby-settings.xml (original)
+++ qpid/branches/qpid-3767/qpid/java/systests/etc/virtualhosts-systests-derby-settings.xml Wed May  2 13:09:18 2012
@@ -26,7 +26,7 @@
     <virtualhost>
         <localhost>
             <store>
-                <class>org.apache.qpid.server.store.DerbyMessageStore</class>
+                <factoryclass>org.apache.qpid.server.store.derby.DerbyMessageStoreFactory</factoryclass>
                 <environment-path>${QPID_WORK}/derbyDB/localhost-store</environment-path>
             </store>
         </localhost>
@@ -35,8 +35,8 @@
     <virtualhost>
         <development>
             <store>
-                <class>org.apache.qpid.server.store.DerbyMessageStore</class>
-                <environment-path>${QPID_WORK}/derbyDB/development-store</environment-path>                                        
+                <factoryclass>org.apache.qpid.server.store.derby.DerbyMessageStoreFactory</factoryclass>
+                <environment-path>${QPID_WORK}/derbyDB/development-store</environment-path>
             </store>
         </development>
     </virtualhost>
@@ -44,7 +44,7 @@
     <virtualhost>
         <test>
             <store>
-                <class>org.apache.qpid.server.store.DerbyMessageStore</class>
+                <factoryclass>org.apache.qpid.server.store.derby.DerbyMessageStoreFactory</factoryclass>
                 <environment-path>${QPID_WORK}/derbyDB/test-store</environment-path>
             </store>
         </test>

Modified: qpid/branches/qpid-3767/qpid/java/systests/etc/virtualhosts-systests-firewall-2.xml
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/systests/etc/virtualhosts-systests-firewall-2.xml?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/systests/etc/virtualhosts-systests-firewall-2.xml (original)
+++ qpid/branches/qpid-3767/qpid/java/systests/etc/virtualhosts-systests-firewall-2.xml Wed May  2 13:09:18 2012
@@ -26,7 +26,7 @@
         <name>test</name>
         <test>
             <store>
-                <class>org.apache.qpid.server.store.MemoryMessageStore</class>
+                <factoryclass>org.apache.qpid.server.store.MemoryMessageStoreFactory</factoryclass>
             </store>
         </test>
     </virtualhost>
@@ -35,7 +35,7 @@
         <name>test2</name>
         <test2>
             <store>
-                <class>org.apache.qpid.server.store.MemoryMessageStore</class>
+                <factoryclass>org.apache.qpid.server.store.MemoryMessageStoreFactory</factoryclass>
             </store>
             <security>
 		        <firewall default-action="deny">

Modified: qpid/branches/qpid-3767/qpid/java/systests/etc/virtualhosts-systests-firewall-3.xml
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/systests/etc/virtualhosts-systests-firewall-3.xml?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/systests/etc/virtualhosts-systests-firewall-3.xml (original)
+++ qpid/branches/qpid-3767/qpid/java/systests/etc/virtualhosts-systests-firewall-3.xml Wed May  2 13:09:18 2012
@@ -26,7 +26,7 @@
         <name>test</name>
         <test>
             <store>
-                <class>org.apache.qpid.server.store.MemoryMessageStore</class>
+                <factoryclass>org.apache.qpid.server.store.MemoryMessageStoreFactory</factoryclass>
             </store>
         </test>
     </virtualhost>
@@ -35,7 +35,7 @@
         <name>test2</name>
         <test2>
             <store>
-                <class>org.apache.qpid.server.store.MemoryMessageStore</class>
+                <factoryclass>org.apache.qpid.server.store.MemoryMessageStoreFactory</factoryclass>
             </store>
             <security>
 	            <firewall default-action="deny"/>

Modified: qpid/branches/qpid-3767/qpid/java/systests/src/main/java/org/apache/qpid/client/redelivered/RedeliveredMessageTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/systests/src/main/java/org/apache/qpid/client/redelivered/RedeliveredMessageTest.java?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/systests/src/main/java/org/apache/qpid/client/redelivered/RedeliveredMessageTest.java (original)
+++ qpid/branches/qpid-3767/qpid/java/systests/src/main/java/org/apache/qpid/client/redelivered/RedeliveredMessageTest.java Wed May  2 13:09:18 2012
@@ -1,3 +1,23 @@
+/*
+ *
+ * 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.
+ *
+ */
 package org.apache.qpid.client.redelivered;
 
 import org.apache.qpid.test.utils.QpidBrokerTestCase;

Modified: qpid/branches/qpid-3767/qpid/java/systests/src/main/java/org/apache/qpid/jms/xa/XAResourceTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/systests/src/main/java/org/apache/qpid/jms/xa/XAResourceTest.java?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/systests/src/main/java/org/apache/qpid/jms/xa/XAResourceTest.java (original)
+++ qpid/branches/qpid-3767/qpid/java/systests/src/main/java/org/apache/qpid/jms/xa/XAResourceTest.java Wed May  2 13:09:18 2012
@@ -90,15 +90,6 @@ public class XAResourceTest extends Qpid
     }
 
     @Override
-    public void stopBroker(int port) throws Exception
-    {
-        if (isBrokerPresent(port))
-        {
-            super.stopBroker(port);
-        }
-    }
-
-    @Override
     public void tearDown() throws Exception
     {
         try

Modified: qpid/branches/qpid-3767/qpid/java/systests/src/main/java/org/apache/qpid/ra/QpidRAConnectionTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/systests/src/main/java/org/apache/qpid/ra/QpidRAConnectionTest.java?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/systests/src/main/java/org/apache/qpid/ra/QpidRAConnectionTest.java (original)
+++ qpid/branches/qpid-3767/qpid/java/systests/src/main/java/org/apache/qpid/ra/QpidRAConnectionTest.java Wed May  2 13:09:18 2012
@@ -86,12 +86,4 @@ public class QpidRAConnectionTest extend
             c.close();
         }
     }
-    @Override
-    public void stopBroker(int port) throws Exception
-    {
-        if (isBrokerPresent(port))
-        {
-            super.stopBroker(port);
-        }
-    }
 }

Modified: qpid/branches/qpid-3767/qpid/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3767/qpid/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java?rev=1333027&r1=1333026&r2=1333027&view=diff
==============================================================================
--- qpid/branches/qpid-3767/qpid/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java (original)
+++ qpid/branches/qpid-3767/qpid/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java Wed May  2 13:09:18 2012
@@ -77,6 +77,7 @@ public class SupportedProtocolVersionsTe
     public void testDisabling010() throws Exception
     {
         //disable 0-10 support
+        setConfigurationProperty("connector.amqp10enabled", "false");
         setConfigurationProperty("connector.amqp010enabled", "false");
 
         super.setUp();
@@ -92,6 +93,7 @@ public class SupportedProtocolVersionsTe
     public void testDisabling091and010() throws Exception
     {
         //disable 0-91 and 0-10 support
+        setConfigurationProperty(ServerConfiguration.CONNECTOR_AMQP10ENABLED, "false");
         setConfigurationProperty(ServerConfiguration.CONNECTOR_AMQP010ENABLED, "false");
         setConfigurationProperty(ServerConfiguration.CONNECTOR_AMQP091ENABLED, "false");
 
@@ -111,6 +113,7 @@ public class SupportedProtocolVersionsTe
         setConfigurationProperty(ServerConfiguration.CONNECTOR_AMQP09ENABLED, "false");
         setConfigurationProperty(ServerConfiguration.CONNECTOR_AMQP091ENABLED, "false");
         setConfigurationProperty(ServerConfiguration.CONNECTOR_AMQP010ENABLED, "false");
+        setConfigurationProperty(ServerConfiguration.CONNECTOR_AMQP10ENABLED, "false");
 
         super.setUp();
 

Propchange: qpid/branches/qpid-3767/qpid/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java:r1306564-1332660



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message