passenger 5.0.9 → 5.0.10

data/resources/templates/apache2/mpm_unknown.txt.erb

@@ -0,0 +1,20 @@
+<red>WARNING:</red> <yellow>unable to autodetect Apache's MPM</yellow>
+
+<%= PROGRAM_NAME %> has only been tested on Apache with the 'prefork', the
+'worker' and the 'event' MPM. However, this installer was not able to
+automatically figure out the MPM that your Apache was compiled with.
+
+This installer tried to autodetect the MPM by running
+<b><%= @control_command %> -V</b>, but that command failed for some reason.
+This may happen if your Apache installation is broken, or if your Apache
+configuration file has errors.
+
+Because at this point this installer is not sure whether your Apache
+installation is compatible with <%= SHORT_PROGRAM_NAME %>, we recommend that you abort
+this installer, run the above command and diagnose the problem before
+continuing. If you cannot figure out what is wrong, please contact the vendor
+that supplied your Apache installation (e.g. your operating system vendor) for
+support.
+
+<b>Press Ctrl-C to abort this installer (so that you can double-check on things).</b>
+<b>Press Enter if you want to continue with installation anyway.</b>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passenger
 version: !ruby/object:Gem::Version
-  version: 5.0.9
+  version: 5.0.10
 platform: ruby
 authors:
 - Phusion - http://www.phusion.nl/
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-03 00:00:00.000000000 Z
+date: 2015-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -2444,32 +2444,39 @@ files:
 - ext/common/AccountsDatabase.h
 - ext/common/AgentsStarter.cpp
 - ext/common/AgentsStarter.h
+- ext/common/ApplicationPool2/ApiKey.h
 - ext/common/ApplicationPool2/AppTypes.cpp
 - ext/common/ApplicationPool2/AppTypes.h
+- ext/common/ApplicationPool2/BasicGroupInfo.h
+- ext/common/ApplicationPool2/BasicProcessInfo.h
 - ext/common/ApplicationPool2/Common.h
-- ext/common/ApplicationPool2/ComponentInfo.h
-- ext/common/ApplicationPool2/DirectSpawner.h
-- ext/common/ApplicationPool2/DummySpawner.h
+- ext/common/ApplicationPool2/Context.h
 - ext/common/ApplicationPool2/ErrorRenderer.h
 - ext/common/ApplicationPool2/Group.h
+- ext/common/ApplicationPool2/Group/InitializationAndShutdown.cpp
+- ext/common/ApplicationPool2/Group/InternalUtils.cpp
+- ext/common/ApplicationPool2/Group/LifetimeAndBasics.cpp
+- ext/common/ApplicationPool2/Group/Miscellaneous.cpp
+- ext/common/ApplicationPool2/Group/OutOfBandWork.cpp
+- ext/common/ApplicationPool2/Group/ProcessListManagement.cpp
+- ext/common/ApplicationPool2/Group/SessionManagement.cpp
+- ext/common/ApplicationPool2/Group/SpawningAndRestarting.cpp
+- ext/common/ApplicationPool2/Group/StateInspection.cpp
+- ext/common/ApplicationPool2/Group/Verification.cpp
 - ext/common/ApplicationPool2/Implementation.cpp
 - ext/common/ApplicationPool2/Options.h
-- ext/common/ApplicationPool2/PipeWatcher.h
 - ext/common/ApplicationPool2/Pool.h
-- ext/common/ApplicationPool2/Pool/AnalyticsCollection.h
-- ext/common/ApplicationPool2/Pool/Debug.h
-- ext/common/ApplicationPool2/Pool/GarbageCollection.h
-- ext/common/ApplicationPool2/Pool/GeneralUtils.h
-- ext/common/ApplicationPool2/Pool/Inspection.h
-- ext/common/ApplicationPool2/Pool/ProcessUtils.h
+- ext/common/ApplicationPool2/Pool/AnalyticsCollection.cpp
+- ext/common/ApplicationPool2/Pool/GarbageCollection.cpp
+- ext/common/ApplicationPool2/Pool/GeneralUtils.cpp
+- ext/common/ApplicationPool2/Pool/GroupUtils.cpp
+- ext/common/ApplicationPool2/Pool/InitializationAndShutdown.cpp
+- ext/common/ApplicationPool2/Pool/Miscellaneous.cpp
+- ext/common/ApplicationPool2/Pool/ProcessUtils.cpp
+- ext/common/ApplicationPool2/Pool/StateInspection.cpp
 - ext/common/ApplicationPool2/Process.h
 - ext/common/ApplicationPool2/Session.h
-- ext/common/ApplicationPool2/SmartSpawner.h
 - ext/common/ApplicationPool2/Socket.h
-- ext/common/ApplicationPool2/SpawnObject.h
-- ext/common/ApplicationPool2/Spawner.h
-- ext/common/ApplicationPool2/SpawnerFactory.h
-- ext/common/ApplicationPool2/SuperGroup.h
 - ext/common/BackgroundEventLoop.cpp
 - ext/common/BackgroundEventLoop.h
 - ext/common/Constants.h
@@ -2522,6 +2529,17 @@ files:
 - ext/common/ServerKit/Server.h
 - ext/common/ServerKit/http_parser.cpp
 - ext/common/ServerKit/http_parser.h
+- ext/common/SpawningKit/BackgroundIOCapturer.h
+- ext/common/SpawningKit/Config.h
+- ext/common/SpawningKit/DirectSpawner.h
+- ext/common/SpawningKit/DummySpawner.h
+- ext/common/SpawningKit/Factory.h
+- ext/common/SpawningKit/Options.h
+- ext/common/SpawningKit/PipeWatcher.h
+- ext/common/SpawningKit/Result.h
+- ext/common/SpawningKit/SmartSpawner.h
+- ext/common/SpawningKit/Spawner.h
+- ext/common/SpawningKit/UserSwitchingRules.h
 - ext/common/StaticString.h
 - ext/common/UnionStation/Connection.h
 - ext/common/UnionStation/Core.h
@@ -2539,6 +2557,7 @@ files:
 - ext/common/Utils/CachedFileStat.cpp
 - ext/common/Utils/CachedFileStat.h
 - ext/common/Utils/CachedFileStat.hpp
+- ext/common/Utils/ClassUtils.h
 - ext/common/Utils/Curl.h
 - ext/common/Utils/DateParsing.h
 - ext/common/Utils/Dechunker.h
@@ -2588,9 +2607,10 @@ files:
 - ext/common/Utils/utf8/checked.h
 - ext/common/Utils/utf8/core.h
 - ext/common/Utils/utf8/unchecked.h
+- ext/common/agents/ApiServerUtils.h
 - ext/common/agents/Base.cpp
 - ext/common/agents/Base.h
-- ext/common/agents/HelperAgent/AdminServer.h
+- ext/common/agents/HelperAgent/ApiServer.h
 - ext/common/agents/HelperAgent/Main.cpp
 - ext/common/agents/HelperAgent/OptionParser.h
 - ext/common/agents/HelperAgent/RequestHandler.h
@@ -2607,7 +2627,7 @@ files:
 - ext/common/agents/HelperAgent/RequestHandler/Utils.cpp
 - ext/common/agents/HelperAgent/ResponseCache.h
 - ext/common/agents/HelperAgent/SystemMetricsTool.cpp
-- ext/common/agents/LoggingAgent/AdminServer.h
+- ext/common/agents/LoggingAgent/ApiServer.h
 - ext/common/agents/LoggingAgent/DataStoreId.h
 - ext/common/agents/LoggingAgent/FilterSupport.cpp
 - ext/common/agents/LoggingAgent/FilterSupport.h
@@ -2618,8 +2638,8 @@ files:
 - ext/common/agents/Main.cpp
 - ext/common/agents/SpawnPreparer/Main.cpp
 - ext/common/agents/TempDirToucher/Main.cpp
-- ext/common/agents/Watchdog/AdminServer.h
 - ext/common/agents/Watchdog/AgentWatcher.cpp
+- ext/common/agents/Watchdog/ApiServer.h
 - ext/common/agents/Watchdog/HelperAgentWatcher.cpp
 - ext/common/agents/Watchdog/InstanceDirToucher.cpp
 - ext/common/agents/Watchdog/LoggingAgentWatcher.cpp
@@ -2812,8 +2832,8 @@ files:
 - lib/phusion_passenger/apache2/config_options.rb
 - lib/phusion_passenger/common_library.rb
 - lib/phusion_passenger/config/about_command.rb
-- lib/phusion_passenger/config/admin_command_command.rb
 - lib/phusion_passenger/config/agent_compiler.rb
+- lib/phusion_passenger/config/api_call_command.rb
 - lib/phusion_passenger/config/build_native_support_command.rb
 - lib/phusion_passenger/config/command.rb
 - lib/phusion_passenger/config/compile_agent_command.rb
@@ -2920,6 +2940,7 @@ files:
 - resources/templates/apache2/config_snippets.txt.erb
 - resources/templates/apache2/deployment_example.txt.erb
 - resources/templates/apache2/installing_against_a_different_apache.txt.erb
+- resources/templates/apache2/mpm_unknown.txt.erb
 - resources/templates/apache2/multiple_apache_installations_detected.txt.erb
 - resources/templates/apache2/notify_apache_module_installed.txt.erb
 - resources/templates/apache2/possible_solutions_for_compilation_and_installation_problems.txt.erb

metadata.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJVb0YJAAoJECrHRaUKISqMU68H/17/U+nVV2XKFFF5bYOggw18
-RaZYp0wSR3Ny9QJniim+C1ZM/lAsw2kdRJwl3QYtDWZNTG5s8FufFcqiQO9M+V33
-2LhUky32AZo/G+L2obRGE1X3F1MabSKXSl7Qf6pDPzHCt/KkR4QYdN3xyuu1ZaCW
-I2shygQS/sOy2k9VYTyhYjsOC2oL6bjDTeiicHd7ma4W6Li0jRlNcaMqZrOCVhH0
-XkgSEIowx+YFjTaObOqEJJUBf15W61lp+BVRKHYBy0xoZ+X4rfRGyDKrwboXafue
-KbRsmtHqztzpLj/6iF5J5bVzBxhatYe+PZVI6mZfTceILrIYrhsr1PrO+oImbO8=
-=wobn
+iQEcBAABAgAGBQJVeH7/AAoJECrHRaUKISqMwvQH/R2rLRW3s0Vmo+kcio2w2r7H
+rgJ+t8rVCL7aItN3ixntLjeSASCzHyy+kyxScX3ByH4z7OCCvaJZRk0C3c1+ecWu
+1ab9XKvOmxgFtE4R6fd3+47kbOUt1q6h/nV4ucA8lmUy7eP5ArZHfJgu4v+h3AXa
+gsvUtGfmWX75XfURRrfyRuMwgBXLbXcUbyWVSzs8bN4UaNDQaP9Lp7FhcSTMj2mk
+ScGqspf5h/qiYJ9LmHffov8PpJd51TbEGt6ZStvx+R/OMTHMA/ryPBUBhHrL0Njh
+zK7EyTSrf4KCQLOM/8ie1htca4ny5kk+NzCB4VMP+ekMM3p3g2u+gQ9rXynf5Jc=
+=6kLI
 -----END PGP SIGNATURE-----

data/ext/common/ApplicationPool2/Pool/GeneralUtils.h

@@ -1,127 +0,0 @@
-/*
- *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2015 Phusion
- *
- *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
- *
- *  Permission is hereby granted, free of charge, to any person obtaining a copy
- *  of this software and associated documentation files (the "Software"), to deal
- *  in the Software without restriction, including without limitation the rights
- *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *  copies of the Software, and to permit persons to whom the Software is
- *  furnished to do so, subject to the following conditions:
- *
- *  The above copyright notice and this permission notice shall be included in
- *  all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- *  THE SOFTWARE.
- */
-
-// This file is included inside the Pool class.
-
-protected:
-
-static void runAllActions(const boost::container::vector<Callback> &actions) {
-	boost::container::vector<Callback>::const_iterator it, end = actions.end();
-	for (it = actions.begin(); it != end; it++) {
-		(*it)();
-	}
-}
-
-static void runAllActionsWithCopy(boost::container::vector<Callback> actions) {
-	runAllActions(actions);
-}
-
-void verifyInvariants() const {
-	// !a || b: logical equivalent of a IMPLIES b.
-	#ifndef NDEBUG
-	if (!selfchecking) {
-		return;
-	}
-	assert(!( !getWaitlist.empty() ) || ( atFullCapacityUnlocked() ));
-	assert(!( !atFullCapacityUnlocked() ) || ( getWaitlist.empty() ));
-	#endif
-}
-
-void verifyExpensiveInvariants() const {
-	#ifndef NDEBUG
-	if (!selfchecking) {
-		return;
-	}
-	vector<GetWaiter>::const_iterator it, end = getWaitlist.end();
-	for (it = getWaitlist.begin(); it != end; it++) {
-		const GetWaiter &waiter = *it;
-		const SuperGroupPtr *superGroup;
-		assert(!superGroups.lookup(waiter.options.getAppGroupName(), &superGroup));
-	}
-	#endif
-}
-
-void fullVerifyInvariants() const {
-	TRACE_POINT();
-	verifyInvariants();
-	UPDATE_TRACE_POINT();
-	verifyExpensiveInvariants();
-	UPDATE_TRACE_POINT();
-
-	SuperGroupMap::ConstIterator sg_it(superGroups);
-	while (*sg_it != NULL) {
-		const SuperGroupPtr &superGroup = sg_it.getValue();
-		superGroup->verifyInvariants();
-		foreach (GroupPtr group, superGroup->groups) {
-			group->verifyInvariants();
-			group->verifyExpensiveInvariants();
-		}
-		sg_it.next();
-	}
-}
-
-bool runHookScripts(const char *name,
-	const boost::function<void (HookScriptOptions &)> &setup) const
-{
-	if (agentsOptions != NULL) {
-		string hookName = string("hook_") + name;
-		string spec = agentsOptions->get(hookName, false);
-		if (!spec.empty()) {
-			HookScriptOptions options;
-			options.agentsOptions = agentsOptions;
-			options.name = name;
-			options.spec = spec;
-			setup(options);
-			return Passenger::runHookScripts(options);
-		} else {
-			return true;
-		}
-	} else {
-		return true;
-	}
-}
-
-static const char *maybePluralize(unsigned int count, const char *singular, const char *plural) {
-	if (count == 1) {
-		return singular;
-	} else {
-		return plural;
-	}
-}
-
-
-public:
-
-const SpawnerConfigPtr &getSpawnerConfig() const {
-	return spawnerFactory->getConfig();
-}
-
-const UnionStation::CorePtr &getUnionStationCore() const {
-	return getSpawnerConfig()->unionStationCore;
-}
-
-const RandomGeneratorPtr &getRandomGenerator() const {
-	return getSpawnerConfig()->randomGenerator;
-}

data/ext/common/ApplicationPool2/Pool/Inspection.h

@@ -1,219 +0,0 @@
-/*
- *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2015 Phusion
- *
- *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
- *
- *  Permission is hereby granted, free of charge, to any person obtaining a copy
- *  of this software and associated documentation files (the "Software"), to deal
- *  in the Software without restriction, including without limitation the rights
- *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *  copies of the Software, and to permit persons to whom the Software is
- *  furnished to do so, subject to the following conditions:
- *
- *  The above copyright notice and this permission notice shall be included in
- *  all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- *  THE SOFTWARE.
- */
-
-// This file is included inside the Pool class.
-
-public:
-
-struct InspectOptions {
-	bool colorize;
-	bool verbose;
-
-	InspectOptions()
-		: colorize(false),
-		  verbose(false)
-		{ }
-
-	InspectOptions(const VariantMap &options)
-		: colorize(options.getBool("colorize", false, false)),
-		  verbose(options.getBool("verbose", false, false))
-		{ }
-};
-
-
-private:
-
-void inspectProcessList(const InspectOptions &options, stringstream &result,
-	const Group *group, const ProcessList &processes) const
-{
-	ProcessList::const_iterator p_it;
-	for (p_it = processes.begin(); p_it != processes.end(); p_it++) {
-		const ProcessPtr &process = *p_it;
-		char buf[128];
-		char cpubuf[10];
-		char membuf[10];
-
-		if (process->metrics.isValid()) {
-			snprintf(cpubuf, sizeof(cpubuf), "%d%%", (int) process->metrics.cpu);
-			snprintf(membuf, sizeof(membuf), "%ldM",
-				(unsigned long) (process->metrics.realMemory() / 1024));
-		} else {
-			snprintf(cpubuf, sizeof(cpubuf), "0%%");
-			snprintf(membuf, sizeof(membuf), "0M");
-		}
-		snprintf(buf, sizeof(buf),
-				"  * PID: %-5lu   Sessions: %-2u      Processed: %-5u   Uptime: %s\n"
-				"    CPU: %-5s   Memory  : %-5s   Last used: %s ago",
-				(unsigned long) process->pid,
-				process->sessions,
-				process->processed,
-				process->uptime().c_str(),
-				cpubuf,
-				membuf,
-				distanceOfTimeInWords(process->lastUsed / 1000000).c_str());
-		result << buf << endl;
-
-		if (process->enabled == Process::DISABLING) {
-			result << "    Disabling..." << endl;
-		} else if (process->enabled == Process::DISABLED) {
-			result << "    DISABLED" << endl;
-		} else if (process->enabled == Process::DETACHED) {
-			result << "    Shutting down..." << endl;
-		}
-
-		const Socket *socket;
-		if (options.verbose && (socket = process->sockets.findSocketWithName("http")) != NULL) {
-			result << "    URL     : http://" << replaceString(socket->address, "tcp://", "") << endl;
-			result << "    Password: " << StaticString(group->secret, Group::SECRET_SIZE) << endl;
-		}
-	}
-}
-
-static const char *maybeColorize(const InspectOptions &options, const char *color) {
-	if (options.colorize) {
-		return color;
-	} else {
-		return "";
-	}
-}
-
-
-public:
-
-string inspect(const InspectOptions &options = InspectOptions(), bool lock = true) const {
-	DynamicScopedLock l(syncher, lock);
-	stringstream result;
-	const char *headerColor = maybeColorize(options, ANSI_COLOR_YELLOW ANSI_COLOR_BLUE_BG ANSI_COLOR_BOLD);
-	const char *resetColor  = maybeColorize(options, ANSI_COLOR_RESET);
-
-	result << headerColor << "----------- General information -----------" << resetColor << endl;
-	result << "Max pool size : " << max << endl;
-	result << "Processes     : " << getProcessCount(false) << endl;
-	result << "Requests in top-level queue : " << getWaitlist.size() << endl;
-	if (options.verbose) {
-		unsigned int i = 0;
-		foreach (const GetWaiter &waiter, getWaitlist) {
-			result << "  " << i << ": " << waiter.options.getAppGroupName() << endl;
-			i++;
-		}
-	}
-	result << endl;
-
-	result << headerColor << "----------- Application groups -----------" << resetColor << endl;
-	SuperGroupMap::ConstIterator sg_it(superGroups);
-	while (*sg_it != NULL) {
-		const SuperGroupPtr &superGroup = sg_it.getValue();
-		const Group *group = superGroup->defaultGroup;
-		ProcessList::const_iterator p_it;
-
-		if (group != NULL) {
-			result << group->name << ":" << endl;
-			result << "  App root: " << group->options.appRoot << endl;
-			if (group->restarting()) {
-				result << "  (restarting...)" << endl;
-			}
-			if (group->spawning()) {
-				if (group->processesBeingSpawned == 0) {
-					result << "  (spawning...)" << endl;
-				} else {
-					result << "  (spawning " << group->processesBeingSpawned << " new " <<
-						maybePluralize(group->processesBeingSpawned, "process", "processes") <<
-						"...)" << endl;
-				}
-			}
-			result << "  Requests in queue: " << group->getWaitlist.size() << endl;
-			inspectProcessList(options, result, group, group->enabledProcesses);
-			inspectProcessList(options, result, group, group->disablingProcesses);
-			inspectProcessList(options, result, group, group->disabledProcesses);
-			inspectProcessList(options, result, group, group->detachedProcesses);
-			result << endl;
-		}
-		sg_it.next();
-	}
-	return result.str();
-}
-
-string toXml(bool includeSecrets = true, bool lock = true) const {
-	DynamicScopedLock l(syncher, lock);
-	stringstream result;
-	SuperGroupMap::ConstIterator sg_it(superGroups);
-	SuperGroup::GroupList::const_iterator g_it;
-	ProcessList::const_iterator p_it;
-
-	result << "<?xml version=\"1.0\" encoding=\"iso8859-1\" ?>\n";
-	result << "<info version=\"3\">";
-
-	result << "<passenger_version>" << PASSENGER_VERSION << "</passenger_version>";
-	result << "<process_count>" << getProcessCount(false) << "</process_count>";
-	result << "<max>" << max << "</max>";
-	result << "<capacity_used>" << capacityUsedUnlocked() << "</capacity_used>";
-	result << "<get_wait_list_size>" << getWaitlist.size() << "</get_wait_list_size>";
-
-	if (includeSecrets) {
-		vector<GetWaiter>::const_iterator w_it, w_end = getWaitlist.end();
-
-		result << "<get_wait_list>";
-		for (w_it = getWaitlist.begin(); w_it != w_end; w_it++) {
-			const GetWaiter &waiter = *w_it;
-			result << "<item>";
-			result << "<app_group_name>" << escapeForXml(waiter.options.getAppGroupName()) << "</app_group_name>";
-			result << "</item>";
-		}
-		result << "</get_wait_list>";
-	}
-
-	result << "<supergroups>";
-	while (*sg_it != NULL) {
-		const SuperGroupPtr &superGroup = sg_it.getValue();
-
-		result << "<supergroup>";
-		result << "<name>" << escapeForXml(superGroup->name) << "</name>";
-		result << "<state>" << superGroup->getStateName() << "</state>";
-		result << "<get_wait_list_size>" << superGroup->getWaitlist.size() << "</get_wait_list_size>";
-		result << "<capacity_used>" << superGroup->capacityUsed() << "</capacity_used>";
-		if (includeSecrets) {
-			result << "<secret>" << escapeForXml(superGroup->secret) << "</secret>";
-		}
-
-		for (g_it = superGroup->groups.begin(); g_it != superGroup->groups.end(); g_it++) {
-			const GroupPtr &group = *g_it;
-
-			if (group->componentInfo.isDefault) {
-				result << "<group default=\"true\">";
-			} else {
-				result << "<group>";
-			}
-			group->inspectXml(result, includeSecrets);
-			result << "</group>";
-		}
-		result << "</supergroup>";
-
-		sg_it.next();
-	}
-	result << "</supergroups>";
-
-	result << "</info>";
-	return result.str();
-}