Index: load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/LocalStrings.properties =================================================================== --- load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/LocalStrings.properties (revision 51493) +++ load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/LocalStrings.properties (working copy) @@ -43,11 +43,11 @@ FileExists=Unable to export load balancer configuration. File [{0}] already exists. ParentFileMissing=Unable to export load balancer configuration. Directory [{0}] does not exist. LbDeviceNotConfigured=Load balancer admin host or port not configured for load balancer {0}. -LbDoesNotExist=No Loadbalancer configured by name {0}. -UnableToGetLbConfig=No Loadbalancer configuration exists by name {0}. -UnableToGetLoadbalancer=No Loadbalancer configured by name {0}. +LbDoesNotExist=No load balancer configured by name {0}. +UnableToGetLbConfig=No load balancer configuration exists by name {0}. +UnableToGetLoadbalancer=No load balancer configured by name {0}. UnableToResolveSystemProperty=Unable to resolve system property {0} for instance {1}. -NoLoadbalancersConfigured=No Loadbalancers configured. +NoLoadbalancersConfigured=No load balancers configured. HttpError=The web server which hosts the load balancer returned response \"{0} {1}\" to the apply change request URL {2}. Please check the configuration and the SSL certificates. CannotConnectToLBHost=Could not connect to the load balancer host {0}. Please specify a valid load balancer admin host and port CannotResolveHostName=Could not resolve host name {0}. @@ -75,7 +75,7 @@ UnknownTypeInWebModuleReader=Invalid argument. The config bean must be of type WebModule or null. MixofServerAndClusterNotSupported=Invalid argument. Mix of standalone instance(s) and cluster(s) is not supported. ServerPartofClusterNotSupported=Invalid argument. Instance {0} is part of a cluster. Please provide either cluster(s) or standalone instance(s). -ExportHttpLbConfigInvalidArgs=Invalid argument. Please provide either a load-balancer name, or a load-balancer config, or list of cluster(s) or standalone instance(s). +ExportHttpLbConfigInvalidArgs=Invalid argument. Please provide either a load balancer name, or a load balancer config, or list of cluster(s) or standalone instance(s). ClusterorInstanceNotFound=Invalid argument. Cluster or standalone instance with name {0} not found. RetrieveFailed=Unable to retrieve file {0} due to I/O error. Index: core/kernel/src/main/java/com/sun/enterprise/v3/admin/LocalStrings.properties =================================================================== --- core/kernel/src/main/java/com/sun/enterprise/v3/admin/LocalStrings.properties (revision 51493) +++ core/kernel/src/main/java/com/sun/enterprise/v3/admin/LocalStrings.properties (working copy) @@ -100,89 +100,6 @@ implementation=Implementation contractprovider=ContractProvider -add.resources=The add-resources command creates the resources named in the specified XML file. The xml_file_path is the path to the XML file containing the resources to be created. The DOCTYPE must be specified as in the resources.xml file. -add.resources.target=Specifies the target for which you are creating the resources. -add.resources.xml_file_name=The path to the XML file containing the resource(s) to be created. The XML file must reside in the /domains/domain1/config directory. If you specify a relative path or simply provide the name of the XML file, this command will prepend /domains/domain1/config to this operand. -add.resources.noJdbcConnectionPoolId=No pool name defined for JDBC Connection pool. - -create.jdbc.resource=creates a JDBC resource with the specified JNDI name -create.jdbc.resource.connectionpoolid=The name of the JDBC connection pool. If two or more JDBC resource elements point to the same connection pool element, they use the same pool connection at runtime. -create.jdbc.resource.description=Text providing descriptive details about the JDBC resource. -create.jdbc.resource.jndi_name=The JNDI name of this JDBC resource. -create.jdbc.resource.enabled=Determines whether the JDBC resource is enabled at runtime. The default value is true. -create.jdbc.resource.success=JDBC resource {0} created successfully. -create.jdbc.resource.duplicate=A JDBC resource named {0} already exists. -create.jdbc.resource.fail=Command create-jdbc-resource failed. -create.jdbc.resource.connPoolNotFound=Attribute value (pool-name = {0}) is not found in list of jdbc connection pools. -delete.jdbc.resource=removes a JDBC resource with the specified JNDI name -delete.jdbc.resource.jdbc_resource_name=The JNDI name of this JDBC resource to be removed. -delete.jdbc.resource.success=Command delete-jdbc-resource executed successfully. -delete.jdbc.resource.fail=Command create-jdbc-resource failed. -delete.jdbc.resource.notfound=A JDBC resource named {0} does not exist. -list.jdbc.resources=gets all JDBC resources -list.jdbc.resources.success=Command list-jdbc-resources executed successfully. -list.jdbc.resources.fail=Command list-jdbc-resources failed. -create.jdbc.connection.pool=registers the JDBC connection pool -create.jdbc.connection.pool.datasourceclassname=The name of the vendor\u2014supplied JDBC datasource resource manager. -create.jdbc.connection.pool.restype=The interface that the datasource class implements. Must be one of javax.sql.DataSource, javax.sql.ConnectionPoolDataSource or javax.sql.XADataSource. It leads to an error when this option has a legal value and the indicated interface is not implemented by the datasource class. This option has no default value. -create.jdbc.connection.pool.steadypoolsize=The minimum and initial number of connections maintained in the pool. The default value is 8. -create.jdbc.connection.pool.maxpoolsize=The maximum number of connections that can be created. The default value is 32. -create.jdbc.connection.pool.maxwait=The amount of time a caller will wait before a connection timeout is sent. The default is 60 seconds. A value of 0 forces the caller to wait indefinitely. -create.jdbc.connection.pool.poolresize=Quantity by which the pool will scale-up or scale-down the number of connections. Scale-up: When the pool has no free connections, pool will scale-up by this quantity. Scale-down: All the invalid and idle connections are removed, sometimes resulting in removing connections of quantity greater than this value. Steadypoolsize will be ensured. Possible values are from 0 to MAX_INTEGER. The default value is 2. -create.jdbc.connection.pool.idletimeout=The maximum time, in seconds, that a connection can remain idle in the pool. After this time, the implementation can close this connection. This timeout value must be kept shorter than the server side timeout value to prevent the accumulation of unusable connections in the application. The default value is 300. -create.jdbc.connection.pool.isolationlevel=The transaction-isolation-level on the pooled database connections. This option does not have a default value. If not specified, the pool operates with the default isolation level that the JDBC driver provides. You can set a desired isolation level using one of the standard transaction isolation levels: read-uncommitted, read-committed, repeatable-read, serializable. Applications that change the isolation level on a pooled connection programmatically risk polluting the pool. This could lead to program errors. -create.jdbc.connection.pool.isisolationguaranteed=This is applicable only when a particular isolation level is specified for transaction-isolation-level. The default value is true. This option assures that every time a connection is obtained from the pool, isolation level is set to the desired value. This could have some performance impact on some JDBC drivers. Administrators can set this to false when the application does not change --isolationlevel before returning the connection. -create.jdbc.connection.pool.isconnectvalidatereq=If set to true, connections are validated or checked to see if they are usable before giving out to the application. The default value is false. -create.jdbc.connection.pool.validationmethod=The name of the validation table used to perform a query to validate a connection. Valid settings are: auto-commit, meta-data, or table. The default value is auto-commit. -create.jdbc.connection.pool.validationtable=The name of the validation table used to perform a query to validate a connection. -create.jdbc.connection.pool.failconnection=If set to true, all connections in the pool must be closed when a single validation check fails. The default value is false. One attempt is made to re-establish failed connections. -create.jdbc.connection.pool.allownoncomponentcallers=A pool with this property set to true, can be used by non-J2EE components, that is, components other than EJBs or Servlets. The returned connection is enlisted automatically with the transaction context obtained from the transaction manager. -create.jdbc.connection.pool.nontransactionalconnections=A pool with this property set to true returns non-transactional connections. This connection does not get automatically enlisted with the transaction manager. -create.jdbc.connection.pool.validateatmostonceperiod= -create.jdbc.connection.pool.leaktimeout= -create.jdbc.connection.pool.leakreclaim= -create.jdbc.connection.pool.creationretryattempts= -create.jdbc.connection.pool.creationretryinterval= -create.jdbc.connection.pool.statementtimeout= -create.jdbc.connection.pool.lazyconnectionenlistment= -create.jdbc.connection.pool.lazyconnectionassociation= -create.jdbc.connection.pool.associatewiththread= -create.jdbc.connection.pool.matchconnections= -create.jdbc.connection.pool.maxconnectionusagecount= -create.jdbc.connection.pool.wrapjdbcobjects= -create.jdbc.connection.pool.description=Text providing details about the specified JDBC connection pool. -create.jdbc.connection.pool.property=Optional attribute name/value pairs for configuring the connection pool. -create.jdbc.connection.pool.jdbc_connection_pool_id=The name of the JDBC connection pool to be created. -create.jdbc.connection.pool.success=JDBC connection pool {0} created successfully. -create.jdbc.connection.pool.fail=JDBC connection pool {0} creation failed. -create.jdbc.connection.pool.duplicate=A JDBC connection pool named {0} already exists. -delete.jdbc.connection.pool=removes the specified JDBC connection pool -delete.jdbc.connection.pool.cascade=If the option is set to true, all the JDBC resources associated with the pool, apart from the pool itself, are deleted. When set to false, the deletion of pool fails if any resources are associated with the pool. Resources must be deleted explicitly or the option must be set to true. By default, the option is false. -delete.jdbc.connection.pool.jdbc_connection_pool_id=The name of the JDBC resource to be removed. -delete.jdbc.connection.pool.success=Command delete-jdbc-connection-pool executed successfully. -delete.jdbc.connection.pool.fail=Command delete-jdbc-connection-pool failed. -delete.jdbc.connection.pool.notfound=A JDBC connection pool named {0} does not exist. -delete.jdbc.connection.pool.noJndiName=No id defined for JDBC Connection pool. -delete.jdbc.connection.pool.pool_in_use=Some jdbc resources or persistence manager factory resources are referencing this connection pool. Use 'cascade' option to delete them as well. -list.jdbc.connection.pools=lists all JDBC connection pools -list.jdbc.connection.pools.success=Command list-jdbc-connection-pools executed successfully. -list.jdbc.connection.pools.fail=Command list-jdbc-connection-pools failed -create.resource.ref=creates a reference to a resource -create.resource.ref.success=Command create-resource-ref executed successfully. -create.resource.ref.failed=Command create-resource-ref failed. -create.resource.ref.enabled=Indicates whether the resource should be enabled. This value will take effect only if the resource is enabled at the global level. The default is true. -create.resource.ref.reference_name=The name or JNDI name of the resource. -create.resource.ref.existsAlready=Resource reference {0} already exists. -create.resource.ref.resourceDoesNotExist=Resource {0} does not exist. -delete.resource.ref=removes a reference to a resource -delete.resource.ref.reference_name=The name or JNDI name of the resource. -delete.resource.ref.doesNotExist=Resource reference {0} does not exist. -delete.resource.ref.failed=Resource ref {0} deletion failed. -delete.resource.ref.success=Resource ref {0} deleted successfully. -list.resource.refs=lists the existing resource references -list.resource.refs.success=Command list-resource-refs executed successfully. -list.resource.refs.fail=Command list-resource-refs failed. - create.profiler=Creates the profiler element. A server instance is tied to a particular profiler, by the profiler element in the Java configuration. Changing a profiler requires you to restart the server. create.profiler.classpath=Java classpath string that specifies the classes needed by the profiler. create.profiler.enabled=Profiler is enabled by default. @@ -231,7 +148,7 @@ admin.set.elementdeprecated=WARNING: The element {0} is deprecated. admin.set.badelement=Cannot change the element: {0} admin.set.invalid.namevalue=Invalid name value pair {0}. Missing expected equal sign. -admin.set.invalid.logservice.command=For setting log log levels/attributes use set-log-levels/set-log-attributes command. +admin.set.invalid.logservice.command=For setting log levels/attributes use set-log-levels/set-log-attributes command. admin.get.invalid.logservice.command=For getting log levels/attributes use list-log-levels/list-log-attributes command. admin.set.invalid.target=Unable to extract replication target from {0} admin.set.invalid.appname=Unable to extract application name from {0} Index: core/kernel/src/main/java/com/sun/enterprise/v3/admin/SetCommand.java =================================================================== --- core/kernel/src/main/java/com/sun/enterprise/v3/admin/SetCommand.java (revision 51493) +++ core/kernel/src/main/java/com/sun/enterprise/v3/admin/SetCommand.java (working copy) @@ -116,7 +116,7 @@ for (String value : values) { if (value.contains(".log-service")) { - fail(context, localStrings.getLocalString("admin.set.invalid.logservice.command", "For setting log log levels/attributes use set-log-levels/set-log-attributes command.")); + fail(context, localStrings.getLocalString("admin.set.invalid.logservice.command", "For setting log levels/attributes use set-log-levels/set-log-attributes command.")); return; } Index: common/common-util/src/main/java/com/sun/enterprise/universal/xml/LocalStrings.properties =================================================================== --- common/common-util/src/main/java/com/sun/enterprise/universal/xml/LocalStrings.properties (revision 51493) +++ common/common-util/src/main/java/com/sun/enterprise/universal/xml/LocalStrings.properties (working copy) @@ -45,10 +45,12 @@ before the servers element. To prevent this waste of time, move the servers \ element before the configs element. toplevel="Xml Parser Error: {0} -enddocument="Could not find the config ({0}) for {1} +## Could not find the config ({config-ref name}) for {server name} +enddocument=Could not find the config ({0}) for {1} noDomainEnd="xml error. No closing element for domain found (). noDomainName="Warning: No domain name property found. I was looking for a property element \ under the domain element that looks like this: \ junkAfterDomainEnd="xml error. The closing element for the domain should end the document" +## The server element for {server name} does not exist. noserver=The server element for {0} does not exist. Index: common/common-util/src/main/java/com/sun/enterprise/util/io/LocalStrings.properties =================================================================== --- common/common-util/src/main/java/com/sun/enterprise/util/io/LocalStrings.properties (revision 51493) +++ common/common-util/src/main/java/com/sun/enterprise/util/io/LocalStrings.properties (working copy) @@ -40,6 +40,7 @@ # i18n Strings for com.sun.enterprise.util.io ServerDirs.badDir=Directory doesn''t exist: {0} +## The parent directory of {server directory} doesn''t exist. ServerDirs.badParentDir=The parent directory of {0} doesn''t exist. ServerDirs.invalidState=This method call is illegal because the object is in an invalid state. ServerDirs.nullArg=Null arguments are not allowed in {0} @@ -49,12 +50,15 @@ InstanceDirs.tooManyNodes=There is more than one directory ({1}) in the node parent directory ({0}). Cannot choose a default node. InstanceDirs.noNodes=There are no nodes in {0}. InstanceDirs.badNodeDir=The specified node directory doesn''t exist: {0} +## No instance directories exist in {node directory}. InstanceDirs.noInstances=No instance directories exist in {0}. -InstanceDirs.tooManyInstances=There is more than one instance directory {0} in {1}. Impossible to choose a default +## There is more than one instance directory {number of instance directories} in {node directory}. Impossible to choose a default. +InstanceDirs.tooManyInstances=There is more than one instance directory {0} in {1}. Impossible to choose a default. InstanceDirs.badInstanceDir=The specified instance''s directory does not exist: {0} Domain.noDomainsDir=Can''t find the default domains directory. There is no value for this system property: {0} Domain.badDomainDir=There is no such domain directory: {0} Domain.badDomainsDir=The specified domaindir is not a directory: {0} +## There are no domains in {domains directory}. Domain.noDomainDirs=There are no domains in {0}. Domain.tooManyDomainDirs=The domains directory {0}\ncontains multiple domains. Please specify a domain.\nAvailable domains: {1} enterprise_util.retry_rename_failure=UTIL6046: Attempt to rename {0} to {1} failed after {2} retries Index: admin/monitor/src/main/java/org/glassfish/admin/monitor/StatsProviderManagerDelegateImpl.java =================================================================== --- admin/monitor/src/main/java/org/glassfish/admin/monitor/StatsProviderManagerDelegateImpl.java (revision 51493) +++ admin/monitor/src/main/java/org/glassfish/admin/monitor/StatsProviderManagerDelegateImpl.java (working copy) @@ -110,7 +110,7 @@ private static String TYPE; private static String NAME; private static String PARENT_PATH; - private boolean AMXReady = false; + private static boolean AMXReady = false; private StatsProviderRegistry statsProviderRegistry; private static final Logger logger = LogDomains.getLogger(StatsProviderManagerDelegateImpl.class, LogDomains.MONITORING_LOGGER); @@ -709,6 +709,10 @@ } } } + + public static boolean isAMXReady() { + return AMXReady; + } StatsProviderRegistry getStatsProviderRegistry() { return this.statsProviderRegistry; Index: admin/cli-optional/src/main/java/com/sun/enterprise/admin/cli/optional/LocalStrings.properties =================================================================== --- admin/cli-optional/src/main/java/com/sun/enterprise/admin/cli/optional/LocalStrings.properties (revision 51493) +++ admin/cli-optional/src/main/java/com/sun/enterprise/admin/cli/optional/LocalStrings.properties (working copy) @@ -45,11 +45,13 @@ ################### internal.error=Internal Error: {0} ################### -list.domains.StatusRunning=running +## list-domains +## domain1 running +## domain2 not running +list.domains.StatusRunning={0} running list.domains.StatusRestartRequired={0} running, restart required to apply configuration changes -list.domains.StatusNotRunning={0} not running -list.domains.StatusUnknown=status unknown -list.domains.Output={0} {1} +list.domains.StatusNotRunning={0} not running +list.domains.StatusUnknown={0} status unknown NoDomainsToList=CLI141 No Domains to list. ################### ## create-service Index: admin/cli-optional/src/main/java/com/sun/enterprise/admin/cli/optional/ListDomainsCommand.java =================================================================== --- admin/cli-optional/src/main/java/com/sun/enterprise/admin/cli/optional/ListDomainsCommand.java (revision 51493) +++ admin/cli-optional/src/main/java/com/sun/enterprise/admin/cli/optional/ListDomainsCommand.java (working copy) @@ -88,7 +88,7 @@ if (domainsList.length > 0) { for (String dn : domainsList) { String status = getStatus(dn); - logger.info(strings.get("list.domains.Output", dn, status)); + logger.info(status); } } else { logger.fine(strings.get("NoDomainsToList")); @@ -114,11 +114,11 @@ String restartRequired = cmd.executeAndReturnOutput("_get-restart-required"); if (Boolean.parseBoolean(restartRequired.trim())) - return strings.get("list.domains.StatusRestartRequired",p); + return strings.get("list.domains.StatusRestartRequired", dn); } catch (Exception ex) { } - return strings.get("list.domains.StatusRunning"); + return strings.get("list.domains.StatusRunning", dn); } else - return strings.get("list.domains.StatusNotRunning",p); + return strings.get("list.domains.StatusNotRunning", dn); } } Index: admin/launcher/src/main/java/com/sun/enterprise/admin/launcher/LocalStrings.properties =================================================================== --- admin/launcher/src/main/java/com/sun/enterprise/admin/launcher/LocalStrings.properties (revision 51493) +++ admin/launcher/src/main/java/com/sun/enterprise/admin/launcher/LocalStrings.properties (working copy) @@ -43,7 +43,7 @@ internalError=Internal Error: noInstallDir=Internal Error: Could not locate the installation directory. This is what I was looking for: [{0}] -noDomainParentDir=The parent directory of the domain is not\ +noDomainParentDir=The parent directory of the domain is not \ pointing to a directory. This is what I was looking for: [{0}] noDomainRootDir=The domain root dir is not \ pointing to a directory. This is what I was looking for: [{0}] Index: admin/cli/src/main/java/com/sun/enterprise/admin/cli/LocalStrings.properties =================================================================== --- admin/cli/src/main/java/com/sun/enterprise/admin/cli/LocalStrings.properties (revision 51493) +++ admin/cli/src/main/java/com/sun/enterprise/admin/cli/LocalStrings.properties (working copy) @@ -83,8 +83,6 @@ PortPrivilege=On Unix platform, port numbers below 1024 may require special privileges. RequireEitherOrOption=Option {0} or {1} must be specified. UsingProfile=Domain being created with profile:{0}, as specified {1}. -ProfileGlobalDefaultSource=by global default -ProfileUserSource=on command line or environment LoginInfoStored=Login information relevant to admin user name [{0}] for host [{1}] and admin port [{2}] stored at [{3}] successfully.\nMake sure that this file remains protected. Information stored in this file will be used by asadmin commands to manage associated domain. LoginInfoStoredCreateDomain=Login information relevant to admin user name [{0}] for this domain [{1}] stored at [{2}] successfully.\nMake sure that this file remains protected. Information stored in this file will be used by asadmin commands to manage this domain. LoginInfoNotStored=Login information is not saved for host name [{0}] and port [{1}] @@ -234,7 +232,6 @@ CouldNotReadInputStream=CLI024 Could not read input stream. RequireEscapeChar=CLI025 An escape character is required in your input. DuplicateOptionDeclaration=CLI026 Multiple declaration of option "{0}" in the descriptor file. -ValidOptionNotDefined=CLI027 ValidOption "{0}" is not defined in descriptor file. RequiredOptionNotDefined=CLI028 RequiredOption "{0}" is not defined in descriptor file. DeprecatedOptionNotDefined=CLI028 DeprecatedOption "{0}" is not defined in descriptor file. OptionAlreadyDefined=CLI029 Option name "{0}" is already defined in command, "{1}". Index: admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/services/LocalStrings.properties =================================================================== --- admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/services/LocalStrings.properties (revision 51493) +++ admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/services/LocalStrings.properties (working copy) @@ -90,8 +90,6 @@ missingParamsInFile=The passwordfile that was specified as [{0}] does not contain the property [{1}] in required form. \ Rerun the command after adding [{1}=value] to this file on a separate line. serviceNameExists=An SMF service with name [{0}] appears to exist as shown by [svcs -a] command, on this machine. Retry creating the service with different name provided for the service. -requiresRestartYes=requires restart -requiresRestartNo=does not require restart runtimeStatusToString={0} is {1} fileNotFound=File {0} not found. error=error @@ -124,7 +122,7 @@ * /usr/sbin/svcadm enable {4} // start\n\ * /usr/sbin/svcadm disable {4} // stop\n\ * /usr/sbin/svccfg delete {4} // uninstall -dryrun=\n******** DRY RUN ********\nThe service was not really created, but it would have been successful.\n\ +dryrun=\n******** Dry Run ********\nThe service was not really created, but it would have been successful.\n\ Run the command again without the --dry-run option to really run it. WindowsServiceCreated=The Windows Service was created successfully. It is ready to be started. Here are the details:\n\ ID of the service: {0}\n\ Index: admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/LocalStrings.properties =================================================================== --- admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/LocalStrings.properties (revision 51493) +++ admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/LocalStrings.properties (working copy) @@ -85,19 +85,17 @@ noSmfAuth=The user [{0}] does not seem to have adequate authorizations [solaris.smf.*] on this System to create and configure an SMF service. The authorizations available are [{1}].\nSee smf_security(5), rbac(5).\n missingParamsInFile=The passwordfile that was specified as [{0}] does not contain the property [{1}] in required form. Rerun the command after adding [{1}=value] to this file on a separate line. serviceNameExists=An SMF service with name [{0}] appears to exist as shown by [svcs -a] command, on this machine. Retry creating the service with different name provided for the service. -requiresRestartYes=requires restart -requiresRestartNo=does not require restart runtimeStatusToString={0} is {1} fileNotFound=File {0} not found. error=error runtimeStatusToStringStopCluster.alreadyStopped=The clustered instance, {0}, was already stopped. runtimeStatusToStringStopCluster.success=The clustered instance, {0}, was successfully stopped. -runtimeStatusToStringStopCluster.stoppedToRunning=THIS SHOULD BE IMPOSSIBLE. The clustered instance, {0}, was stopped and now it is: {1} +runtimeStatusToStringStopCluster.stoppedToRunning=This should be impossible. The clustered instance, {0}, was stopped and now it is: {1} runtimeStatusToStringStopCluster.error=The clustered instance, {0}, could not be stopped. It was originally in this state: [{1}] and now it is in this state: [{2}]. noSuitableServiceImplementation=No suitable service handler found for this platform, service can not be created. runtimeStatusToStringStartCluster.alreadyStarted=The clustered instance, {0}, was already running. runtimeStatusToStringStartCluster.success=The clustered instance, {0}, was successfully started. -runtimeStatusToStringStartCluster.startedToStopped=THIS SHOULD BE IMPOSSIBLE. The clustered instance, {0}, was running and now it is: {1} +runtimeStatusToStringStartCluster.startedToStopped=This should be impossible. The clustered instance, {0}, was running and now it is: {1} runtimeStatusToStringStartCluster.error=The clustered instance, {0}, could not be started. It was originally in this state: [{1}] and now it is in this state: [{2}]. CertificateDN=Distinguished Name of the self-signed X.509 Server Certificate is:\n[{0}] Index: admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/pe/LocalStrings.properties =================================================================== --- admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/pe/LocalStrings.properties (revision 51493) +++ admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/pe/LocalStrings.properties (working copy) @@ -74,7 +74,6 @@ portConflict=Domain {0} failed to startup. There is a conflict on port {1}. Please check the server log for more details. startupFailed=Domain {0} failed to startup. Please check the server log for more details. timeoutStarting=Timeout waiting for domain {0} to go to starting state. -notSupported=Not Supported for PE directoryCreationError=Could not create directory {0}. instanceStartupException=An exception occurred starting the domain {0}. domainDirNotValid={0} does not correspond to a valid domain directory. Index: admin/config-api/src/main/java/org/glassfish/config/support/LocalStrings.properties =================================================================== --- admin/config-api/src/main/java/org/glassfish/config/support/LocalStrings.properties (revision 51493) +++ admin/config-api/src/main/java/org/glassfish/config/support/LocalStrings.properties (working copy) @@ -81,6 +81,7 @@ DefaultConfigUpgrade.existingDefaultConfig=Existing default-config detected during upgrade. No need to create default-config. DefaultConfigUpgrade.runningDefaultConfigUpgrade=default-config not detected during upgrade. Running DefaultConfigUpgrade to create default-config. DefaultConfigUpgrade.cantFindInstallRoot=DefaultConfigUpgrade failed. Can't find domain.xml template. Install root system property, {0}, is null. +## DefaultConfigUpgrade failed. Missing domain.xml template here {installRoot/lib/templates/domain.xml). DefaultConfigUpgrade.missingDomainXmlTemplate=DefaultConfigUpgrade failed. Missing domain.xml template here {0). DefaultConfigUpgrade.foundDomainXmlTemaplate=Found domain.xml template to create default-config: {0} DefaultConfigUpgrade.problemGettingDomainXmlTemplate=DefaultConfigUpgrade failed. Problem getting domain.xml template. Index: admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/LocalStrings.properties =================================================================== --- admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/LocalStrings.properties (revision 51493) +++ admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/LocalStrings.properties (working copy) @@ -64,8 +64,6 @@ noSuchApplication=Application {0} does not exist illegalName=The name is illegal. Names are not allowed to have this String embedded in them: {0} -noSuchWSEP=WebServiceEndpoint {0} does not exist -noSuchTransformationRule=TransformationRule {0} does not exist CorruptClusterConfig=The cluster [{0}] is in an inconsistent state. Not all of the instances are referencing the mbean [{1}]. Here is the summary: {2}. Cluster.no_default_config_found=No default config found, using config {0} as the default config for the cluster {1} Server.cannotSpecifyBothConfigAndCluster=A configuration name and cluster name cannot both be specified. Index: admin/util/src/main/java/com/sun/enterprise/admin/util/LocalStrings.properties =================================================================== --- admin/util/src/main/java/com/sun/enterprise/admin/util/LocalStrings.properties (revision 51493) +++ admin/util/src/main/java/com/sun/enterprise/admin/util/LocalStrings.properties (working copy) @@ -49,7 +49,7 @@ certificateDbPrompt=Enter the password for the client truststore --> #ClusterOperationUtil clusterutil.commandSuccessful=Command {0} executed successfully on server instance {1} -clusterutil.commandFailed=FAILURE: Command {0} failed on server instance {1}: {2} +clusterutil.commandFailed=Failure: Command {0} failed on server instance {1}: {2} clusterutil.commandWarning=WARNING: Command {0} did not complete successfully on server instance {1}: {2} clusterutil.warnoffline=WARNING: Instance {0} seems to be offline; command {1} was not replicated to that instance clusterutil.failoffline=FAILURE: Instance {0} seems to be offline; command {1} was not replicated to that instance Index: security/core/src/main/java/com/sun/enterprise/security/auth/realm/LocalStrings.properties =================================================================== --- security/core/src/main/java/com/sun/enterprise/security/auth/realm/LocalStrings.properties (revision 51493) +++ security/core/src/main/java/com/sun/enterprise/security/auth/realm/LocalStrings.properties (working copy) @@ -30,7 +30,7 @@ # only the GPL Version 2, indicate your decision by adding "[Contributor] # elects to include this software in this distribution under the [CDDL or GPL # Version 2] license." If you don't indicate a single choice of license, a -# recipient has the option to distribute your version of this file under +# recipient has the option to distribute your version of this file under # either the CDDL, the GPL Version 2 or to extend the choice of license to # its licensees as provided above. However, if you add GPL Version 2 code # and therefore, elected the GPL Version 2 license, then the option applies @@ -40,8 +40,8 @@ realm.already_exists=This Realm already exists. realm.no_such_realm=Realm {0} does not exists. +## Missing required property {0} for {JDBCRealm}. realm.missingprop=Missing required property {0} for {1}. -realm.cantauth=Cannot authenticate user {0} for {1}. iasrealm.notsupported=Operation not supported. filerealm.nofile=Incomplete configuration in file realm: file not specified. filerealm.nomodule=Incomplete configuration in file realm: login module not specified. Index: security/core/src/main/java/com/sun/enterprise/security/auth/login/LocalStrings.properties =================================================================== --- security/core/src/main/java/com/sun/enterprise/security/auth/login/LocalStrings.properties (revision 51493) +++ security/core/src/main/java/com/sun/enterprise/security/auth/login/LocalStrings.properties (working copy) @@ -47,15 +47,14 @@ pwdlm.noinfo=Missing Subject information for Login. pwdlm.nocreds=No credentials. pwdlm.norealm=No realm {0}. +## No realm available for {requested realm}. pwdlm.norealmavail=No realm available for {0}. -pwdlm.nocallback=Error: {0} not available to obtain authentication information. solarislm.badrealm=SolarisLoginModule requires SolarisRealm. solarislm.nulluser=Login failed for null user. solarislm.loginfail=Failed solaris login for {0}. ldaplm.badrealm=LDAPLoginModule requires LDAPRealm. ldaplm.badmode=Unsupported mode {0}. ldaplm.usernotfound=User {0} not found. -ldaplm.bindfailed=LDAP bind failed for {0}. ldaplm.emptypassword=Access denied on empty password for user {0}. filelm.badrealm=FileLoginModule requires FileRealm. filelm.faillogin=Failed file login for {0}. Index: security/core/src/main/java/com/sun/enterprise/security/LocalStrings.properties =================================================================== --- security/core/src/main/java/com/sun/enterprise/security/LocalStrings.properties (revision 51493) +++ security/core/src/main/java/com/sun/enterprise/security/LocalStrings.properties (working copy) @@ -49,7 +49,6 @@ enterprise.security.login.username=Enter Username enterprise.security.login.password=Enter Password: enterprise.security.audit_log_invocation=Audit Log: Invocation -enterprise.security.successful=Successful. enterprise.security.failed=Failed enterprise.security.keystore=Enter the KeyStore Password enterprise.security.IncorrectKeystorePassword=Incorrect keystore password Index: security/core/src/main/java/com/sun/enterprise/security/cli/LocalStrings.properties =================================================================== --- security/core/src/main/java/com/sun/enterprise/security/cli/LocalStrings.properties (revision 51493) +++ security/core/src/main/java/com/sun/enterprise/security/cli/LocalStrings.properties (working copy) @@ -46,7 +46,6 @@ create.file.user.realmnotsupported=Configured file realm {0} is not supported. create.file.user.realmcorrupted=Configured file realm {0} is corrupted. create.file.user.useraddfailed=Adding User {0} to file realm {1} failed. -create.file.user.success=create-file-user successful. create.file.user.AS_ADMIN_USERPASSWORD=the user password delete.file.user.filerealmnotfound=File realm {0} does not exist delete.file.user.keyfilenotfound=No physical file is associated with the file realm {0}.