activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r426431 [2/14] - in /incubator/activemq/branches/activemq-4.0: activemq-core/src/gram/script/ activemq-core/src/main/java/org/apache/activemq/kaha/impl/ activemq-core/src/main/java/org/apache/activemq/openwire/v1/ activemq-core/src/test/jav...
Date Fri, 28 Jul 2006 08:22:55 GMT
Modified: incubator/activemq/branches/activemq-4.0/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ConsumerControlMarshaller.cs
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ConsumerControlMarshaller.cs?rev=426431&r1=426430&r2=426431&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ConsumerControlMarshaller.cs (original)
+++ incubator/activemq/branches/activemq-4.0/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ConsumerControlMarshaller.cs Fri Jul 28 01:22:48 2006
@@ -1 +1,120 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*     http://www.apache.org/licenses/LICENSE-2.0
*
* 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.
*/

//
// NOTE!: This file is autogenerated - do not modify!
//        if you need to make a change, please see the Groovy scripts in the
//        activemq-core module
//

using System;
using System.Collections;
using System.IO;

using ActiveMQ.Commands;
using ActiveMQ.OpenWire;
using ActiveMQ.OpenWire.V1;

namespace ActiveMQ.OpenWire.V1
{
  /// <summary
 >
  ///  Marshalling code for Open Wire Format for ConsumerControl
  /// </summary>
  class ConsumerControlMarshaller : BaseCommandMarshaller
  {


    public override DataStructure CreateObject() 
    {
        return new ConsumerControl();
    }

    public override byte GetDataStructureType() 
    {
        return ConsumerControl.ID_ConsumerControl;
    }

    // 
    // Un-marshal an object instance from the data input stream
    // 
    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
    {
        base.TightUnmarshal(wireFormat, o, dataIn, bs);

        ConsumerControl info = (ConsumerControl)o;
        info.Close = bs.ReadBoolean();
        info.ConsumerId = (ConsumerId) TightUnmarshalNestedObject(wireFormat, dataIn, bs);
        info.Prefetch = dataIn.ReadInt32();

    }

    //
    // Write the booleans that this object uses to a BooleanStream
    //
    public override int TightMarshal1(OpenWireFormat 
 wireFormat, Object o, BooleanStream bs) {
        ConsumerControl info = (ConsumerControl)o;

        int rc = base.TightMarshal1(wireFormat, info, bs);
        bs.WriteBoolean(info.Close);
        rc += TightMarshalNestedObject1(wireFormat, (DataStructure)info.ConsumerId, bs);

        return rc + 4;
    }

    // 
    // Write a object instance to data output stream
    //
    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
        base.TightMarshal2(wireFormat, o, dataOut, bs);

        ConsumerControl info = (ConsumerControl)o;
        bs.ReadBoolean();
        TightMarshalNestedObject2(wireFormat, (DataStructure)info.ConsumerId, dataOut, bs);
        dataOut.Write(info.Prefetch);

    }

    // 
    // Un-marshal an object instance from the data input stream
    // 
    public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn) 
    {
        base.LooseUnmarshal(wireForm
 at, o, dataIn);

        ConsumerControl info = (ConsumerControl)o;
        info.Close = dataIn.ReadBoolean();
        info.ConsumerId = (ConsumerId) LooseUnmarshalNestedObject(wireFormat, dataIn);
        info.Prefetch = dataIn.ReadInt32();

    }

    // 
    // Write a object instance to data output stream
    //
    public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {

        ConsumerControl info = (ConsumerControl)o;

        base.LooseMarshal(wireFormat, o, dataOut);
        dataOut.Write(info.Close);
        LooseMarshalNestedObject(wireFormat, (DataStructure)info.ConsumerId, dataOut);
        dataOut.Write(info.Prefetch);

    }
    
  }
}
\ No newline at end of file
+/*
+* Copyright 2006 The Apache Software Foundation or its licensors, as
+* applicable.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* 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.
+*/
+
+//
+// NOTE!: This file is autogenerated - do not modify!
+//        if you need to make a change, please see the Groovy scripts in the
+//        activemq-core module
+//
+
+using System;
+using System.Collections;
+using System.IO;
+
+using ActiveMQ.Commands;
+using ActiveMQ.OpenWire;
+using ActiveMQ.OpenWire.V1;
+
+namespace ActiveMQ.OpenWire.V1
+{
+  /// <summary>
+  ///  Marshalling code for Open Wire Format for ConsumerControl
+  /// </summary>
+  class ConsumerControlMarshaller : BaseCommandMarshaller
+  {
+
+
+    public override DataStructure CreateObject() 
+    {
+        return new ConsumerControl();
+    }
+
+    public override byte GetDataStructureType() 
+    {
+        return ConsumerControl.ID_ConsumerControl;
+    }
+
+    // 
+    // Un-marshal an object instance from the data input stream
+    // 
+    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+    {
+        base.TightUnmarshal(wireFormat, o, dataIn, bs);
+
+        ConsumerControl info = (ConsumerControl)o;
+        info.Close = bs.ReadBoolean();
+        info.ConsumerId = (ConsumerId) TightUnmarshalNestedObject(wireFormat, dataIn, bs);
+        info.Prefetch = dataIn.ReadInt32();
+
+    }
+
+    //
+    // Write the booleans that this object uses to a BooleanStream
+    //
+    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
+        ConsumerControl info = (ConsumerControl)o;
+
+        int rc = base.TightMarshal1(wireFormat, info, bs);
+        bs.WriteBoolean(info.Close);
+        rc += TightMarshalNestedObject1(wireFormat, (DataStructure)info.ConsumerId, bs);
+
+        return rc + 4;
+    }
+
+    // 
+    // Write a object instance to data output stream
+    //
+    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
+        base.TightMarshal2(wireFormat, o, dataOut, bs);
+
+        ConsumerControl info = (ConsumerControl)o;
+        bs.ReadBoolean();
+        TightMarshalNestedObject2(wireFormat, (DataStructure)info.ConsumerId, dataOut, bs);
+        dataOut.Write(info.Prefetch);
+
+    }
+
+    // 
+    // Un-marshal an object instance from the data input stream
+    // 
+    public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn) 
+    {
+        base.LooseUnmarshal(wireFormat, o, dataIn);
+
+        ConsumerControl info = (ConsumerControl)o;
+        info.Close = dataIn.ReadBoolean();
+        info.ConsumerId = (ConsumerId) LooseUnmarshalNestedObject(wireFormat, dataIn);
+        info.Prefetch = dataIn.ReadInt32();
+
+    }
+
+    // 
+    // Write a object instance to data output stream
+    //
+    public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
+
+        ConsumerControl info = (ConsumerControl)o;
+
+        base.LooseMarshal(wireFormat, o, dataOut);
+        dataOut.Write(info.Close);
+        LooseMarshalNestedObject(wireFormat, (DataStructure)info.ConsumerId, dataOut);
+        dataOut.Write(info.Prefetch);
+
+    }
+    
+  }
+}

Propchange: incubator/activemq/branches/activemq-4.0/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ConsumerControlMarshaller.cs
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/activemq/branches/activemq-4.0/activemq-rar/pom.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/activemq-rar/pom.xml?rev=426431&r1=426430&r2=426431&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/activemq-rar/pom.xml (original)
+++ incubator/activemq/branches/activemq-4.0/activemq-rar/pom.xml Fri Jul 28 01:22:48 2006
@@ -1,201 +1,201 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-    Copyright 2005-2006 The Apache Software Foundation
-   
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-   
-    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.
--->
-
-<project
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns="http://maven.apache.org/POM/4.0.0">
-  
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>incubator-activemq</groupId>
-    <artifactId>activemq-parent</artifactId>
-    <version>4.0.2-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
-  </parent>
-
-  <artifactId>activemq-rar</artifactId>
-  <packaging>rar</packaging>
-  <name>ActiveMQ :: RAR</name>
-  <description>A JCA Resource Adapter used to integrate ActiveMQ with transactional enterprise containers</description>
-
-  <dependencies>
-  
-    <!-- activemq -->
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>activemq-ra</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.geronimo.specs</groupId>
-          <artifactId>geronimo-jms_1.1_spec</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.geronimo.specs</groupId>
-          <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.geronimo.specs</groupId>
-          <artifactId>geronimo-ejb_2.1_spec</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.geronimo.specs</groupId>
-          <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.geronimo.specs</groupId>
-          <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.geronimo.specs</groupId>
-          <artifactId>geronimo-servlet_2.4_spec</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.geronimo.specs</groupId>
-          <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
-        </exclusion>
-        <exclusion>
-           <groupId>mx4j</groupId>
-           <artifactId>mx4j</artifactId>
-        </exclusion>
-        <exclusion>
-           <groupId>geronimo</groupId>
-           <artifactId>geronimo-kernel</artifactId>
-        </exclusion>
-        <exclusion>
-           <groupId>geronimo</groupId>
-           <artifactId>geronimo-j2ee</artifactId>
-        </exclusion>
-        <exclusion>
-           <groupId>axion</groupId>
-           <artifactId>axion</artifactId>
-        </exclusion>
-        <exclusion>
-           <groupId>${pom.groupId}</groupId>
-           <artifactId>activemq-jaas</artifactId>
-        </exclusion>
-        <exclusion>
-           <groupId>howl</groupId>
-           <artifactId>howl-logger</artifactId>
-        </exclusion>
-        <exclusion>
-           <groupId>activemq</groupId>
-           <artifactId>smackx</artifactId>
-        </exclusion>
-        <exclusion>
-           <groupId>activemq</groupId>
-           <artifactId>smack</artifactId>
-        </exclusion>
-        <exclusion>
-           <groupId>mx4j</groupId>
-           <artifactId>mx4j-jmx</artifactId>
-        </exclusion>
-        <exclusion>
-           <groupId>mx4j</groupId>
-           <artifactId>mx4j-impl</artifactId>
-        </exclusion>
-        <exclusion>
-           <groupId>mx4j</groupId>
-           <artifactId>mx4j-remote</artifactId>
-        </exclusion>
-        <exclusion>
-           <groupId>mx4j</groupId>
-           <artifactId>mx4j-tools</artifactId>
-        </exclusion>
-        <exclusion>
-           <groupId>qdox</groupId>
-           <artifactId>qdox</artifactId>
-        </exclusion>
-        <exclusion>
-           <groupId>stax</groupId>
-           <artifactId>stax-api</artifactId>
-        </exclusion>
-        <exclusion>
-           <groupId>stax</groupId>
-           <artifactId>stax</artifactId>
-        </exclusion>
-        <exclusion>
-           <groupId>log4j</groupId>
-           <artifactId>log4j</artifactId>
-        </exclusion>
-        <exclusion>
-           <groupId>junit</groupId>
-           <artifactId>junit</artifactId>
-        </exclusion>
-        <exclusion>
-           <groupId>regexp</groupId>
-           <artifactId>regexp</artifactId>
-        </exclusion>
-        <exclusion>
-           <groupId>activemq</groupId>
-           <artifactId>jmdns</artifactId>
-        </exclusion>
-        <exclusion>
-           <groupId>xalan</groupId>
-           <artifactId>xalan</artifactId>
-        </exclusion>
-        <exclusion>
-           <groupId>xmlbeans</groupId>
-           <artifactId>xbean</artifactId>
-        </exclusion>
-        <exclusion>
-           <groupId>xmlbeans</groupId>
-           <artifactId>xmlpublic</artifactId>
-        </exclusion>
-        <exclusion>
-           <groupId>xmlbeans</groupId>
-           <artifactId>xbean_xpath</artifactId>
-        </exclusion>
-        <exclusion>
-           <groupId>xerces</groupId>
-           <artifactId>xercesImpl</artifactId>
-        </exclusion>
-        <exclusion>
-           <groupId>xml-apis</groupId>
-           <artifactId>xml-apis</artifactId>
-        </exclusion>
-        <exclusion>
-           <groupId>ant</groupId>
-           <artifactId>ant</artifactId>
-        </exclusion>
-        <exclusion>
-           <groupId>commons-collections</groupId>
-           <artifactId>commons-collections</artifactId>
-        </exclusion>
-        <exclusion>
-           <groupId>commons-primitives</groupId>
-           <artifactId>commons-primitives</artifactId>
-        </exclusion>
-        <exclusion>
-           <groupId>commons-pool</groupId>
-           <artifactId>commons-pool</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.xbean</groupId>
-      <artifactId>xbean-spring</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.derby</groupId>
-      <artifactId>derby</artifactId>
-    </dependency>
-  </dependencies>
-  
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+    Copyright 2005-2006 The Apache Software Foundation
+   
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+   
+    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.
+-->
+
+<project
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns="http://maven.apache.org/POM/4.0.0">
+  
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>incubator-activemq</groupId>
+    <artifactId>activemq-parent</artifactId>
+    <version>4.0.2-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <artifactId>activemq-rar</artifactId>
+  <packaging>rar</packaging>
+  <name>ActiveMQ :: RAR</name>
+  <description>A JCA Resource Adapter used to integrate ActiveMQ with transactional enterprise containers</description>
+
+  <dependencies>
+  
+    <!-- activemq -->
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>activemq-ra</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.geronimo.specs</groupId>
+          <artifactId>geronimo-jms_1.1_spec</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.geronimo.specs</groupId>
+          <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.geronimo.specs</groupId>
+          <artifactId>geronimo-ejb_2.1_spec</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.geronimo.specs</groupId>
+          <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.geronimo.specs</groupId>
+          <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.geronimo.specs</groupId>
+          <artifactId>geronimo-servlet_2.4_spec</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.geronimo.specs</groupId>
+          <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
+        </exclusion>
+        <exclusion>
+           <groupId>mx4j</groupId>
+           <artifactId>mx4j</artifactId>
+        </exclusion>
+        <exclusion>
+           <groupId>geronimo</groupId>
+           <artifactId>geronimo-kernel</artifactId>
+        </exclusion>
+        <exclusion>
+           <groupId>geronimo</groupId>
+           <artifactId>geronimo-j2ee</artifactId>
+        </exclusion>
+        <exclusion>
+           <groupId>axion</groupId>
+           <artifactId>axion</artifactId>
+        </exclusion>
+        <exclusion>
+           <groupId>${pom.groupId}</groupId>
+           <artifactId>activemq-jaas</artifactId>
+        </exclusion>
+        <exclusion>
+           <groupId>howl</groupId>
+           <artifactId>howl-logger</artifactId>
+        </exclusion>
+        <exclusion>
+           <groupId>activemq</groupId>
+           <artifactId>smackx</artifactId>
+        </exclusion>
+        <exclusion>
+           <groupId>activemq</groupId>
+           <artifactId>smack</artifactId>
+        </exclusion>
+        <exclusion>
+           <groupId>mx4j</groupId>
+           <artifactId>mx4j-jmx</artifactId>
+        </exclusion>
+        <exclusion>
+           <groupId>mx4j</groupId>
+           <artifactId>mx4j-impl</artifactId>
+        </exclusion>
+        <exclusion>
+           <groupId>mx4j</groupId>
+           <artifactId>mx4j-remote</artifactId>
+        </exclusion>
+        <exclusion>
+           <groupId>mx4j</groupId>
+           <artifactId>mx4j-tools</artifactId>
+        </exclusion>
+        <exclusion>
+           <groupId>qdox</groupId>
+           <artifactId>qdox</artifactId>
+        </exclusion>
+        <exclusion>
+           <groupId>stax</groupId>
+           <artifactId>stax-api</artifactId>
+        </exclusion>
+        <exclusion>
+           <groupId>stax</groupId>
+           <artifactId>stax</artifactId>
+        </exclusion>
+        <exclusion>
+           <groupId>log4j</groupId>
+           <artifactId>log4j</artifactId>
+        </exclusion>
+        <exclusion>
+           <groupId>junit</groupId>
+           <artifactId>junit</artifactId>
+        </exclusion>
+        <exclusion>
+           <groupId>regexp</groupId>
+           <artifactId>regexp</artifactId>
+        </exclusion>
+        <exclusion>
+           <groupId>activemq</groupId>
+           <artifactId>jmdns</artifactId>
+        </exclusion>
+        <exclusion>
+           <groupId>xalan</groupId>
+           <artifactId>xalan</artifactId>
+        </exclusion>
+        <exclusion>
+           <groupId>xmlbeans</groupId>
+           <artifactId>xbean</artifactId>
+        </exclusion>
+        <exclusion>
+           <groupId>xmlbeans</groupId>
+           <artifactId>xmlpublic</artifactId>
+        </exclusion>
+        <exclusion>
+           <groupId>xmlbeans</groupId>
+           <artifactId>xbean_xpath</artifactId>
+        </exclusion>
+        <exclusion>
+           <groupId>xerces</groupId>
+           <artifactId>xercesImpl</artifactId>
+        </exclusion>
+        <exclusion>
+           <groupId>xml-apis</groupId>
+           <artifactId>xml-apis</artifactId>
+        </exclusion>
+        <exclusion>
+           <groupId>ant</groupId>
+           <artifactId>ant</artifactId>
+        </exclusion>
+        <exclusion>
+           <groupId>commons-collections</groupId>
+           <artifactId>commons-collections</artifactId>
+        </exclusion>
+        <exclusion>
+           <groupId>commons-primitives</groupId>
+           <artifactId>commons-primitives</artifactId>
+        </exclusion>
+        <exclusion>
+           <groupId>commons-pool</groupId>
+           <artifactId>commons-pool</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.xbean</groupId>
+      <artifactId>xbean-spring</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derby</artifactId>
+    </dependency>
+  </dependencies>
+  
+</project>

Propchange: incubator/activemq/branches/activemq-4.0/activemq-rar/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/activemq/branches/activemq-4.0/activemq-rar/src/main/rar/META-INF/ra.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/activemq-rar/src/main/rar/META-INF/ra.xml?rev=426431&r1=426430&r2=426431&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/activemq-rar/src/main/rar/META-INF/ra.xml (original)
+++ incubator/activemq/branches/activemq-4.0/activemq-rar/src/main/rar/META-INF/ra.xml Fri Jul 28 01:22:48 2006
@@ -1,167 +1,167 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Copyright 2005-2006 The Apache Software Foundation
-   
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-   
-    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.
--->
-
-<connector xmlns="http://java.sun.com/xml/ns/j2ee"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
-    http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"
-    version="1.5">
-    <description>ActiveMQ  inbound and outbound JMS ResourceAdapter</description>
-    <display-name>ActiveMQ JMS Resource Adapter</display-name>
-    <vendor-name>activemq.org</vendor-name>
-    <eis-type>JMS 1.1</eis-type>
-    <resourceadapter-version>1.0</resourceadapter-version>
-    <license>
-        <description>
-        
-            Copyright 2005-2006 The Apache Software Foundation
-           
-            Licensed under the Apache License, Version 2.0 (the "License");
-            you may not use this file except in compliance with the License.
-            You may obtain a copy of the License at
-           
-            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.
-
-        </description>
-        <license-required>true</license-required>
-    </license>
-    <resourceadapter>
-        <resourceadapter-class>org.apache.activemq.ra.ActiveMQResourceAdapter</resourceadapter-class>
-        <config-property>
-            <description>
-              The URL to the ActiveMQ server that you want this connection to connect to.  If using
-              an embedded broker, this value should be 'vm://localhost'.
-            </description>
-            <config-property-name>ServerUrl</config-property-name>
-            <config-property-type>java.lang.String</config-property-type>
-            <config-property-value>tcp://localhost:61616</config-property-value>
-<!--            <config-property-value>vm://localhost</config-property-value> -->
-        </config-property>
-        <config-property>
-            <description>The default user name that will be used to establish connections to the ActiveMQ server.</description>
-            <config-property-name>UserName</config-property-name>
-            <config-property-type>java.lang.String</config-property-type>
-            <config-property-value>defaultUser</config-property-value>
-        </config-property>
-        <config-property>
-            <description>The default password that will be used to log the default user into the ActiveMQ server.</description>
-            <config-property-name>Password</config-property-name>
-            <config-property-type>java.lang.String</config-property-type>
-            <config-property-value>defaultPassword</config-property-value>
-        </config-property>
-        <config-property>
-            <description>The client id that will be set on the connection that is established to the ActiveMQ server.</description>
-            <config-property-name>Clientid</config-property-name>
-            <config-property-type>java.lang.String</config-property-type>
-        </config-property>
-        <config-property>
-            <description>Boolean to configure if outbound connections should reuse the inbound connection's session for sending messages.</description>
-            <config-property-name>UseInboundSession</config-property-name>
-            <config-property-type>java.lang.Boolean</config-property-type>
-            <config-property-value>false</config-property-value>
-        </config-property>
-
-			  <!-- NOTE disable the following property if you do not wish to deploy an embedded broker -->
-        <config-property>
-            <description>
-              Sets the XML configuration file used to configure the embedded ActiveMQ broker via 
-              Spring if using embedded mode.
-              
-              BrokerXmlConfig is the filename which is assumed to be on the classpath unless 
-              a URL is specified. So a value of foo/bar.xml would be assumed to be on the 
-              classpath whereas file:dir/file.xml would use the file system. 
-              Any valid URL string is supported.              
-            </description>
-            <config-property-name>BrokerXmlConfig</config-property-name>
-            <config-property-type>java.lang.String</config-property-type>
-            <config-property-value></config-property-value>
-            <!--
-            <config-property-value>xbean:broker-config.xml</config-property-value>
-            -->
-        </config-property>
-
-        <outbound-resourceadapter>
-            <connection-definition>
-                <managedconnectionfactory-class>org.apache.activemq.ra.ActiveMQManagedConnectionFactory</managedconnectionfactory-class>
-                <connectionfactory-interface>javax.jms.ConnectionFactory</connectionfactory-interface>
-                <connectionfactory-impl-class>org.apache.activemq.ra.ActiveMQConnectionFactory</connectionfactory-impl-class>
-                <connection-interface>javax.jms.Connection</connection-interface>
-                <connection-impl-class>org.apache.activemq.ra.ManagedConnectionProxy</connection-impl-class>
-            </connection-definition>
-            <connection-definition>
-                <managedconnectionfactory-class>org.apache.activemq.ra.ActiveMQManagedConnectionFactory</managedconnectionfactory-class>
-                <connectionfactory-interface>javax.jms.QueueConnectionFactory</connectionfactory-interface>
-                <connectionfactory-impl-class>org.apache.activemq.ra.ActiveMQConnectionFactory</connectionfactory-impl-class>
-                <connection-interface>javax.jms.QueueConnection</connection-interface>
-                <connection-impl-class>org.apache.activemq.ra.ManagedConnectionProxy</connection-impl-class>
-            </connection-definition>
-            <connection-definition>
-                <managedconnectionfactory-class>org.apache.activemq.ra.ActiveMQManagedConnectionFactory</managedconnectionfactory-class>
-                <connectionfactory-interface>javax.jms.TopicConnectionFactory</connectionfactory-interface>
-                <connectionfactory-impl-class>org.apache.activemq.ra.ActiveMQConnectionFactory</connectionfactory-impl-class>
-                <connection-interface>javax.jms.TopicConnection</connection-interface>
-                <connection-impl-class>org.apache.activemq.ra.ManagedConnectionProxy</connection-impl-class>
-            </connection-definition>
-            <transaction-support>XATransaction</transaction-support>
-            <authentication-mechanism>
-                <authentication-mechanism-type>BasicPassword</authentication-mechanism-type>
-                <credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface>
-            </authentication-mechanism>
-            <reauthentication-support>false</reauthentication-support>
-        </outbound-resourceadapter>
-        <inbound-resourceadapter>
-            <messageadapter>
-                <messagelistener>
-                    <messagelistener-type>javax.jms.MessageListener</messagelistener-type>
-                    <activationspec>
-                        <activationspec-class>org.apache.activemq.ra.ActiveMQActivationSpec</activationspec-class>
-                        
-                        <required-config-property>
-                            <config-property-name>destination</config-property-name>
-                        </required-config-property>
-                        <required-config-property>
-                            <config-property-name>destinationType</config-property-name>
-                        </required-config-property>
-                        
-                    </activationspec>
-                </messagelistener>
-            </messageadapter>
-        </inbound-resourceadapter>
-        <adminobject>
-            <adminobject-interface>javax.jms.Queue</adminobject-interface>
-            <adminobject-class>org.apache.activemq.command.ActiveMQQueue</adminobject-class>
-            <config-property>
-                <config-property-name>PhysicalName</config-property-name>
-                <config-property-type>java.lang.String</config-property-type>
-            </config-property>
-        </adminobject>
-        <adminobject>
-            <adminobject-interface>javax.jms.Topic</adminobject-interface>
-            <adminobject-class>org.apache.activemq.command.ActiveMQTopic</adminobject-class>
-            <config-property>
-                <config-property-name>PhysicalName</config-property-name>
-                <config-property-type>java.lang.String</config-property-type>
-            </config-property>
-        </adminobject>
-    </resourceadapter>
-</connector>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright 2005-2006 The Apache Software Foundation
+   
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+   
+    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.
+-->
+
+<connector xmlns="http://java.sun.com/xml/ns/j2ee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
+    http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"
+    version="1.5">
+    <description>ActiveMQ  inbound and outbound JMS ResourceAdapter</description>
+    <display-name>ActiveMQ JMS Resource Adapter</display-name>
+    <vendor-name>activemq.org</vendor-name>
+    <eis-type>JMS 1.1</eis-type>
+    <resourceadapter-version>1.0</resourceadapter-version>
+    <license>
+        <description>
+        
+            Copyright 2005-2006 The Apache Software Foundation
+           
+            Licensed under the Apache License, Version 2.0 (the "License");
+            you may not use this file except in compliance with the License.
+            You may obtain a copy of the License at
+           
+            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.
+
+        </description>
+        <license-required>true</license-required>
+    </license>
+    <resourceadapter>
+        <resourceadapter-class>org.apache.activemq.ra.ActiveMQResourceAdapter</resourceadapter-class>
+        <config-property>
+            <description>
+              The URL to the ActiveMQ server that you want this connection to connect to.  If using
+              an embedded broker, this value should be 'vm://localhost'.
+            </description>
+            <config-property-name>ServerUrl</config-property-name>
+            <config-property-type>java.lang.String</config-property-type>
+            <config-property-value>tcp://localhost:61616</config-property-value>
+<!--            <config-property-value>vm://localhost</config-property-value> -->
+        </config-property>
+        <config-property>
+            <description>The default user name that will be used to establish connections to the ActiveMQ server.</description>
+            <config-property-name>UserName</config-property-name>
+            <config-property-type>java.lang.String</config-property-type>
+            <config-property-value>defaultUser</config-property-value>
+        </config-property>
+        <config-property>
+            <description>The default password that will be used to log the default user into the ActiveMQ server.</description>
+            <config-property-name>Password</config-property-name>
+            <config-property-type>java.lang.String</config-property-type>
+            <config-property-value>defaultPassword</config-property-value>
+        </config-property>
+        <config-property>
+            <description>The client id that will be set on the connection that is established to the ActiveMQ server.</description>
+            <config-property-name>Clientid</config-property-name>
+            <config-property-type>java.lang.String</config-property-type>
+        </config-property>
+        <config-property>
+            <description>Boolean to configure if outbound connections should reuse the inbound connection's session for sending messages.</description>
+            <config-property-name>UseInboundSession</config-property-name>
+            <config-property-type>java.lang.Boolean</config-property-type>
+            <config-property-value>false</config-property-value>
+        </config-property>
+
+			  <!-- NOTE disable the following property if you do not wish to deploy an embedded broker -->
+        <config-property>
+            <description>
+              Sets the XML configuration file used to configure the embedded ActiveMQ broker via 
+              Spring if using embedded mode.
+              
+              BrokerXmlConfig is the filename which is assumed to be on the classpath unless 
+              a URL is specified. So a value of foo/bar.xml would be assumed to be on the 
+              classpath whereas file:dir/file.xml would use the file system. 
+              Any valid URL string is supported.              
+            </description>
+            <config-property-name>BrokerXmlConfig</config-property-name>
+            <config-property-type>java.lang.String</config-property-type>
+            <config-property-value></config-property-value>
+            <!--
+            <config-property-value>xbean:broker-config.xml</config-property-value>
+            -->
+        </config-property>
+
+        <outbound-resourceadapter>
+            <connection-definition>
+                <managedconnectionfactory-class>org.apache.activemq.ra.ActiveMQManagedConnectionFactory</managedconnectionfactory-class>
+                <connectionfactory-interface>javax.jms.ConnectionFactory</connectionfactory-interface>
+                <connectionfactory-impl-class>org.apache.activemq.ra.ActiveMQConnectionFactory</connectionfactory-impl-class>
+                <connection-interface>javax.jms.Connection</connection-interface>
+                <connection-impl-class>org.apache.activemq.ra.ManagedConnectionProxy</connection-impl-class>
+            </connection-definition>
+            <connection-definition>
+                <managedconnectionfactory-class>org.apache.activemq.ra.ActiveMQManagedConnectionFactory</managedconnectionfactory-class>
+                <connectionfactory-interface>javax.jms.QueueConnectionFactory</connectionfactory-interface>
+                <connectionfactory-impl-class>org.apache.activemq.ra.ActiveMQConnectionFactory</connectionfactory-impl-class>
+                <connection-interface>javax.jms.QueueConnection</connection-interface>
+                <connection-impl-class>org.apache.activemq.ra.ManagedConnectionProxy</connection-impl-class>
+            </connection-definition>
+            <connection-definition>
+                <managedconnectionfactory-class>org.apache.activemq.ra.ActiveMQManagedConnectionFactory</managedconnectionfactory-class>
+                <connectionfactory-interface>javax.jms.TopicConnectionFactory</connectionfactory-interface>
+                <connectionfactory-impl-class>org.apache.activemq.ra.ActiveMQConnectionFactory</connectionfactory-impl-class>
+                <connection-interface>javax.jms.TopicConnection</connection-interface>
+                <connection-impl-class>org.apache.activemq.ra.ManagedConnectionProxy</connection-impl-class>
+            </connection-definition>
+            <transaction-support>XATransaction</transaction-support>
+            <authentication-mechanism>
+                <authentication-mechanism-type>BasicPassword</authentication-mechanism-type>
+                <credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface>
+            </authentication-mechanism>
+            <reauthentication-support>false</reauthentication-support>
+        </outbound-resourceadapter>
+        <inbound-resourceadapter>
+            <messageadapter>
+                <messagelistener>
+                    <messagelistener-type>javax.jms.MessageListener</messagelistener-type>
+                    <activationspec>
+                        <activationspec-class>org.apache.activemq.ra.ActiveMQActivationSpec</activationspec-class>
+                        
+                        <required-config-property>
+                            <config-property-name>destination</config-property-name>
+                        </required-config-property>
+                        <required-config-property>
+                            <config-property-name>destinationType</config-property-name>
+                        </required-config-property>
+                        
+                    </activationspec>
+                </messagelistener>
+            </messageadapter>
+        </inbound-resourceadapter>
+        <adminobject>
+            <adminobject-interface>javax.jms.Queue</adminobject-interface>
+            <adminobject-class>org.apache.activemq.command.ActiveMQQueue</adminobject-class>
+            <config-property>
+                <config-property-name>PhysicalName</config-property-name>
+                <config-property-type>java.lang.String</config-property-type>
+            </config-property>
+        </adminobject>
+        <adminobject>
+            <adminobject-interface>javax.jms.Topic</adminobject-interface>
+            <adminobject-class>org.apache.activemq.command.ActiveMQTopic</adminobject-class>
+            <config-property>
+                <config-property-name>PhysicalName</config-property-name>
+                <config-property-type>java.lang.String</config-property-type>
+            </config-property>
+        </adminobject>
+    </resourceadapter>
+</connector>

Propchange: incubator/activemq/branches/activemq-4.0/activemq-rar/src/main/rar/META-INF/ra.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/activemq/branches/activemq-4.0/activemq-rar/src/main/rar/broker-config.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/activemq-rar/src/main/rar/broker-config.xml?rev=426431&r1=426430&r2=426431&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/activemq-rar/src/main/rar/broker-config.xml (original)
+++ incubator/activemq/branches/activemq-4.0/activemq-rar/src/main/rar/broker-config.xml Fri Jul 28 01:22:48 2006
@@ -1,63 +1,63 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Copyright 2005-2006 The Apache Software Foundation
-   
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-   
-    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.
--->
-<!-- START SNIPPET: xbean -->
-<beans xmlns="http://activemq.org/config/1.0">
-
-  <broker useJmx="true">
-
-	<!-- In ActiveMQ 4, you can setup destination policies. note: this xml format may still change a bit -->
-    <destinationPolicy>
-      <policyMap><policyEntries>
-
-          <policyEntry topic="FOO.>">
-            <dispatchPolicy>
-              <strictOrderDispatchPolicy />
-            </dispatchPolicy>
-            <subscriptionRecoveryPolicy>
-              <lastImageSubscriptionRecoveryPolicy />
-            </subscriptionRecoveryPolicy>
-          </policyEntry>
-
-      </policyEntries></policyMap>
-    </destinationPolicy>
-
-
-    <persistenceAdapter>
-      <journaledJDBC journalLogFiles="5" dataDirectory="../data"/>
-      <!-- To use a different datasource, use th following syntax : -->
-      <!--
-      <journaledJDBC journalLogFiles="5" dataDirectory="../data" dataSource="#postgres-ds"/>
-       -->
-    </persistenceAdapter>
-
-    <transportConnectors>
-      <!-- prefixing a connector with discovery: causes the connector to be advertiesed over rendezvous -->
-      <transportConnector uri="tcp://localhost:61616" discoveryUri="multicast://default"/>
-    </transportConnectors>
-
-    <networkConnectors>
-      <!-- by default just auto discover the other brokers -->
-      <networkConnector uri="multicast://default"/>
-      <!--
-      <networkConnector uri="static://(tcp://host1:61616,tcp://host2:61616)"/>
-      -->
-    </networkConnectors>
-
-  </broker>
-
-
-</beans>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright 2005-2006 The Apache Software Foundation
+   
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+   
+    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.
+-->
+<!-- START SNIPPET: xbean -->
+<beans xmlns="http://activemq.org/config/1.0">
+
+  <broker useJmx="true">
+
+	<!-- In ActiveMQ 4, you can setup destination policies. note: this xml format may still change a bit -->
+    <destinationPolicy>
+      <policyMap><policyEntries>
+
+          <policyEntry topic="FOO.>">
+            <dispatchPolicy>
+              <strictOrderDispatchPolicy />
+            </dispatchPolicy>
+            <subscriptionRecoveryPolicy>
+              <lastImageSubscriptionRecoveryPolicy />
+            </subscriptionRecoveryPolicy>
+          </policyEntry>
+
+      </policyEntries></policyMap>
+    </destinationPolicy>
+
+
+    <persistenceAdapter>
+      <journaledJDBC journalLogFiles="5" dataDirectory="../data"/>
+      <!-- To use a different datasource, use th following syntax : -->
+      <!--
+      <journaledJDBC journalLogFiles="5" dataDirectory="../data" dataSource="#postgres-ds"/>
+       -->
+    </persistenceAdapter>
+
+    <transportConnectors>
+      <!-- prefixing a connector with discovery: causes the connector to be advertiesed over rendezvous -->
+      <transportConnector uri="tcp://localhost:61616" discoveryUri="multicast://default"/>
+    </transportConnectors>
+
+    <networkConnectors>
+      <!-- by default just auto discover the other brokers -->
+      <networkConnector uri="multicast://default"/>
+      <!--
+      <networkConnector uri="static://(tcp://host1:61616,tcp://host2:61616)"/>
+      -->
+    </networkConnectors>
+
+  </broker>
+
+
+</beans>

Propchange: incubator/activemq/branches/activemq-4.0/activemq-rar/src/main/rar/broker-config.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/activemq/branches/activemq-4.0/activemq-soaktest/maven.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/activemq-soaktest/maven.xml?rev=426431&r1=426430&r2=426431&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/activemq-soaktest/maven.xml (original)
+++ incubator/activemq/branches/activemq-4.0/activemq-soaktest/maven.xml Fri Jul 28 01:22:48 2006
@@ -1,31 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Copyright 2005-2006 The Apache Software Foundation
-   
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-   
-    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.
--->
-<project default="default"
-    xmlns:j="jelly:core"
-    xmlns:u="jelly:util"
-    xmlns:ant="jelly:ant"
-    xmlns:util="jelly:util"
-    xmlns:artifact="artifact"
-    >
-
-
-  <goal name="default" prereqs="jar:install"/>
-
-  <postGoal name="clean">
-    <delete dir="${basedir}/activemq-data" />
-  </postGoal>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright 2005-2006 The Apache Software Foundation
+   
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+   
+    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.
+-->
+<project default="default"
+    xmlns:j="jelly:core"
+    xmlns:u="jelly:util"
+    xmlns:ant="jelly:ant"
+    xmlns:util="jelly:util"
+    xmlns:artifact="artifact"
+    >
+
+
+  <goal name="default" prereqs="jar:install"/>
+
+  <postGoal name="clean">
+    <delete dir="${basedir}/activemq-data" />
+  </postGoal>
+</project>

Propchange: incubator/activemq/branches/activemq-4.0/activemq-soaktest/maven.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/activemq/branches/activemq-4.0/activemq-soaktest/project.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/activemq-soaktest/project.xml?rev=426431&r1=426430&r2=426431&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/activemq-soaktest/project.xml (original)
+++ incubator/activemq/branches/activemq-4.0/activemq-soaktest/project.xml Fri Jul 28 01:22:48 2006
@@ -1,117 +1,117 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE project>
-<!--
-    Copyright 2005-2006 The Apache Software Foundation
-   
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-   
-    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.
--->
-<project>
-  <pomVersion>3</pomVersion>
-  <extend>${basedir}/../etc/project.xml</extend>
-  <name>ActiveMQ :: SoakTest</name>
-  <id>activemq</id>
-  <shortDescription>ActiveMQ Assembly</shortDescription>
-  <description>ActiveMQ Assembly creates an ActiveMQ distribution</description>
-
-  <!-- ============ -->
-  <!-- Dependencies -->
-  <!-- ============ -->
-  <dependencies>
-
-      <dependency>
-        <groupId>${pom.groupId}</groupId>
-        <artifactId>activemq-core</artifactId>
-        <version>${pom.currentVersion}</version>
-        <properties>
-          <activemq.module>true</activemq.module>
-          <lib>true</lib>
-        </properties>
-      </dependency>
-
-      <dependency>
-        <groupId>${pom.groupId}</groupId>
-        <artifactId>activeio-core</artifactId>
-        <version>${activeio_version}</version>
-        <properties>
-          <activemq.module>true</activemq.module>
-          <lib>true</lib>
-        </properties>
-      </dependency>
-
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>activemq-core-test</artifactId>
-      <version>${pom.currentVersion}</version>
-    </dependency>
-    
-
-
-    <!-- Derby DB used for testing JDBC message store -->
-    <dependency>
-      <groupId>org.apache.derby</groupId>
-      <artifactId>derby</artifactId>
-      <version>${derby_version}</version>
-      <properties>
-        <activemq.module>true</activemq.module>
-        <optional>true</optional>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.derby</groupId>
-      <artifactId>derbynet</artifactId>
-      <version>${derbynet_version}</version>
-    </dependency>
-
-
-
-  </dependencies>
-
-  <build>
-    <nagEmailAddress>dev@activemq.codehaus.org</nagEmailAddress>
-    <sourceDirectory>src/main/java</sourceDirectory>
-    <unitTestSourceDirectory>src/test/java</unitTestSourceDirectory>
-
-    <integrationUnitTestSourceDirectory/>
-    <aspectSourceDirectory/>
-
-    <unitTest>
-      <resources>
-        <resource>
-          <directory>src/test/resources</directory>
-          <includes>
-            <include>**/*.properties</include>
-            <include>**/*.xml</include>
-          </includes>
-        </resource>
-      </resources>
-      <includes>
-        <include>**/*Test.*</include>
-      </includes>
-      <excludes>
-
-
-      </excludes>
-    </unitTest>
-
-    <resources>
-      <resource>
-        <directory>src/main/resources</directory>
-        <includes>
-          <include>**/*</include>
-        </includes>
-      </resource>
-    </resources>
-  </build>
-
-</project>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE project>
+<!--
+    Copyright 2005-2006 The Apache Software Foundation
+   
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+   
+    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.
+-->
+<project>
+  <pomVersion>3</pomVersion>
+  <extend>${basedir}/../etc/project.xml</extend>
+  <name>ActiveMQ :: SoakTest</name>
+  <id>activemq</id>
+  <shortDescription>ActiveMQ Assembly</shortDescription>
+  <description>ActiveMQ Assembly creates an ActiveMQ distribution</description>
+
+  <!-- ============ -->
+  <!-- Dependencies -->
+  <!-- ============ -->
+  <dependencies>
+
+      <dependency>
+        <groupId>${pom.groupId}</groupId>
+        <artifactId>activemq-core</artifactId>
+        <version>${pom.currentVersion}</version>
+        <properties>
+          <activemq.module>true</activemq.module>
+          <lib>true</lib>
+        </properties>
+      </dependency>
+
+      <dependency>
+        <groupId>${pom.groupId}</groupId>
+        <artifactId>activeio-core</artifactId>
+        <version>${activeio_version}</version>
+        <properties>
+          <activemq.module>true</activemq.module>
+          <lib>true</lib>
+        </properties>
+      </dependency>
+
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>activemq-core-test</artifactId>
+      <version>${pom.currentVersion}</version>
+    </dependency>
+    
+
+
+    <!-- Derby DB used for testing JDBC message store -->
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derby</artifactId>
+      <version>${derby_version}</version>
+      <properties>
+        <activemq.module>true</activemq.module>
+        <optional>true</optional>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derbynet</artifactId>
+      <version>${derbynet_version}</version>
+    </dependency>
+
+
+
+  </dependencies>
+
+  <build>
+    <nagEmailAddress>dev@activemq.codehaus.org</nagEmailAddress>
+    <sourceDirectory>src/main/java</sourceDirectory>
+    <unitTestSourceDirectory>src/test/java</unitTestSourceDirectory>
+
+    <integrationUnitTestSourceDirectory/>
+    <aspectSourceDirectory/>
+
+    <unitTest>
+      <resources>
+        <resource>
+          <directory>src/test/resources</directory>
+          <includes>
+            <include>**/*.properties</include>
+            <include>**/*.xml</include>
+          </includes>
+        </resource>
+      </resources>
+      <includes>
+        <include>**/*Test.*</include>
+      </includes>
+      <excludes>
+
+
+      </excludes>
+    </unitTest>
+
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+        <includes>
+          <include>**/*</include>
+        </includes>
+      </resource>
+    </resources>
+  </build>
+
+</project>
+

Propchange: incubator/activemq/branches/activemq-4.0/activemq-soaktest/project.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/activemq/branches/activemq-4.0/maven-bundle-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/maven-bundle-plugin/pom.xml?rev=426431&r1=426430&r2=426431&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/maven-bundle-plugin/pom.xml (original)
+++ incubator/activemq/branches/activemq-4.0/maven-bundle-plugin/pom.xml Fri Jul 28 01:22:48 2006
@@ -1,69 +1,69 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-    Copyright 2005-2006 The Apache Software Foundation
-   
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-   
-    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.
--->
-
-<project
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns="http://maven.apache.org/POM/4.0.0">
-  
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>incubator-activemq</groupId>
-    <artifactId>activemq-parent</artifactId>
-    <version>4.0.2-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
-  </parent>
-
-  <artifactId>maven-bundle-plugin</artifactId>
-  <packaging>maven-plugin</packaging>
-  <name>Bundle Plugin</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-project</artifactId>
-      <version>2.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-archiver</artifactId>
-      <version>1.0-alpha-5</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-archiver</artifactId>
-      <version>2.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-plugin-api</artifactId>
-      <version>2.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-utils</artifactId>
-      <version>1.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-artifact</artifactId>
-      <version>2.0</version>
-    </dependency>
-  </dependencies>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+    Copyright 2005-2006 The Apache Software Foundation
+   
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+   
+    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.
+-->
+
+<project
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns="http://maven.apache.org/POM/4.0.0">
+  
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>incubator-activemq</groupId>
+    <artifactId>activemq-parent</artifactId>
+    <version>4.0.2-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <artifactId>maven-bundle-plugin</artifactId>
+  <packaging>maven-plugin</packaging>
+  <name>Bundle Plugin</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-project</artifactId>
+      <version>2.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-archiver</artifactId>
+      <version>1.0-alpha-5</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-archiver</artifactId>
+      <version>2.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-plugin-api</artifactId>
+      <version>2.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-utils</artifactId>
+      <version>1.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-artifact</artifactId>
+      <version>2.0</version>
+    </dependency>
+  </dependencies>
+</project>

Propchange: incubator/activemq/branches/activemq-4.0/maven-bundle-plugin/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/AcknowledgementMode.hpp
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/AcknowledgementMode.hpp?rev=426431&r1=426430&r2=426431&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/AcknowledgementMode.hpp (original)
+++ incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/AcknowledgementMode.hpp Fri Jul 28 01:22:48 2006
@@ -1,31 +1,31 @@
-/*
- * Copyright 2006 The Apache Software Foundation or its licensors, as
- * applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * 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.
- */
-#ifndef ActiveMQ_AcknowledgementMode_hpp_
-#define ActiveMQ_AcknowledgementMode_hpp_
-
-namespace apache
-{
-  namespace activemq
-  {
-    enum AcknowledgementMode {
-      UnknownAckMode, AutoAckMode, ClientAckMode, TransactionalAckMode
-    };
-  }
-}
-
-#endif /*ActiveMQ_AcknowledgementMode_hpp_*/
-
+/*
+ * Copyright 2006 The Apache Software Foundation or its licensors, as
+ * applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.
+ */
+#ifndef ActiveMQ_AcknowledgementMode_hpp_
+#define ActiveMQ_AcknowledgementMode_hpp_
+
+namespace apache
+{
+  namespace activemq
+  {
+    enum AcknowledgementMode {
+      UnknownAckMode, AutoAckMode, ClientAckMode, TransactionalAckMode
+    };
+  }
+}
+
+#endif /*ActiveMQ_AcknowledgementMode_hpp_*/
+

Propchange: incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/AcknowledgementMode.hpp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/BrokerException.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/BrokerException.cpp?rev=426431&r1=426430&r2=426431&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/BrokerException.cpp (original)
+++ incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/BrokerException.cpp Fri Jul 28 01:22:48 2006
@@ -1,48 +1,48 @@
-/*
- * Copyright 2006 The Apache Software Foundation or its licensors, as
- * applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * 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.
- */
-#include "activemq/BrokerException.hpp"
-
-using namespace apache::activemq;
-
-/*
- * 
- */
-BrokerException::BrokerException(p<BrokerError> brokerError)
-{
-    this->brokerError = brokerError ;
-
-    // Build exception message
-    msg.assign( brokerError->getExceptionClass()->c_str() ) ;
-    msg.append( " : " ) ;
-    msg.append( brokerError->getMessage()->c_str() ) ;
-}
-
-/*
- * 
- */
-p<BrokerError> BrokerException::getBrokerError()
-{
-    return brokerError ;
-}
-
-/*
- * 
- */
-p<string> BrokerException::getJavaStackTrace()
-{
-    return brokerError->getStackTrace() ;
-}
+/*
+ * Copyright 2006 The Apache Software Foundation or its licensors, as
+ * applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.
+ */
+#include "activemq/BrokerException.hpp"
+
+using namespace apache::activemq;
+
+/*
+ * 
+ */
+BrokerException::BrokerException(p<BrokerError> brokerError)
+{
+    this->brokerError = brokerError ;
+
+    // Build exception message
+    msg.assign( brokerError->getExceptionClass()->c_str() ) ;
+    msg.append( " : " ) ;
+    msg.append( brokerError->getMessage()->c_str() ) ;
+}
+
+/*
+ * 
+ */
+p<BrokerError> BrokerException::getBrokerError()
+{
+    return brokerError ;
+}
+
+/*
+ * 
+ */
+p<string> BrokerException::getJavaStackTrace()
+{
+    return brokerError->getStackTrace() ;
+}

Propchange: incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/BrokerException.cpp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/BrokerException.hpp
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/BrokerException.hpp?rev=426431&r1=426430&r2=426431&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/BrokerException.hpp (original)
+++ incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/BrokerException.hpp Fri Jul 28 01:22:48 2006
@@ -1,54 +1,54 @@
-/*
- * Copyright 2006 The Apache Software Foundation or its licensors, as
- * applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * 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.
- */
-#ifndef ActiveMQ_BrokerException_hpp_
-#define ActiveMQ_BrokerException_hpp_
-
-#include <string>
-#include "activemq/command/BrokerError.hpp"
-#include "cms/CmsException.hpp"
-#include "ppr/util/ifr/p"
-
-namespace apache
-{
-  namespace activemq
-  {
-    using namespace std;
-    using namespace ifr;
-    using namespace apache::cms;
-    using namespace apache::activemq::command;
-
-/*
- * 
- */
-class BrokerException : public CmsException
-{
-private:
-    p<BrokerError> brokerError ;
-    
-public:
-    BrokerException(p<BrokerError> brokerError) ;
-    virtual ~BrokerException() throw() {}
-
-    virtual p<BrokerError> getBrokerError() ;
-    virtual p<string> getJavaStackTrace() ;
-};
-
-/* namespace */
-  }
-}
-
-#endif /*ActiveMQ_BrokerException_hpp_*/
+/*
+ * Copyright 2006 The Apache Software Foundation or its licensors, as
+ * applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.
+ */
+#ifndef ActiveMQ_BrokerException_hpp_
+#define ActiveMQ_BrokerException_hpp_
+
+#include <string>
+#include "activemq/command/BrokerError.hpp"
+#include "cms/CmsException.hpp"
+#include "ppr/util/ifr/p"
+
+namespace apache
+{
+  namespace activemq
+  {
+    using namespace std;
+    using namespace ifr;
+    using namespace apache::cms;
+    using namespace apache::activemq::command;
+
+/*
+ * 
+ */
+class BrokerException : public CmsException
+{
+private:
+    p<BrokerError> brokerError ;
+    
+public:
+    BrokerException(p<BrokerError> brokerError) ;
+    virtual ~BrokerException() throw() {}
+
+    virtual p<BrokerError> getBrokerError() ;
+    virtual p<string> getJavaStackTrace() ;
+};
+
+/* namespace */
+  }
+}
+
+#endif /*ActiveMQ_BrokerException_hpp_*/

Propchange: incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/activemq/BrokerException.hpp
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message