ISIS-903: tiny amount of tidy-up.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/107cf3df Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/107cf3df Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/107cf3df Branch: refs/heads/master Commit: 107cf3dfe909521213e0d1ce2cc227a8e7f8c040 Parents: d944430 Author: Dan Haywood <[email protected]> Authored: Wed Feb 18 13:22:45 2015 +0000 Committer: Dan Haywood <[email protected]> Committed: Wed Feb 18 14:07:58 2015 +0000 ---------------------------------------------------------------------- .../wicket/viewer/services/LocaleProviderWicket.java | 5 ++++- .../viewer/services/TranslationsResolverWicket.java | 5 ++++- .../services/i18n/po/TranslationServicePo.java | 6 ++++-- example/application/simpleapp/integtests/.gitignore | 1 + .../simpleapp/integtests/logging.properties | 14 +++++++------- 5 files changed, 20 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/isis/blob/107cf3df/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/LocaleProviderWicket.java ---------------------------------------------------------------------- diff --git a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/LocaleProviderWicket.java b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/LocaleProviderWicket.java index 1b94cb6..9f3b58d 100644 --- a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/LocaleProviderWicket.java +++ b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/LocaleProviderWicket.java @@ -24,6 +24,7 @@ import org.apache.wicket.Session; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.isis.applib.annotation.DomainService; +import org.apache.isis.applib.annotation.NatureOfService; import org.apache.isis.applib.annotation.Programmatic; import org.apache.isis.applib.services.i18n.LocaleProvider; @@ -31,7 +32,9 @@ import org.apache.isis.applib.services.i18n.LocaleProvider; /** * An implementation that provides the locale of the current session. */ -@DomainService +@DomainService( + nature = NatureOfService.DOMAIN +) public class LocaleProviderWicket implements LocaleProvider { public static Logger LOG = LoggerFactory.getLogger(LocaleProviderWicket.class); http://git-wip-us.apache.org/repos/asf/isis/blob/107cf3df/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/TranslationsResolverWicket.java ---------------------------------------------------------------------- diff --git a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/TranslationsResolverWicket.java b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/TranslationsResolverWicket.java index 110854a..2abbbba 100644 --- a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/TranslationsResolverWicket.java +++ b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/TranslationsResolverWicket.java @@ -31,6 +31,7 @@ import com.google.common.io.Resources; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.isis.applib.annotation.DomainService; +import org.apache.isis.applib.annotation.NatureOfService; import org.apache.isis.applib.annotation.Programmatic; import org.apache.isis.applib.services.i18n.TranslationsResolver; import org.apache.isis.core.webapp.WebAppConstants; @@ -40,7 +41,9 @@ import org.apache.isis.viewer.wicket.viewer.IsisWicketApplication; /** * An implementation that reads from /WEB-INF/... */ -@DomainService +@DomainService( + nature = NatureOfService.DOMAIN +) public class TranslationsResolverWicket implements TranslationsResolver { public static Logger LOG = LoggerFactory.getLogger(TranslationsResolverWicket.class); http://git-wip-us.apache.org/repos/asf/isis/blob/107cf3df/core/runtime/src/main/java/org/apache/isis/core/runtime/services/i18n/po/TranslationServicePo.java ---------------------------------------------------------------------- diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/i18n/po/TranslationServicePo.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/i18n/po/TranslationServicePo.java index 7bba5b2..3d92184 100644 --- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/i18n/po/TranslationServicePo.java +++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/i18n/po/TranslationServicePo.java @@ -25,6 +25,7 @@ import javax.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.isis.applib.annotation.DomainService; +import org.apache.isis.applib.annotation.NatureOfService; import org.apache.isis.applib.annotation.Programmatic; import org.apache.isis.applib.services.i18n.LocaleProvider; import org.apache.isis.applib.services.i18n.TranslationService; @@ -32,12 +33,13 @@ import org.apache.isis.applib.services.i18n.TranslationsResolver; import org.apache.isis.core.runtime.system.DeploymentType; import org.apache.isis.core.runtime.system.context.IsisContext; -@DomainService +@DomainService( + nature = NatureOfService.DOMAIN +) public class TranslationServicePo implements TranslationService { public static Logger LOG = LoggerFactory.getLogger(TranslationServicePo.class); - public static final String KEY_DEPLOYMENT_TYPE = "isis.deploymentType"; public static final String KEY_PO_MODE = "isis.services.translation.po.mode"; private PoAbstract po; http://git-wip-us.apache.org/repos/asf/isis/blob/107cf3df/example/application/simpleapp/integtests/.gitignore ---------------------------------------------------------------------- diff --git a/example/application/simpleapp/integtests/.gitignore b/example/application/simpleapp/integtests/.gitignore new file mode 100644 index 0000000..88dfbbc --- /dev/null +++ b/example/application/simpleapp/integtests/.gitignore @@ -0,0 +1 @@ +/translations.pot http://git-wip-us.apache.org/repos/asf/isis/blob/107cf3df/example/application/simpleapp/integtests/logging.properties ---------------------------------------------------------------------- diff --git a/example/application/simpleapp/integtests/logging.properties b/example/application/simpleapp/integtests/logging.properties index d6ec4ed..d6d3905 100644 --- a/example/application/simpleapp/integtests/logging.properties +++ b/example/application/simpleapp/integtests/logging.properties @@ -33,11 +33,11 @@ log4j.appender.File.append=false log4j.appender.File.layout=org.apache.log4j.PatternLayout log4j.appender.File.layout.ConversionPattern=%d [%-20c{1} %-10t %-5p] %m%n -log4j.appender.i18n-po=org.apache.log4j.FileAppender -log4j.appender.i18n-po.File=./i18n-po.log -log4j.appender.i18n-po.Append=false -log4j.appender.i18n-po.layout=org.apache.log4j.PatternLayout -log4j.appender.i18n-po.layout.ConversionPattern=%m%n +log4j.appender.translations-po=org.apache.log4j.FileAppender +log4j.appender.translations-po.File=./translations.pot +log4j.appender.translationsn-po.Append=false +log4j.appender.translations-po.layout=org.apache.log4j.PatternLayout +log4j.appender.translations-po.layout.ConversionPattern=%m%n ! turn on the internal log4j debugging flag so we can see what it is doing #log4j.debug=true @@ -107,5 +107,5 @@ log4j.additivity.DataNucleus.Datastore.IDE=false #log4j.additivity.jdbc.connection=false -log4j.logger.org.apache.isis.core.metamodel.services.i18n.po.PoWriter=INFO,i18n-po -log4j.additivity.org.apache.isis.core.metamodel.services.i18n.po.PotWriter=false +log4j.logger.org.apache.isis.core.runtime.services.i18n.po.PoWriter=INFO,translations-po +log4j.additivity.org.apache.isis.core.runtime.services.i18n.po.PotWriter=false
