Skip to content

Commit 8b70c37

Browse files
author
Marian Krivos
committed
trunk: sync from 1.4.3
make & cmake fixes
1 parent 0afd048 commit 8b70c37

55 files changed

Lines changed: 2799 additions & 2231 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎ApacheConnector/include/ApacheApplication.h‎

Lines changed: 78 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,78 @@
1-
//
2-
// ApacheApplication.h
3-
//
4-
// $Id: //poco/Main/ApacheConnector/include/ApacheApplication.h#2 $
5-
//
6-
// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
7-
// All rights reserved.
8-
//
9-
// This is unpublished proprietary source code of Applied Informatics.
10-
// The contents of this file may not be disclosed to third parties,
11-
// copied or duplicated in any form, in whole or in part.
12-
//
13-
14-
15-
#ifndef ApacheConnector_ApacheApplication_INCLUDED
16-
#define ApacheConnector_ApacheApplication_INCLUDED
17-
18-
19-
#include "ApacheRequestHandlerFactory.h"
20-
#include "Poco/Util/Application.h"
21-
#include "Poco/Mutex.h"
22-
23-
24-
class ApacheApplication: public Poco::Util::Application
25-
{
26-
public:
27-
ApacheApplication();
28-
/// Creates the ApacheApplication and sets the
29-
/// ApacheChannel as the root logger channel.
30-
31-
~ApacheApplication();
32-
/// Destroys the ApacheApplication.
33-
34-
void setup();
35-
/// Initializes the application if called for the first
36-
/// time; does nothing in later calls.
37-
38-
ApacheRequestHandlerFactory& factory();
39-
/// Returns the ApacheRequestHandlerFactory.
40-
41-
static ApacheApplication& instance();
42-
/// Returns the application instance.
43-
44-
private:
45-
bool _ready;
46-
ApacheRequestHandlerFactory _factory;
47-
Poco::FastMutex _mutex;
48-
};
49-
50-
51-
//
52-
// inlines
53-
//
54-
inline ApacheRequestHandlerFactory& ApacheApplication::factory()
55-
{
56-
return _factory;
57-
}
58-
59-
60-
#endif // ApacheConnector_ApacheApplication_INCLUDED
1+
//
2+
// ApacheApplication.h
3+
//
4+
// $Id: //poco/1.4/ApacheConnector/include/ApacheApplication.h#2 $
5+
//
6+
// Copyright (c) 2006-2011, Applied Informatics Software Engineering GmbH.
7+
// and Contributors.
8+
//
9+
// Permission is hereby granted, free of charge, to any person or organization
10+
// obtaining a copy of the software and accompanying documentation covered by
11+
// this license (the "Software") to use, reproduce, display, distribute,
12+
// execute, and transmit the Software, and to prepare derivative works of the
13+
// Software, and to permit third-parties to whom the Software is furnished to
14+
// do so, all subject to the following:
15+
//
16+
// The copyright notices in the Software and this entire statement, including
17+
// the above license grant, this restriction and the following disclaimer,
18+
// must be included in all copies of the Software, in whole or in part, and
19+
// all derivative works of the Software, unless such copies or derivative
20+
// works are solely in the form of machine-executable object code generated by
21+
// a source language processor.
22+
//
23+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
24+
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
25+
// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
26+
// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
27+
// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
28+
// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
29+
// DEALINGS IN THE SOFTWARE.
30+
//
31+
32+
33+
#ifndef ApacheConnector_ApacheApplication_INCLUDED
34+
#define ApacheConnector_ApacheApplication_INCLUDED
35+
36+
37+
#include "ApacheRequestHandlerFactory.h"
38+
#include "Poco/Util/Application.h"
39+
#include "Poco/Mutex.h"
40+
41+
42+
class ApacheApplication: public Poco::Util::Application
43+
{
44+
public:
45+
ApacheApplication();
46+
/// Creates the ApacheApplication and sets the
47+
/// ApacheChannel as the root logger channel.
48+
49+
~ApacheApplication();
50+
/// Destroys the ApacheApplication.
51+
52+
void setup();
53+
/// Initializes the application if called for the first
54+
/// time; does nothing in later calls.
55+
56+
ApacheRequestHandlerFactory& factory();
57+
/// Returns the ApacheRequestHandlerFactory.
58+
59+
static ApacheApplication& instance();
60+
/// Returns the application instance.
61+
62+
private:
63+
bool _ready;
64+
ApacheRequestHandlerFactory _factory;
65+
Poco::FastMutex _mutex;
66+
};
67+
68+
69+
//
70+
// inlines
71+
//
72+
inline ApacheRequestHandlerFactory& ApacheApplication::factory()
73+
{
74+
return _factory;
75+
}
76+
77+
78+
#endif // ApacheConnector_ApacheApplication_INCLUDED

‎ApacheConnector/include/ApacheChannel.h‎

Lines changed: 52 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,52 @@
1-
//
2-
// ApacheChannel.h
3-
//
4-
// $Id: //poco/Main/ApacheConnector/include/ApacheChannel.h#1 $
5-
//
6-
// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
7-
// All rights reserved.
8-
//
9-
// This is unpublished proprietary source code of Applied Informatics.
10-
// The contents of this file may not be disclosed to third parties,
11-
// copied or duplicated in any form, in whole or in part.
12-
//
13-
14-
15-
#ifndef ApacheConnector_ApacheChannel_INCLUDED
16-
#define ApacheConnector_ApacheChannel_INCLUDED
17-
18-
19-
#include "Poco/Channel.h"
20-
21-
22-
class ApacheChannel: public Poco::Channel
23-
/// This class implements a logging channel
24-
/// that uses the Apache logging facilities.
25-
{
26-
public:
27-
ApacheChannel();
28-
~ApacheChannel();
29-
30-
void log(const Poco::Message& msg);
31-
};
32-
33-
34-
#endif // ApacheConnector_ApacheChannel_INCLUDED
1+
//
2+
// ApacheChannel.h
3+
//
4+
// $Id: //poco/1.4/ApacheConnector/include/ApacheChannel.h#2 $
5+
//
6+
// Copyright (c) 2006-2011, Applied Informatics Software Engineering GmbH.
7+
// and Contributors.
8+
//
9+
// Permission is hereby granted, free of charge, to any person or organization
10+
// obtaining a copy of the software and accompanying documentation covered by
11+
// this license (the "Software") to use, reproduce, display, distribute,
12+
// execute, and transmit the Software, and to prepare derivative works of the
13+
// Software, and to permit third-parties to whom the Software is furnished to
14+
// do so, all subject to the following:
15+
//
16+
// The copyright notices in the Software and this entire statement, including
17+
// the above license grant, this restriction and the following disclaimer,
18+
// must be included in all copies of the Software, in whole or in part, and
19+
// all derivative works of the Software, unless such copies or derivative
20+
// works are solely in the form of machine-executable object code generated by
21+
// a source language processor.
22+
//
23+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
24+
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
25+
// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
26+
// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
27+
// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
28+
// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
29+
// DEALINGS IN THE SOFTWARE.
30+
//
31+
32+
33+
#ifndef ApacheConnector_ApacheChannel_INCLUDED
34+
#define ApacheConnector_ApacheChannel_INCLUDED
35+
36+
37+
#include "Poco/Channel.h"
38+
39+
40+
class ApacheChannel: public Poco::Channel
41+
/// This class implements a logging channel
42+
/// that uses the Apache logging facilities.
43+
{
44+
public:
45+
ApacheChannel();
46+
~ApacheChannel();
47+
48+
void log(const Poco::Message& msg);
49+
};
50+
51+
52+
#endif // ApacheConnector_ApacheChannel_INCLUDED

0 commit comments

Comments
 (0)