Commit 5b51eeee authored by Craig Andrews's avatar Craig Andrews

Bump to version 1.0.0

parent f04dbc8f
This diff is collapsed.
......@@ -23,10 +23,8 @@
*
*
* @package Stomp
* @author Michael Caplan <mcaplan@labnet.net>
* @version $Revision: 23 $
*/
class Stomp_Exception extends Exception
*/
class StompException extends Exception
{
protected $_details;
......@@ -53,5 +51,5 @@ class Stomp_Exception extends Exception
{
return $this->_details;
}
}
}
?>
\ No newline at end of file
<?php
/**
*
* 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.
*/
/* vim: set expandtab tabstop=3 shiftwidth=3: */
<?php
/**
*
* 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.
*/
/* vim: set expandtab tabstop=3 shiftwidth=3: */
/**
* Stomp Frames are messages that are sent and received on a StompConnection.
* Stomp Frames are messages that are sent and received on a stomp connection.
*
* @package Stomp
* @author Hiram Chirino <hiram@hiramchirino.com>
* @author Dejan Bosanac <dejan@nighttale.net>
* @author Michael Caplan <mcaplan@labnet.net>
* @version $Revision: 36 $
*/
class Stomp_Frame
class StompFrame
{
public $command;
public $headers = array();
......@@ -54,27 +50,27 @@ class Stomp_Frame
$this->body = $body;
if ($this->command == 'ERROR') {
require_once 'Stomp/Exception.php';
throw new Stomp_Exception($this->headers['message'], 0, $this->body);
require_once 'Exception.php';
throw new StompException($this->headers['message'], 0, $this->body);
}
}
/**
* Convert frame to transportable string
*
* @return string
*/
public function __toString()
{
$data = $this->command . "\n";
foreach ($this->headers as $name => $value) {
$data .= $name . ": " . $value . "\n";
}
}
/**
* Convert frame to transportable string
*
* @return string
*/
public function __toString()
{
$data = $this->command . "\n";
foreach ($this->headers as $name => $value) {
$data .= $name . ": " . $value . "\n";
}
$data .= "\n";
$data .= $this->body;
return $data .= "\x00\n";
$data .= "\n";
$data .= $this->body;
return $data .= "\x00";
}
}
?>
\ No newline at end of file
......@@ -24,10 +24,8 @@ require_once 'Stomp/Frame.php';
* Basic text stomp message
*
* @package Stomp
* @author Dejan Bosanac <dejan@nighttale.net>
* @version $Revision: 23 $
*/
class Stomp_Message extends Stomp_Frame
class StompMessage extends StompFrame
{
public function __construct ($body, $headers = null)
{
......
......@@ -24,30 +24,28 @@ require_once 'Stomp/Message.php';
* Message that contains a set of name-value pairs
*
* @package Stomp
* @author Dejan Bosanac <dejan@nighttale.net>
* @version $Revision: 23 $
*/
class Stomp_Message_Map extends Stomp_Message
class StompMessageMap extends StompMessage
{
public $map;
/**
* Constructor
*
* @param Stomp_Frame|string $msg
* @param StompFrame|string $msg
* @param array $headers
*/
function __construct ($msg, $headers = null)
{
if ($msg instanceof Stomp_Frame) {
if ($msg instanceof StompFrame) {
$this->_init($msg->command, $msg->headers, $msg->body);
$this->map = json_decode($msg->body);
$this->map = json_decode($msg->body, true);
} else {
$this->_init("SEND", $headers, $msg);
if ($this->headers == null) {
$this->headers = array();
}
$this->headers['amq-msg-type'] = 'MapMessage';
$this->headers['transformation'] = 'jms-map-json';
$this->body = json_encode($msg);
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment