Menu
▾
▴
eas-dev-commit — Commit Log
You can subscribe to this list here.
| 2003 |
Jan
(69) |
Feb
(122) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
|
Feb
|
Mar
(56) |
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(237) |
Jul
|
Aug
|
Sep
(1) |
Oct
(14) |
Nov
(72) |
Dec
|
| 2007 |
Jan
(2) |
Feb
(37) |
Mar
(5) |
Apr
|
May
(2) |
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Yurii R. <yr...@us...> - 2003-02-04 04:13:55
|
Update of /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv15952/tests
Modified Files:
BinaryStreamTest.h Makefile.am
Log Message:
bugfix in binary serialization, binary output test fixed
Index: BinaryStreamTest.h
===================================================================
RCS file: /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/tests/BinaryStreamTest.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- BinaryStreamTest.h 3 Feb 2003 18:59:39 -0000 1.3
+++ BinaryStreamTest.h 4 Feb 2003 04:13:52 -0000 1.4
@@ -10,9 +10,28 @@
#include <cxxtest/TestSuite.h>
#include <sxmlstream.hxx>
+#include <config.h>
+#include <glib.h>
+
using namespace std;
using namespace openeas::sxmlstream;
+#define BIN_LBRACKET "("
+#define BIN_RBRACKET ")"
+
+#define BIN_SIGN_ATTR "@"
+#define BIN_SIGN_NS "!"
+#define BIN_SIGN_CHAR "C"
+#define BIN_SIGN "*"
+
+#if (SIZEOF_SIZE_T == 4) && (G_BYTE_ORDER == G_LITTLE_ENDIAN)
+#define BIN_PORTABLE_SIZE(x) x
+#elif (SIZEOF_SIZE_T == 4) && (G_BYTE_ORDER == G_LITTLE_ENDIAN)
+#define BIN_PORTABLE_SIZE(x) GINT32_TO_LE(x)
+#elif (SIZEOF_SIZE_T == 8)
+#error "64 bit architecture is currently unsupported by libsxmlstream. To be fixed."
+#endif
+
class BinaryStreamTest: public CxxTest::TestSuite
{
SXmlBinaryStream * _stream;
@@ -32,6 +51,7 @@
void test_output()
{
stringstream _output("");
+ stringstream _output_ex("");
// Prepare structures
SXmlNode top = SXmlNode::Element("test");
@@ -41,8 +61,14 @@
_stream->push(top);
_output << (*_stream);
+ _output_ex << BIN_LBRACKET << BIN_SIGN << BIN_PORTABLE_SIZE(strlen("test"))
+ << "test"
+ << BIN_LBRACKET << BIN_SIGN_ATTR << BIN_LBRACKET
+ << BIN_PORTABLE_SIZE(strlen("attr")) << "attr"
+ << BIN_PORTABLE_SIZE(strlen("value")) << "value"
+ << BIN_RBRACKET << BIN_RBRACKET << BIN_RBRACKET;
- TS_ASSERT_EQUALS(_output.str(), "(test (@ (attr \"value\")))");
+ TS_ASSERT_EQUALS(_output.str(), _output_ex.str());
}
};
Index: Makefile.am
===================================================================
RCS file: /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/tests/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile.am 2 Feb 2003 06:59:11 -0000 1.1
+++ Makefile.am 4 Feb 2003 04:13:52 -0000 1.2
@@ -1,8 +1,9 @@
bin_PROGRAMS = runTests
runTests_SOURCES = runTests.cxx
-INCLUDES = -I../include
+INCLUDES = -I../include -I$(top_srcdir)
runTests_LDFLAGS = -L../src/
runTests_LDADD = @GLIB_LIBS@ -lsxmlstream
+CXXFLAGS = @GLIB_CFLAGS@
CLEANFILES = runTests.cxx
|
|
From: Yurii R. <yr...@us...> - 2003-02-04 04:13:55
|
Update of /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/src
In directory sc8-pr-cvs1:/tmp/cvs-serv15952/src
Modified Files:
sxmlstream.cxx
Log Message:
bugfix in binary serialization, binary output test fixed
Index: sxmlstream.cxx
===================================================================
RCS file: /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/src/sxmlstream.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- sxmlstream.cxx 3 Feb 2003 18:59:38 -0000 1.10
+++ sxmlstream.cxx 4 Feb 2003 04:13:51 -0000 1.11
@@ -78,16 +78,27 @@
// Output attributes
if (!e.descendants.empty()) {
iter = e.descendants.begin();
+ bool has_attrs = false;
+ while (iter!=e.descendants.end())
+ {
+ if (iter->isAttribute()) has_attrs = true;
+ iter++;
+ }
+ if (has_attrs) {
+ iter = e.descendants.begin();
+ os << BIN_LBRACKET << BIN_SIGN_ATTR;
while (iter!=e.descendants.end())
{
if (iter->isAttribute())
{
- os << BIN_LBRACKET << BIN_SIGN_ATTR;
+
SXml_BinaryOutput(os,(*iter));
- os << BIN_RBRACKET;
+
}
iter++;
}
+ os << BIN_RBRACKET;
+ }
}
// Output descendants
if (!e.descendants.empty()) {
@@ -111,12 +122,13 @@
BIN_PORTABLE_SIZE(e.data.length()) <<
e.data <<
BIN_PORTABLE_SIZE((e.getProperty()).length()) <<
- e.getProperty() << BIN_LBRACKET;
+ e.getProperty() << BIN_RBRACKET;
} else
{
os << BIN_LBRACKET <<
BIN_PORTABLE_SIZE(e.data.length()) <<
- e.data << BIN_RBRACKET;
+ e.data << BIN_PORTABLE_SIZE(0) <<
+ BIN_RBRACKET;
}
break;
|
|
From: Yurii R. <yr...@us...> - 2003-02-04 04:13:54
|
Update of /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/include
In directory sc8-pr-cvs1:/tmp/cvs-serv15952/include
Added Files:
sxmlcont.hxx
Log Message:
bugfix in binary serialization, binary output test fixed
--- NEW FILE: sxmlcont.hxx ---
/*******************************************************/
/* */
/* libsxmlstream */
/* */
/* Copyright (c) 2003. */
/* E/AS Software Foundation */
/* */
/* Author(s): */
/* Yurii A. Rashkovskii <yr...@op...> */
/* */
/* */
/* This program is free software; you can redistribute */
/* it and/or modify it under the terms of the GNU */
/* Lesser General Public License as published by the */
/* Free Software Foundation; version 2 of the License. */
/* */
/*******************************************************/
/* $Id: sxmlcont.hxx,v 1.1 2003/02/04 04:13:51 yrashk Exp $ */
#ifndef _LIBSXMLSTREAM_SXMLCONT_HXX_
#define _LIBSXMLSTREAM_SXMLCONT_HXX_
#include <sxml.hxx>
using namespace std;
namespace openeas { namespace sxmlstream {
struct SXmlCont
{
};
}; };
#endif /* _LIBSXMLSTREAM_SXMLCONT_HXX_ */
|
|
From: Egor C. <eg...@us...> - 2003-02-03 18:59:43
|
Update of /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv11498/libs/libsxmlstream/tests
Modified Files:
BinaryStreamTest.h TextStreamTest.h
Log Message:
Bugfixes, bugfixes.. descendants in SXmlNode now is not a pointer. Binary
stream test still fails, but IMHO the problem is in the test itself.
2Yurii: please have a look at libs/libsxmlstream/tests/BinaryStreamTest.h
Index: BinaryStreamTest.h
===================================================================
RCS file: /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/tests/BinaryStreamTest.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- BinaryStreamTest.h 3 Feb 2003 06:30:49 -0000 1.2
+++ BinaryStreamTest.h 3 Feb 2003 18:59:39 -0000 1.3
@@ -26,6 +26,7 @@
void tearDown()
{
+ delete _stream;
}
void test_output()
Index: TextStreamTest.h
===================================================================
RCS file: /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/tests/TextStreamTest.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- TextStreamTest.h 3 Feb 2003 06:30:50 -0000 1.5
+++ TextStreamTest.h 3 Feb 2003 18:59:39 -0000 1.6
@@ -26,6 +26,7 @@
void tearDown()
{
+ delete _stream;
}
void test_output()
|
|
From: Egor C. <eg...@us...> - 2003-02-03 18:59:42
|
Update of /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/src
In directory sc8-pr-cvs1:/tmp/cvs-serv11498/libs/libsxmlstream/src
Modified Files:
Makefile.am sxml.cxx sxmlstream.cxx
Log Message:
Bugfixes, bugfixes.. descendants in SXmlNode now is not a pointer. Binary
stream test still fails, but IMHO the problem is in the test itself.
2Yurii: please have a look at libs/libsxmlstream/tests/BinaryStreamTest.h
Index: Makefile.am
===================================================================
RCS file: /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/src/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile.am 3 Feb 2003 06:30:47 -0000 1.5
+++ Makefile.am 3 Feb 2003 18:59:38 -0000 1.6
@@ -2,5 +2,5 @@
libsxmlstream_la_SOURCES = sxml.cxx sxmlstream.cxx ../include/sxml.hxx \
../include/sxmlstream.hxx ../include/sxmlhandler.hxx
INCLUDES = -I../include -I$(top_srcdir)
-CXXFLAGS = @GLIB_CFLAGS@
+CXXFLAGS = @GLIB_CFLAGS@ @CXXFLAGS@
libsxmlstream_la_LIBADD = @GLIB_LIBS@
Index: sxml.cxx
===================================================================
RCS file: /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/src/sxml.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- sxml.cxx 3 Feb 2003 06:30:47 -0000 1.5
+++ sxml.cxx 3 Feb 2003 18:59:38 -0000 1.6
@@ -25,27 +25,6 @@
namespace openeas { namespace sxmlstream {
-SXmlNode::SXmlNode(const SXmlNode& v)
-{
- type=v.type;
- if (!(v.descendants)->empty())
- *descendants = *(v.descendants);
- else
- descendants = new list<SXmlNode>;
- data = v.data;
-}
-
-SXmlNode& SXmlNode::operator=(const SXmlNode& v)
-{
- type=v.type;
- if (!(v.descendants)->empty())
- *descendants = *(v.descendants);
- else
- descendants = new list<SXmlNode>;
- data = v.data;
- return *this;
-}
-
/* Factory functions */
SXmlNode SXmlNode::Attribute(string aName, string aValue)
Index: sxmlstream.cxx
===================================================================
RCS file: /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/src/sxmlstream.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- sxmlstream.cxx 3 Feb 2003 06:30:47 -0000 1.9
+++ sxmlstream.cxx 3 Feb 2003 18:59:38 -0000 1.10
@@ -35,42 +35,20 @@
/* SXmlStream */
-SXmlStream::SXmlStream()
-{
- m_queue = new queue<SXmlNode>();
-}
-
-SXmlStream::~SXmlStream()
-{
- delete m_queue;
-}
-
bool SXmlStream::queueIsEmpty()
{
- return m_queue->empty();
+ return m_queue.empty();
}
-SXmlNode& SXmlStream::pop()
+SXmlNode SXmlStream::pop()
{
- SXmlNode *e = &(m_queue->front());
- m_queue->pop();
- return *e;
+ SXmlNode e = m_queue.front();
+ m_queue.pop();
+ return e;
}
-/* SXmlBinaryStream */
-
-SXmlBinaryStream::SXmlBinaryStream()
-{
- m_queue = new queue<SXmlNode>();
-}
-
-SXmlBinaryStream::~SXmlBinaryStream()
-{
- delete m_queue;
-}
-
#define BIN_LBRACKET "("
#define BIN_RBRACKET ")"
@@ -98,9 +76,9 @@
os << BIN_SIGN << BIN_PORTABLE_SIZE(e.data.length()) <<
e.data;
// Output attributes
- if (!(e.descendants)->empty()) {
- iter = (e.descendants)->begin();
- while (iter!=(e.descendants)->end())
+ if (!e.descendants.empty()) {
+ iter = e.descendants.begin();
+ while (iter!=e.descendants.end())
{
if (iter->isAttribute())
{
@@ -112,9 +90,9 @@
}
}
// Output descendants
- if (!(e.descendants)->empty()) {
- iter = (e.descendants)->begin();
- while (iter!=(e.descendants)->end())
+ if (!e.descendants.empty()) {
+ iter = e.descendants.begin();
+ while (iter!=e.descendants.end())
{
if (!iter->isAttribute())
{
@@ -180,17 +158,6 @@
/* SXmlTextStream */
-SXmlTextStream::SXmlTextStream()
-{
- m_queue = new queue<SXmlNode>();
-}
-
-SXmlTextStream::~SXmlTextStream()
-{
- delete m_queue;
-}
-
-
ostream& SXml_TextOutput(ostream& os, SXmlNode e)
{
SXmlNode_iterator iter;
@@ -199,9 +166,9 @@
case SXmlNode_Element_t:
os << "(" << e.data << " ";
// Output attributes
- if (!(e.descendants)->empty()) {
- iter = (e.descendants)->begin();
- while (iter!=(e.descendants)->end())
+ if (!e.descendants.empty()) {
+ iter = e.descendants.begin();
+ while (iter!=e.descendants.end())
{
if (iter->isAttribute())
{
@@ -213,9 +180,9 @@
}
}
// Output descendants
- if (!(e.descendants)->empty()) {
- iter = (e.descendants)->begin();
- while (iter!=(e.descendants)->end())
+ if (!e.descendants.empty()) {
+ iter = e.descendants.begin();
+ while (iter!=e.descendants.end())
{
if (!iter->isAttribute())
{
|
|
From: Egor C. <eg...@us...> - 2003-02-03 18:59:41
|
Update of /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/include
In directory sc8-pr-cvs1:/tmp/cvs-serv11498/libs/libsxmlstream/include
Modified Files:
sxml.hxx sxmlstream.hxx
Log Message:
Bugfixes, bugfixes.. descendants in SXmlNode now is not a pointer. Binary
stream test still fails, but IMHO the problem is in the test itself.
2Yurii: please have a look at libs/libsxmlstream/tests/BinaryStreamTest.h
Index: sxml.hxx
===================================================================
RCS file: /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/include/sxml.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- sxml.hxx 3 Feb 2003 06:30:46 -0000 1.5
+++ sxml.hxx 3 Feb 2003 18:59:37 -0000 1.6
@@ -39,16 +39,11 @@
struct SXmlNode {
SXmlNode_t type;
string data;
- list<SXmlNode> *descendants;
+ list<SXmlNode> descendants;
- SXmlNode() {descendants = new list<SXmlNode>; type = SXmlNode_Element_t;}
- SXmlNode(const SXmlNode& v);
- SXmlNode& operator=(const SXmlNode& v);
- ~SXmlNode() { delete descendants; }
-
- SXmlNode(const SXmlNode_t aType, const string aData) {descendants = new list<SXmlNode>;
- data = aData;
+ SXmlNode(const SXmlNode_t aType, const string aData) {data = aData;
type = aType;}
+ SXmlNode() { type = SXmlNode_Element_t; }
bool isElement() const { return type == SXmlNode_Element_t; }
bool isAttribute() const { return type == SXmlNode_Attribute_t; }
@@ -56,13 +51,12 @@
bool isNamespace() const { return type == SXmlNode_Namespace_t; }
// FIXME: is this correct? copied from previous realization
- bool hasProperty() const { return descendants->size() == 1 &&
- type == descendants->front().type; }
+ bool hasProperty() const { return descendants.size() == 1 &&
+ type == descendants.front().type; }
- // We do not copy the child element for better performance
- void addChild(const SXmlNode& e) { descendants->push_back(e); }
+ void addChild(const SXmlNode& e) { descendants.push_back(e); }
string getProperty() const { return hasProperty() ?
- descendants->front().data : 0; }
+ descendants.front().data : 0; }
// FIXME: Should I create subclasses for Element, Attributr, etc?
Index: sxmlstream.hxx
===================================================================
RCS file: /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/include/sxmlstream.hxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- sxmlstream.hxx 3 Feb 2003 06:30:47 -0000 1.8
+++ sxmlstream.hxx 3 Feb 2003 18:59:38 -0000 1.9
@@ -23,7 +23,7 @@
#include <queue>
#include <sxml.hxx>
-#include <sxmlhandler.hxx>
+//#include <sxmlhandler.hxx>
using namespace std;
@@ -33,30 +33,19 @@
{
protected:
- queue<SXmlNode> * m_queue;
+ queue<SXmlNode> m_queue;
public:
- SXmlStream();
- ~SXmlStream();
-
bool queueIsEmpty();
- // Do not copy an element, instead return by reference.
- // Copying it might be expensive if we have a lot of
- // descendants.
- // FIXME: Is it ok?
- SXmlNode& pop();
-
- // FIXME: Pass by reference, is it ok?
- void push(const SXmlNode& e) {m_queue->push(e);}
+ SXmlNode pop();
+ void push(const SXmlNode& e) {m_queue.push(e);}
};
class SXmlBinaryStream: public SXmlStream
{
public:
- SXmlBinaryStream();
- ~SXmlBinaryStream();
friend ostream& operator<<(ostream&,
SXmlBinaryStream&);
@@ -68,8 +57,6 @@
class SXmlTextStream: public SXmlStream
{
public:
- SXmlTextStream();
- ~SXmlTextStream();
friend ostream& operator<<(ostream&,
SXmlTextStream&);
|
|
From: Egor C. <eg...@us...> - 2003-02-03 18:53:26
|
Update of /cvsroot/eas-dev/eas-dev/build/unix In directory sc8-pr-cvs1:/tmp/cvs-serv10690/build/unix Modified Files: .cvsignore Log Message: contest and conftest.c added. Index: .cvsignore =================================================================== RCS file: /cvsroot/eas-dev/eas-dev/build/unix/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- .cvsignore 28 Jan 2003 03:18:22 -0000 1.6 +++ .cvsignore 3 Feb 2003 18:53:22 -0000 1.7 @@ -5,4 +5,6 @@ configure stamp-h libtool -aclocal.m4 \ No newline at end of file +aclocal.m4 +conftest +conftest.c |
|
From: Yurii R. <yr...@us...> - 2003-02-03 09:06:55
|
Update of /cvsroot/eas-dev/eas-dev/components/logger/src
In directory sc8-pr-cvs1:/tmp/cvs-serv5135/components/logger/src
Modified Files:
consolelogger.cxx consolelogger.hxx logger.cxx
Removed Files:
logger_impls.hxx
Log Message:
minor changes in build process; `logger' component rewritten to 'handle'
log records; compiles but not tested yet. sigslot library added to common includes.
another minor changes
Index: consolelogger.cxx
===================================================================
RCS file: /cvsroot/eas-dev/eas-dev/components/logger/src/consolelogger.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- consolelogger.cxx 1 Feb 2003 04:10:19 -0000 1.2
+++ consolelogger.cxx 3 Feb 2003 09:06:51 -0000 1.3
@@ -63,8 +63,6 @@
Mutex m_mutex;
sal_Int32 m_nRefCount;
- sal_Bool m_ignore[8];
-
public:
@@ -97,20 +95,12 @@
static Sequence< OUString > SAL_CALL getSupportedServiceNames_Static();
// XConsoleLogger
- virtual void SAL_CALL ignoreLogLevel (logLevel aLL, sal_Bool bOnOff)
- throw (RuntimeException)
- {
- m_ignore[aLL] = bOnOff;
- }
-
- virtual void SAL_CALL log(logLevel aLL, const OUString& message)
+ virtual void SAL_CALL log(const OUString& message)
throw (RuntimeException)
{
- if (!m_ignore[aLL])
cout << message;
+ cout.flush();
}
-
-#include "logger_impls.hxx"
};
Index: consolelogger.hxx
===================================================================
RCS file: /cvsroot/eas-dev/eas-dev/components/logger/src/consolelogger.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- consolelogger.hxx 1 Feb 2003 04:10:19 -0000 1.2
+++ consolelogger.hxx 3 Feb 2003 09:06:52 -0000 1.3
@@ -24,8 +24,6 @@
Mutex m_mutex;
sal_Int32 m_nRefCount;
- sal_Bool m_ignore[8];
-
public:
@@ -53,9 +51,9 @@
// XXConsoleLogger
virtual void SAL_CALL ignoreLogLevel (logLevel aLL, sal_Bool bOnOff)
throw (RuntimeException);
- virtual void SAL_CALL log(logLevel aLL, const OUString& message)
+ virtual void SAL_CALL log(const OUString& message)
throw (RuntimeException);
- Sequence<OU_String> SAL_CALL getImplementations() throw (RuntimeException);
+ Sequence<OUString> SAL_CALL getImplementations() throw (RuntimeException);
};
Reference<XInterface> SAL_CALL XConsoleLoggerImpl_create(
Index: logger.cxx
===================================================================
RCS file: /cvsroot/eas-dev/eas-dev/components/logger/src/logger.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- logger.cxx 2 Feb 2003 06:59:11 -0000 1.3
+++ logger.cxx 3 Feb 2003 09:06:52 -0000 1.4
@@ -66,6 +66,7 @@
sal_Int32 m_nRefCount;
sal_Bool m_ignore[8];
+ Reference<XLoggerHandler> m_handler;
public:
@@ -105,10 +106,19 @@
{
m_ignore[aLL] = bOnOff;
}
-
+
virtual void SAL_CALL log(logLevel aLL, const OUString& message)
throw (RuntimeException)
{
+ if (!m_ignore[aLL])
+ m_handler->log(message);
+
+ }
+
+ virtual void SAL_CALL setHandler(const Reference<XLoggerHandler>& xHandler)
+ throw (RuntimeException)
+ {
+ m_handler = xHandler;
}
};
--- logger_impls.hxx DELETED ---
|
|
From: Yurii R. <yr...@us...> - 2003-02-03 09:06:55
|
Update of /cvsroot/eas-dev/eas-dev/doc/core-architecture/ru In directory sc8-pr-cvs1:/tmp/cvs-serv5135/doc/core-architecture/ru Modified Files: communication.xml Log Message: minor changes in build process; `logger' component rewritten to 'handle' log records; compiles but not tested yet. sigslot library added to common includes. another minor changes Index: communication.xml =================================================================== RCS file: /cvsroot/eas-dev/eas-dev/doc/core-architecture/ru/communication.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- communication.xml 28 Jan 2003 04:16:23 -0000 1.3 +++ communication.xml 3 Feb 2003 09:06:52 -0000 1.4 @@ -11,4 +11,8 @@ <citetitle>SXML</citetitle></ulink></para></footnote>. </para> </sect1> -</chapter> \ No newline at end of file + <sect1><title>çÌÏÓÓÁÒÉÊ</title> + <para><firstterm>ðÒÏÔÏËÏÌ</firstterm> -- ÐÏÄÍÎÏÖÅÓÔ×Ï (ÕÔÏÞÎÅÎÉÅ) ÍÅÔÁ-ÐÒÏÔÏËÏÌÁ</para> + </sect1> + +</chapter> |
|
From: Yurii R. <yr...@us...> - 2003-02-03 09:06:55
|
Update of /cvsroot/eas-dev/eas-dev/include In directory sc8-pr-cvs1:/tmp/cvs-serv5135/include Added Files: sigslot.h Log Message: minor changes in build process; `logger' component rewritten to 'handle' log records; compiles but not tested yet. sigslot library added to common includes. another minor changes --- NEW FILE: sigslot.h --- // sigslot.h: Signal/Slot classes // // Written by Sarah Thompson (sa...@te...) 2002. // // License: Public domain. You are free to use this code however you like, with the proviso that // the author takes on no responsibility or liability for any use. // // QUICK DOCUMENTATION // // (see also the full documentation at http://sigslot.sourceforge.net/) // // #define switches // SIGSLOT_PURE_ISO - Define this to force ISO C++ compliance. This also disables // all of the thread safety support on platforms where it is // available. // // SIGSLOT_USE_POSIX_THREADS - Force use of Posix threads when using a C++ compiler other than // gcc on a platform that supports Posix threads. (When using gcc, // this is the default - use SIGSLOT_PURE_ISO to disable this if [...2458 lines suppressed...] lock_block<mt_policy> lock(this); connections_list::const_iterator itNext, it = m_connected_slots.begin(); connections_list::const_iterator itEnd = m_connected_slots.end(); while(it != itEnd) { itNext = it; ++itNext; (*it)->emit(a1, a2, a3, a4, a5, a6, a7, a8); it = itNext; } } }; }; // namespace sigslot #endif // SIGSLOT_H__ |
|
From: Yurii R. <yr...@us...> - 2003-02-03 09:06:55
|
Update of /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/include
In directory sc8-pr-cvs1:/tmp/cvs-serv5135/libs/libsxmlstream/include
Modified Files:
sxmlhandler.hxx
Log Message:
minor changes in build process; `logger' component rewritten to 'handle'
log records; compiles but not tested yet. sigslot library added to common includes.
another minor changes
Index: sxmlhandler.hxx
===================================================================
RCS file: /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/include/sxmlhandler.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sxmlhandler.hxx 3 Feb 2003 06:30:47 -0000 1.1
+++ sxmlhandler.hxx 3 Feb 2003 09:06:52 -0000 1.2
@@ -22,11 +22,26 @@
#define _LIBSXMLSTREAM_SXMLHANDLER_HXX_
#include <sxml.hxx>
+#include <sxmlcont.hxx>
+
+#include <sigslot.h>
using namespace std;
+using namespace sigslot;
namespace openeas { namespace sxmlstream {
+
+class SXmlHandler: public has_slots<>
+{
+ public:
+ SXmlHandler() {};
+ ~SXmlHandler() {};
+
+ void handle(const SXmlNode& node);
+ void handle_cc(const SXmlNode& node, SXmlCont& cc);
+};
+
}; };
#endif /* _LIBSXMLSTREAM_SXMLHANDLER_HXX_ */
|
|
From: Yurii R. <yr...@us...> - 2003-02-03 09:06:54
|
Update of /cvsroot/eas-dev/eas-dev/components/logger/idl/org/openeas/util In directory sc8-pr-cvs1:/tmp/cvs-serv5135/components/logger/idl/org/openeas/util Modified Files: XLogger.idl Log Message: minor changes in build process; `logger' component rewritten to 'handle' log records; compiles but not tested yet. sigslot library added to common includes. another minor changes Index: XLogger.idl =================================================================== RCS file: /cvsroot/eas-dev/eas-dev/components/logger/idl/org/openeas/util/XLogger.idl,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- XLogger.idl 2 Feb 2003 06:59:11 -0000 1.4 +++ XLogger.idl 3 Feb 2003 09:06:51 -0000 1.5 @@ -31,8 +31,7 @@ void ignoreLogLevel([in] logLevel aLL, [in] boolean bOnOff); void log([in] logLevel aLL, [in] string message); - void addHandler([in] XLoggerHandler xHandler); - void removeHandler([in] XLoggerHandler xHandler); + void setHandler([in] XLoggerHandler xHandler); }; |
|
From: Yurii R. <yr...@us...> - 2003-02-03 09:06:54
|
Update of /cvsroot/eas-dev/eas-dev/components/logger In directory sc8-pr-cvs1:/tmp/cvs-serv5135/components/logger Modified Files: Makefile.am Log Message: minor changes in build process; `logger' component rewritten to 'handle' log records; compiles but not tested yet. sigslot library added to common includes. another minor changes Index: Makefile.am =================================================================== RCS file: /cvsroot/eas-dev/eas-dev/components/logger/Makefile.am,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- Makefile.am 2 Feb 2003 06:59:10 -0000 1.5 +++ Makefile.am 3 Feb 2003 09:06:51 -0000 1.6 @@ -6,4 +6,4 @@ COMPONENT = logger -@INCLUDE@ ../../build/unix/mk/component.mk \ No newline at end of file +@INCLUDE@ $(top_srcdir)/mk/component.mk \ No newline at end of file |
|
From: Yurii R. <yr...@us...> - 2003-02-03 09:06:53
|
Update of /cvsroot/eas-dev/eas-dev/components/gmp In directory sc8-pr-cvs1:/tmp/cvs-serv5135/components/gmp Modified Files: Makefile.am Log Message: minor changes in build process; `logger' component rewritten to 'handle' log records; compiles but not tested yet. sigslot library added to common includes. another minor changes Index: Makefile.am =================================================================== RCS file: /cvsroot/eas-dev/eas-dev/components/gmp/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Makefile.am 3 Feb 2003 06:30:45 -0000 1.3 +++ Makefile.am 3 Feb 2003 09:06:50 -0000 1.4 @@ -5,4 +5,4 @@ COMPONENT = gmp -@INCLUDE@ ../../build/unix/mk/component.mk \ No newline at end of file +@INCLUDE@ $(top_srcdir)/mk/component.mk \ No newline at end of file |
|
From: Yurii R. <yr...@us...> - 2003-02-03 09:06:53
|
Update of /cvsroot/eas-dev/eas-dev/components In directory sc8-pr-cvs1:/tmp/cvs-serv5135/components Modified Files: Makefile.am Log Message: minor changes in build process; `logger' component rewritten to 'handle' log records; compiles but not tested yet. sigslot library added to common includes. another minor changes Index: Makefile.am =================================================================== RCS file: /cvsroot/eas-dev/eas-dev/components/Makefile.am,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- Makefile.am 3 Feb 2003 06:30:45 -0000 1.5 +++ Makefile.am 3 Feb 2003 09:06:50 -0000 1.6 @@ -91,7 +91,7 @@ CLEANFILES = openeas.rdb openeas-basic.rdb clean-local: - rm -rf inc + rm -rf .include all-local: openeas.rdb |
|
From: Yurii R. <yr...@us...> - 2003-02-03 09:06:53
|
Update of /cvsroot/eas-dev/eas-dev/build/unix In directory sc8-pr-cvs1:/tmp/cvs-serv5135/build/unix Modified Files: configure.in Log Message: minor changes in build process; `logger' component rewritten to 'handle' log records; compiles but not tested yet. sigslot library added to common includes. another minor changes Index: configure.in =================================================================== RCS file: /cvsroot/eas-dev/eas-dev/build/unix/configure.in,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- configure.in 3 Feb 2003 06:30:44 -0000 1.12 +++ configure.in 3 Feb 2003 09:06:50 -0000 1.13 @@ -21,7 +21,7 @@ # As I think, since we're build `unix' version, platform for SAL # should be SAL_UNX. However, check this! -dnl AC_DEFINE(SAL_UNX) +AC_DEFINE(SAL_UNX) dnl dnl Check for compilers |
|
From: Yurii R. <yr...@us...> - 2003-02-03 09:04:03
|
Update of /cvsroot/eas-dev/eas-dev/include In directory sc8-pr-cvs1:/tmp/cvs-serv4702/include Log Message: Directory /cvsroot/eas-dev/eas-dev/include added to the repository |
|
From: Yurii R. <yr...@us...> - 2003-02-03 06:31:21
|
Update of /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/include
In directory sc8-pr-cvs1:/tmp/cvs-serv18441/libs/libsxmlstream/include
Modified Files:
sxml.hxx sxmlstream.hxx
Added Files:
sxmlhandler.hxx
Log Message:
mofidifed build process; changes to libsxmlstream (seems that it is still
broken); minor additions over the project
--- NEW FILE: sxmlhandler.hxx ---
/*******************************************************/
/* */
/* libsxmlstream */
/* */
/* Copyright (c) 2003. */
/* E/AS Software Foundation */
/* */
/* Author(s): */
/* Yurii A. Rashkovskii <yr...@op...> */
/* */
/* */
/* This program is free software; you can redistribute */
/* it and/or modify it under the terms of the GNU */
/* Lesser General Public License as published by the */
/* Free Software Foundation; version 2 of the License. */
/* */
/*******************************************************/
/* $Id: sxmlhandler.hxx,v 1.1 2003/02/03 06:30:47 yrashk Exp $ */
#ifndef _LIBSXMLSTREAM_SXMLHANDLER_HXX_
#define _LIBSXMLSTREAM_SXMLHANDLER_HXX_
#include <sxml.hxx>
using namespace std;
namespace openeas { namespace sxmlstream {
}; };
#endif /* _LIBSXMLSTREAM_SXMLHANDLER_HXX_ */
Index: sxml.hxx
===================================================================
RCS file: /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/include/sxml.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- sxml.hxx 2 Feb 2003 06:59:11 -0000 1.4
+++ sxml.hxx 3 Feb 2003 06:30:46 -0000 1.5
@@ -27,6 +27,8 @@
using namespace std;
+namespace openeas { namespace sxmlstream {
+
enum SXmlNode_t {
SXmlNode_Element_t,
SXmlNode_Attribute_t,
@@ -44,8 +46,9 @@
SXmlNode& operator=(const SXmlNode& v);
~SXmlNode() { delete descendants; }
- SXmlNode(const SXmlNode_t aType, const string aData) {data = aData;
- type = aType;}
+ SXmlNode(const SXmlNode_t aType, const string aData) {descendants = new list<SXmlNode>;
+ data = aData;
+ type = aType;}
bool isElement() const { return type == SXmlNode_Element_t; }
bool isAttribute() const { return type == SXmlNode_Attribute_t; }
@@ -73,5 +76,7 @@
static SXmlNode Namespace(const string aPrefix, const string aURI);
};
+
+}; };
#endif /* _LIBSXMLSTREAM_SXML_HXX_ */
Index: sxmlstream.hxx
===================================================================
RCS file: /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/include/sxmlstream.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- sxmlstream.hxx 28 Jan 2003 22:36:25 -0000 1.7
+++ sxmlstream.hxx 3 Feb 2003 06:30:47 -0000 1.8
@@ -23,9 +23,12 @@
#include <queue>
#include <sxml.hxx>
+#include <sxmlhandler.hxx>
using namespace std;
+namespace openeas { namespace sxmlstream {
+
class SXmlStream
{
protected:
@@ -76,5 +79,6 @@
};
+}; };
#endif /* _LIBSXMLSTREAM_SXMLSTREAM_HXX_ */
|
|
From: Yurii R. <yr...@us...> - 2003-02-03 06:31:21
|
Update of /cvsroot/eas-dev/eas-dev/components/logger/src In directory sc8-pr-cvs1:/tmp/cvs-serv18441/components/logger/src Modified Files: Makefile.am Log Message: mofidifed build process; changes to libsxmlstream (seems that it is still broken); minor additions over the project Index: Makefile.am =================================================================== RCS file: /cvsroot/eas-dev/eas-dev/components/logger/src/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Makefile.am 2 Feb 2003 06:59:11 -0000 1.2 +++ Makefile.am 3 Feb 2003 06:30:45 -0000 1.3 @@ -12,6 +12,6 @@ lib_LTLIBRARIES = liblogger.la liblogger_la_SOURCES = logger.cxx consolelogger.cxx -INCLUDES = -I../../inc -I@top_include@ -I@ODK_PATH@/include +INCLUDES = -I../../.include -I@top_include@ -I@ODK_PATH@/include liblogger_la_LIBADD = $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) $(STLPORTLIB) -lstdc++ liblogger_la_LDFLAGS = -L/opt/openoffice/program/ -L@ODK_PATH@/linux/lib |
|
From: Yurii R. <yr...@us...> - 2003-02-03 06:31:21
|
Update of /cvsroot/eas-dev/eas-dev/components/logger In directory sc8-pr-cvs1:/tmp/cvs-serv18441/components/logger Modified Files: .cvsignore Log Message: mofidifed build process; changes to libsxmlstream (seems that it is still broken); minor additions over the project Index: .cvsignore =================================================================== RCS file: /cvsroot/eas-dev/eas-dev/components/logger/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- .cvsignore 23 Jan 2003 00:23:59 -0000 1.1 +++ .cvsignore 3 Feb 2003 06:30:45 -0000 1.2 @@ -1,4 +1,3 @@ bin -inc Makefile Makefile.in |
|
From: Yurii R. <yr...@us...> - 2003-02-03 06:31:18
|
Update of /cvsroot/eas-dev/eas-dev/components In directory sc8-pr-cvs1:/tmp/cvs-serv18441/components Modified Files: .cvsignore Makefile.am Log Message: mofidifed build process; changes to libsxmlstream (seems that it is still broken); minor additions over the project Index: .cvsignore =================================================================== RCS file: /cvsroot/eas-dev/eas-dev/components/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- .cvsignore 2 Feb 2003 06:59:10 -0000 1.4 +++ .cvsignore 3 Feb 2003 06:30:45 -0000 1.5 @@ -3,4 +3,4 @@ openeas-basic.bin openeas-basic.rdb openeas.rdb -inc \ No newline at end of file +.include \ No newline at end of file Index: Makefile.am =================================================================== RCS file: /cvsroot/eas-dev/eas-dev/components/Makefile.am,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- Makefile.am 25 Jan 2003 21:51:27 -0000 1.4 +++ Makefile.am 3 Feb 2003 06:30:45 -0000 1.5 @@ -1,8 +1,10 @@ -COMPONENTS = logger +COMPONENTS = gmp ODK = @ODK_PATH@ IDLC = @IDLC@ REGMERGE = @REGMERGE@ +RM = @RM@ + IDL_PATH = $(ODK)/idl BIN_PATH = openeas-basic.bin @@ -86,19 +88,25 @@ COMPONENTS_REGISTRY=$(patsubst %,%/bin/%.rdb,$(COMPONENTS)) -all-local: openeas.rdb +CLEANFILES = openeas.rdb openeas-basic.rdb + +clean-local: + rm -rf inc + +all-local: openeas.rdb openeas.rdb: $(COMPONENTS_REGISTRY) $(REGMERGE) openeas.rdb /UCR openeas-basic.rdb $(COMPONENTS_REGISTRY) + $(RM) -rf openeas-basic.rdb $(COMPONENTS_REGISTRY): openeas-basic.rdb for dir in $(COMPONENTS); do \ $(MAKE) -C $$dir; \ done - openeas-basic.rdb: $(BASIC_URDS_) $(REGMERGE) openeas-basic.rdb /UCR $(BASIC_URDS_) + $(RM) -rf $(BIN_PATH) $(BASIC_URDS_) : $(BASIC_IDLS_) for idl in $(BASIC_IDLS); do \ |
|
From: Yurii R. <yr...@us...> - 2003-02-03 06:31:18
|
Update of /cvsroot/eas-dev/eas-dev/components/gmp In directory sc8-pr-cvs1:/tmp/cvs-serv18441/components/gmp Modified Files: .cvsignore Makefile.am Log Message: mofidifed build process; changes to libsxmlstream (seems that it is still broken); minor additions over the project Index: .cvsignore =================================================================== RCS file: /cvsroot/eas-dev/eas-dev/components/gmp/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- .cvsignore 23 Jan 2003 00:23:59 -0000 1.1 +++ .cvsignore 3 Feb 2003 06:30:45 -0000 1.2 @@ -1,4 +1,3 @@ bin -inc Makefile Makefile.in Index: Makefile.am =================================================================== RCS file: /cvsroot/eas-dev/eas-dev/components/gmp/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Makefile.am 23 Jan 2003 00:50:27 -0000 1.2 +++ Makefile.am 3 Feb 2003 06:30:45 -0000 1.3 @@ -1,10 +1,8 @@ -IDL_FILES = +RM = @RM@ + +IDL_FILES = org/openeas/gmp/XEndpoint.idl SRC_FILES = COMPONENT = gmp -# do nothing -all-local: - true - -#include ../../build/unix/mk/component.mk \ No newline at end of file +@INCLUDE@ ../../build/unix/mk/component.mk \ No newline at end of file |
|
From: Yurii R. <yr...@us...> - 2003-02-03 06:31:18
|
Update of /cvsroot/eas-dev/eas-dev/build/unix/mk In directory sc8-pr-cvs1:/tmp/cvs-serv18441/build/unix/mk Modified Files: component.mk.in Log Message: mofidifed build process; changes to libsxmlstream (seems that it is still broken); minor additions over the project Index: component.mk.in =================================================================== RCS file: /cvsroot/eas-dev/eas-dev/build/unix/mk/component.mk.in,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- component.mk.in 2 Feb 2003 06:59:10 -0000 1.6 +++ component.mk.in 3 Feb 2003 06:30:44 -0000 1.7 @@ -1,4 +1,4 @@ - +RM = @RM@ XML2CMP = @XML2CMP@ IDLC = @IDLC@ REGMERGE = @REGMERGE@ @@ -36,7 +36,7 @@ endif ifndef INC_PATH - INC_PATH = ../inc + INC_PATH = ../.include endif ifndef SRC_PATH @@ -76,3 +76,5 @@ $(IDLC) -I$(ODK_PATH)/idl -I$(IDL_PATH) -O$(BIN_PATH)/`dirname $$idl` $(IDL_PATH)/$$idl; \ done +clean: + $(RM) -rf $(BIN_PATH) \ No newline at end of file |
|
From: Yurii R. <yr...@us...> - 2003-02-03 06:31:18
|
Update of /cvsroot/eas-dev/eas-dev/build/unix In directory sc8-pr-cvs1:/tmp/cvs-serv18441/build/unix Modified Files: INSTALL configure.in Log Message: mofidifed build process; changes to libsxmlstream (seems that it is still broken); minor additions over the project Index: INSTALL =================================================================== RCS file: /cvsroot/eas-dev/eas-dev/build/unix/INSTALL,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- INSTALL 2 Feb 2003 06:59:10 -0000 1.1 +++ INSTALL 3 Feb 2003 06:30:44 -0000 1.2 @@ -7,15 +7,16 @@ Following software is needed to build E/AS. -automake 1.4-p5 -autoconf 2.13 -gcc 3.0.4 or higher -make 3.79.1 or higher +automake 1.4-p5 (for developers) +autoconf 2.13 (for developers) +Python 2.0 or above (http://www.python.org/) (for developers) +gcc 3.0.4 or above +make 3.79.1 or above glib 2.2.0 (http://www.gtk.org/) CxxTest 2.8.0 (http://cxxtest.sourceforge.net/) pkg-config 0.15.0 (http://www.freedesktop.org/software/pkgconfig) OpenOffice.Org SDK 1.0.1_alpha (http://udk.openoffice.org/) -Python 2.0 or higher (http://www.python.org/) + NOTES ON OPENOFFICE.ORG SDK Index: configure.in =================================================================== RCS file: /cvsroot/eas-dev/eas-dev/build/unix/configure.in,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- configure.in 2 Feb 2003 06:59:10 -0000 1.11 +++ configure.in 3 Feb 2003 06:30:44 -0000 1.12 @@ -91,6 +91,11 @@ dnl Tools dnl +AC_CHECK_PROG(RM,rm,rm,no) +if test "$RM" = no ; then + AC_MSG_ERROR(Cannot find rm.) +fi + dnl dnl Output dnl |
|
From: Yurii R. <yr...@us...> - 2003-02-03 06:30:53
|
Update of /cvsroot/eas-dev/eas-dev/services/domain-controller In directory sc8-pr-cvs1:/tmp/cvs-serv18441/services/domain-controller Modified Files: service.cxx Log Message: mofidifed build process; changes to libsxmlstream (seems that it is still broken); minor additions over the project Index: service.cxx =================================================================== RCS file: /cvsroot/eas-dev/eas-dev/services/domain-controller/service.cxx,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- service.cxx 21 Jan 2003 00:44:27 -0000 1.1 +++ service.cxx 3 Feb 2003 06:30:50 -0000 1.2 @@ -1,4 +1,4 @@ - +/* $Id$ */ #include <stdio.h> #include <stdlib.h> |
