Skip to content

Commit 634073f

Browse files
knorrieknorrie
committed
Import m2ee-tools 0.3.6.1 with packaging files
1 parent 88996a1 commit 634073f

35 files changed

+3451
-0
lines changed

‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,5 @@ pip-log.txt
2525

2626
#Mr Developer
2727
.mr.developer.cfg
28+
29+
*.swp

‎CHANGES

+104
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
m2ee-tools 0.3.6.1, 19 Mar 2012
2+
* m2ee-tools is python 2.4 compatible again (remove a conditional expression)
3+
* Add missing autosubscribe option in file logging example config
4+
* Use sys.exit() instead of exit()
5+
6+
m2ee-tools 0.3.6, 9 Feb 2012
7+
* Fix crash when message field in critical logmessage is not present
8+
9+
m2ee-tools 0.3.5, 2 Jan 2012
10+
* Fix: Remove leftover test code causing 'Caused by: bla'
11+
* Fix: if running the Mendix Runtime from source using eclipse, dont try
12+
to find where m2ee/runtime jars live
13+
* Fix: also put model lib into classpath when running Mendix from source
14+
15+
m2ee-tools 0.3.4, 17 Oct 2011
16+
* Fix MicroFlowConstants -> MicroflowConstants typo, which causes mf
17+
constants not to be recognized if put in custom section in m2ee.yaml
18+
Thanks to Jonathan van Alteren <[email protected]>
19+
20+
m2ee-tools 0.3.3, 7 Sep 2011
21+
22+
* Fix nagios output: don't put status information in performance data
23+
section
24+
* Now compatible with 2.5.0 < Mendix <= 3.0.0-rc1
25+
* Fix missing send_mime_types functionality (mime types were being ignored
26+
until now)
27+
* Stop application startup when sending configuration causes error messages
28+
* Add munin-config-cache, so munin_config will output last-known configuration,
29+
while munin_values won't output values.
30+
This prevents graphs from disappearing when an application is not running.
31+
* Improve feedback when "pid alive, m2ee does not respond": more verbose
32+
explanation; tell user to consider restarting the application process.
33+
34+
m2ee-tools 0.3.2, unreleased
35+
36+
* Fix string formatting issues
37+
* get_logged_in_user_names is now who or w
38+
39+
m2ee-tools 0.3.1, 7 Jun 2011
40+
41+
* Fix string formatting error in restoredb error output
42+
* instead of all to stderr, log everything below ERROR to to stdout,
43+
log everything that's ERROR and more serious to stderr
44+
45+
m2ee-tools 0.3.0, 30 May 2011
46+
47+
* Add help text explaining available commands
48+
* Add health check functionality
49+
* Integrate munin and nagios plugin into m2ee scripts. Yay!
50+
* Always use effective uid for os.path.expanduser (fixes issues with
51+
running as munin-plugin)
52+
* Don't read deprecated m2eerc-file if yaml version is present
53+
* Remove conditional expressions in command line argument processing
54+
because they make python 2.4 cry
55+
* Update Mendix copyright and license notices, cleanup third-party licenses
56+
* Implement sending monitoring_pass at startup
57+
* Cleanup pidfile handling and detection of running / not running
58+
* Implement setting output verbosity at startup using -v/-q
59+
* Use python logging module for logging instead of print statements
60+
* Refactored startup code
61+
* Add option to save ddl commands besides view/execute
62+
* Fix minute/month formatting typo in filenames for ddl/pg_dump output
63+
* Search for /etc/m2ee/m2ee.yaml and ~/.m2ee/m2ee.yaml by default,
64+
m2eerc-variants are now deprecated
65+
* Fallback to using sqlite3 binary via subprocess module when import sqlite3
66+
fails (e.g. when running using python 2.4)
67+
* Add warning about using experimental profiling code in production
68+
* Add configuration file examples
69+
* Allow mxjar_repo to be a list of multiple locations
70+
71+
m2ee-tools 0.2.3, 29 Mar 2011
72+
73+
* Prevent m2ee from hanging when the xas is unresponsive
74+
* Add preserve_environment and custom_environment
75+
* Prevent m2ee from hanging when the xas is unresponsive
76+
* Immediately write pid of jvm when available
77+
78+
m2ee-tools 0.2.2, 17 Feb 2011
79+
80+
* Make psql/pg_dump/pg_restore to be used configurable
81+
* Add psql convenience command
82+
* Fix crash when trying to start before unpacking anything
83+
* Quick implementation of loglevel get/set FEATURE~~1111
84+
85+
m2ee-tools 0.2.1, 30 Nov 2010
86+
87+
* Call tail with -F instead of -f at log
88+
* Add agile request-profiler client
89+
* Add post-unpack-hook option
90+
* Let java itself search for .jar files in lib directories
91+
* Move java classpath after javaopts on command line
92+
* Changes for Mendix 2.5.0:
93+
- Don't automatically ask for creation of admin user (check was broken
94+
anyway). Calling create_admin_user manually is still possible.
95+
- Implement interactive update_admin_user action to allow reset of user
96+
account password, even when it's not 1.
97+
- Add get_logged_in_user_names and simple about action
98+
- Print (a maximum of 10) logged in users when executing status action
99+
- Include lib/userlib/* (jars) in the classpath as well
100+
* fix allow_destroy_db
101+
102+
m2ee-tools 0.1.0, 11 May 2010
103+
104+
* Initial release

‎LICENSE

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
Copyright (c) 2009-2012, Mendix.
2+
All Rights Reserved.
3+
4+
Redistribution and use in source and binary forms, with or without
5+
modification, are permitted provided that the following conditions are met:
6+
7+
* Redistributions of source code must retain the above copyright
8+
notice, this list of conditions and the following disclaimer.
9+
* Redistributions in binary form must reproduce the above copyright
10+
notice, this list of conditions and the following disclaimer in the
11+
documentation and/or other materials provided with the distribution.
12+
* Neither the name of Mendix nor the
13+
names of its contributors may be used to endorse or promote products
14+
derived from this software without specific prior written permission.
15+
16+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
17+
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18+
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19+
DISCLAIMED. IN NO EVENT SHALL MENDIX BE LIABLE FOR ANY
20+
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21+
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22+
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23+
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25+
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

‎examples/system-wide-m2ee.yaml

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#
2+
# /etc/m2ee/m2ee.yaml
3+
# system-wide m2ee configuration
4+
#
5+
mxnode:
6+
# mxjar_repo, containing directories with version-numbering, which contain
7+
# mxruntime, m2ee-server directories with java libraries and the mxclientsystem
8+
mxjar_repo: [/usr/share/mendix/, /usr/local/share/mendix/]
9+
# override postgres client tools versions to use
10+
#pg_dump: /usr/lib/postgresql/8.3/bin/pg_dump
11+
#pg_restore: /usr/lib/postgresql/8.4/bin/pg_restore
12+
#psql: /usr/lib/postgresql/8.3/bin/psql
13+

‎examples/user-specific-m2ee.yaml

+135
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,135 @@
1+
#
2+
# ~/.m2ee/m2ee.yaml
3+
# user/application specific configuration
4+
#
5+
m2ee:
6+
app_name: __MXPROJECT__
7+
app_base: /srv/mendix/__MXUSER__
8+
# m2ee admin interface and password
9+
admin_port: __MXADMPORT__
10+
admin_pass: __MXADMPASS__
11+
monitoring_pass: __MXMONPASS__
12+
# mxruntime web interface port
13+
runtime_port: __MXPORT__
14+
# set to true when running behind a 'connection offloading' http proxy that already
15+
# deals with many idle browser connections
16+
runtime_blocking_connector: true
17+
# preserve_environment can be eiter:
18+
# true -> keep all environment variables when starting the JVM process
19+
# false -> keep none (default)
20+
# a list of env variable names to keep (e.g. ["LOGNAME","LANG"]), while ignoring all others
21+
#preserve_environment: false
22+
# custom_environment can be used to add custom enviroment variables when starting the JVM process
23+
#custom_environment:
24+
#SOME_ENV_VAR: value
25+
#OTHER_ENV_VAR: value2
26+
# custom java options, like -Xmx256m or -Djava.foo=bar
27+
# note: in case you are using ia32-sun-java6-bin, you want to add the following option:
28+
# "-Dsun.io.useCanonPrefixCache=false". Also see http://bugs.debian.org/617402.
29+
javaopts: [
30+
"-Dfile.encoding=UTF-8", "-XX:MaxPermSize=64M", "-Xmx128M", "-Xms128M",
31+
"-Djava.io.tmpdir=/srv/mendix/__MXUSER__/data/tmp",
32+
]
33+
# force specific mxruntime version to use (e.g. mdp has no valid version number)
34+
# if empty, the version will be autodetected using the mdp file
35+
#runtime_version:
36+
# if true, try to symlink web/mxclientsystem to the mxclientsystem directory
37+
# of the runtime distribution currently in use (useful for fixed config webserver
38+
# that followes symlinks)
39+
symlink_mxclientsystem: true
40+
# run this at the end of an unpack-action (>2.5.0-rc2)
41+
#post_unpack_hook: '/home/knorrie/bin/post-unpack-hook.sh'
42+
# file in which to store the pid of the running m2ee process
43+
pidfile: /home/__MXUSER__/.m2ee/m2ee.pid
44+
# setting False disables the emtpydb and restoredb commands
45+
allow_destroy_db: true
46+
# this location is used for writing/reading database dumps and writing validation
47+
# query logs. defaults to $app_base/data/database
48+
#database_dump_path:
49+
# this location is used for reading model uploads (.zip or .mda)
50+
# it defaults to $app_base/data/model-upload
51+
#model_upload_path:
52+
# experimental: log file location to use for a quick tail call
53+
logfile: /var/log/xas2/__MXUSER__.log
54+
jetty:
55+
# Jetty tweaking... Better not use these unless you really know what you're doing.
56+
# Options only apply to the MxRuntime http server
57+
#runtime_min_threads: 8
58+
#runtime_max_threads: 254
59+
munin:
60+
#config_cache: /home/__MXUSER__/.m2ee/munin-cache.json
61+
#graph_total_named_users: True
62+
mimetypes:
63+
bmp: image/bmp
64+
logging:
65+
- # <- list of dicts
66+
name: SysLogSubscriber
67+
type: syslog
68+
autosubscribe: INFO
69+
host: localhost
70+
port: 514
71+
facility: LOG_LOCAL6
72+
prefix: __MXUSER__
73+
# - # example of file logging by the platform itself
74+
# name: FileSubscriber
75+
# type: file
76+
# autosubscribe: INFO
77+
# filename: /path/to/your/favorite/logfile
78+
# max_size: 10485760 # bytes(!!)
79+
# max_rotation: 7
80+
custom:
81+
# put microflow constants in here
82+
#"Module.Constant": text
83+
#"AnotherModule.AnotherConstant": bla
84+
mxruntime:
85+
DTAPMode: P
86+
#XASId:
87+
#
88+
# MxRuntime still needs to know where we found it, to fetch stuff like
89+
# microflow debugger icons and the mxclientsystem. Also ModelerAPI ClassCache
90+
# needs it.
91+
#RuntimePath: defaults to $runtimepath
92+
# the location of the mxclientsystem only needs to be specified when it's not
93+
# to be found in its default location, as subdirectory of RuntimePath
94+
#MxClientSystemPath: defaults to $runtimepath/mxclientsystem
95+
96+
# File/Dir locations
97+
#
98+
#
99+
#BasePath: defaults to $app_base
100+
#PublicWebrootPath: defaults to $app_base/web/
101+
#BuiltInDatabasePath: defaults to $app_base/data/database/
102+
#TempPath: defaults to $app_base/tmp/
103+
#UploadedFilesPath: defaults to $app_base/data/files/
104+
KeyFile: /home/__MXUSER__/.m2ee/key.mx
105+
#ModelerFile: defaults to $app_base/model/model.mdp
106+
#
107+
108+
# The following options will *not* be read from the modeler file in A/P mode:
109+
#
110+
ApplicationRootUrl: https://__MXURL__/
111+
DatabaseType: PostgreSQL
112+
DatabaseHost: localhost
113+
DatabaseName: __MXUSER__
114+
DatabaseUserName: __MXUSER__
115+
DatabasePassword: __MXPGPASS__
116+
117+
# The following options will be read from the modeler file, but can be overridden here:
118+
#
119+
#AdminUserName:
120+
#GuestUserRoleName:
121+
#AdminUserRoleName:
122+
#EnableGuestLogin:
123+
#ShowNavigationTree:
124+
#HashAlgorithm:
125+
#WsdlTargetNamespace:
126+
#
127+
128+
# The following options can only be set here:
129+
#PersistentSessions: false
130+
# ScheduledEventExecution can be set to ALL, NONE (default) or SPECIFIED
131+
ScheduledEventExecution: NONE
132+
# When using ScheduledEventExecution SPECIFIED, provide a comma-separated list
133+
# of actions to enable:
134+
#MyScheduledEvents: "Module.Comma,Module.Seperated,Module.Stuff"
135+

0 commit comments

Comments
 (0)