Skip to content

Commit

Permalink
AS7-4785 Use platform-specific line separator %n in log message inste…
Browse files Browse the repository at this point in the history
…ad of \n
  • Loading branch information
nekop authored and bstansberry committed May 16, 2012
1 parent d826936 commit 0d39780
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
10 changes: 5 additions & 5 deletions ejb3/src/main/java/org/jboss/as/ejb3/EjbMessages.java
Original file line number Diff line number Diff line change
Expand Up @@ -644,7 +644,7 @@ public interface EjbMessages {
*
* @return a {@link IllegalArgumentException} for the error.
*/
@Message(id = 14368, value = "Component %s with component class: %s\n isn't a %s component")
@Message(id = 14368, value = "Component %s with component class: %s%n isn't a %s component")
IllegalArgumentException componentNotInstanceOfSessionComponent(Component component, Class<?> componentClass, String type);

/**
Expand Down Expand Up @@ -800,7 +800,7 @@ public interface EjbMessages {
*
* @return a {@link DeploymentUnitProcessingException} for the error.
*/
@Message(id = 14393, value = "<role-name> cannot be null or empty in <security-role-ref>\nfor bean: %s")
@Message(id = 14393, value = "<role-name> cannot be null or empty in <security-role-ref>%nfor bean: %s")
DeploymentUnitProcessingException roleNamesIsNull(String ejbName);

/**
Expand Down Expand Up @@ -898,7 +898,7 @@ public interface EjbMessages {
*
* @return a {@link DeploymentUnitProcessingException} for the error.
*/
@Message(id = 14405, value = "Could not determine type of corresponding implied EJB 2.x local interface (see EJB 3.1 21.4.5)\n due to multiple create* methods with different return types on home %s")
@Message(id = 14405, value = "Could not determine type of corresponding implied EJB 2.x local interface (see EJB 3.1 21.4.5)%n due to multiple create* methods with different return types on home %s")
DeploymentUnitProcessingException multipleCreateMethod(Class localHomeClass);

/**
Expand Down Expand Up @@ -1164,7 +1164,7 @@ public interface EjbMessages {
*
* @return an {@link IllegalArgumentException} for the error.
*/
@Message(id = 14438, value = "Timer service with timedObjectId: %s\n is already registered")
@Message(id = 14438, value = "Timer service with timedObjectId: %s%n is already registered")
IllegalStateException timerServiceAlreadyRegistered(String timedObjectId);

/**
Expand Down Expand Up @@ -1725,7 +1725,7 @@ public interface EjbMessages {
*
* @return an {@link String} for the error.
*/
@Message(id = 14508, value = "EJB component for address %s is in \n state %s, must be in state %s")
@Message(id = 14508, value = "EJB component for address %s is in %n state %s, must be in state %s")
String invalidComponentState(PathAddress operationAddress, ServiceController.State controllerState, ServiceController.State up);


Expand Down
6 changes: 3 additions & 3 deletions server/src/main/java/org/jboss/as/server/ServerLogger.java
Original file line number Diff line number Diff line change
Expand Up @@ -219,15 +219,15 @@ public interface ServerLogger extends BasicLogger {
void deploymentStarted(String deployment);

@LogMessage(level = ERROR)
@Message(id = 15879, value = "Deployment '%s' has failed services\n Failed services: %s")
@Message(id = 15879, value = "Deployment '%s' has failed services%n Failed services: %s")
void deploymentHasFailedServices(String deployment, String failures);

@LogMessage(level = ERROR)
@Message(id = 15880, value = "Deployment '%s' has services missing dependencies\n Missing dependencies: %s")
@Message(id = 15880, value = "Deployment '%s' has services missing dependencies%n Missing dependencies: %s")
void deploymentHasMissingDependencies(String deployment, String missing);

@LogMessage(level = ERROR)
@Message(id = 15881, value = "Deployment '%s' has failed services and services missing dependencies\n Failed services: %s\n Missing dependencies: %s")
@Message(id = 15881, value = "Deployment '%s' has failed services and services missing dependencies%n Failed services: %s%n Missing dependencies: %s")
void deploymentHasMissingAndFailedServices(String deployment, String failures, String missing);

@LogMessage(level = ERROR)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ public interface ServerMessages {
@Message(id = 15816, value = "Missing configuration value for: %s")
IllegalStateException missingHomeDirConfiguration(String propertyName);

@Message(id = 15817, value = "\n %s is missing: %s")
@Message(id = 15817, value = "%n %s is missing: %s")
String missingDependencies(ServiceName dependentService, String missingDependencies);

@Message(id = 15818, value = "%s is required")
Expand Down

0 comments on commit 0d39780

Please sign in to comment.