Author: tchemit Date: 2012-03-07 17:43:44 +0100 (Wed, 07 Mar 2012) New Revision: 3165 Url: http://chorem.org/repositories/revision/pollen/3165 Log: reuse the siteUrl applicationUrl, safer than using url from request... Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java branches/pollen-1.2.6-struts2/pollen-persistence/src/test/resources/log4j.properties branches/pollen-1.2.6-struts2/pollen-persistence/src/test/resources/pollen-fake.properties Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java 2012-03-07 11:35:46 UTC (rev 3164) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java 2012-03-07 16:43:44 UTC (rev 3165) @@ -37,6 +37,7 @@ import java.io.File; import java.io.IOException; +import java.net.URL; import java.util.Map; import java.util.Properties; @@ -84,6 +85,14 @@ "Could not parse configuration", e); } + // check application url is ok + URL applicationUrl = getApplicationUrl(); + if (applicationUrl == null) { + throw new IllegalStateException( + "No application url defined in configuration, please fill the property '" + + PollenConfigurationOption.APPLICATION_URL.key + "'"); + } + createDirectory(PollenConfigurationOption.EMAIL_DIR); createDirectory(PollenConfigurationOption.FEED_DIR); createDirectory(PollenConfigurationOption.IMG_DIR); @@ -93,6 +102,13 @@ } } + public URL getApplicationUrl() { + URL result = applicationConfig.getOptionAsURL( + PollenConfigurationOption.APPLICATION_URL.key + ); + return result; + } + public ChoiceType getDefaultChoiceType() { ChoiceType result = applicationConfig.getOption( ChoiceType.class, Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java 2012-03-07 11:35:46 UTC (rev 3164) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java 2012-03-07 16:43:44 UTC (rev 3165) @@ -30,6 +30,7 @@ import org.nuiton.util.Version; import java.io.File; +import java.net.URL; /** * All Pollen configuration options. @@ -40,6 +41,8 @@ public enum PollenConfigurationOption implements ApplicationConfig.OptionDef { /** login for default admin. */ + APPLICATION_URL("siteUrl", "Application url", "", URL.class), + /** login for default admin. */ DATA_DIR("pollen.dataDirectory", "Default directory where to put datas", "${HOME}/.pollen", File.class), /** login for default admin. */ ADMIN_LOGIN("adminLogin", "login for default admin", "admin", String.class), Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/test/resources/log4j.properties =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/test/resources/log4j.properties 2012-03-07 11:35:46 UTC (rev 3164) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/test/resources/log4j.properties 2012-03-07 16:43:44 UTC (rev 3165) @@ -21,17 +21,13 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # #L% ### -# Default to info level output; this is very handy if you eventually use Hibernate as well. -log4j.rootCategory=warn, A1 +log4j.rootCategory=WARN, A1 # A1 is set to be a ConsoleAppender. log4j.appender.A1=org.apache.log4j.ConsoleAppender # A1 uses PatternLayout. log4j.appender.A1.layout=org.apache.log4j.PatternLayout -log4j.appender.A1.layout.ConversionPattern=%d [%p] %c{2} %m%n +log4j.appender.A1.layout.ConversionPattern=%d [%p] %c %m%n -log4j.logger.org.chorem.pollen=debug - -log4j.logger.org.chorem.pollen.business.PollenContextImpl=warn -log4j.logger.org.chorem.pollen.business.services.SendMail=warn +log4j.logger.org.chorem.pollen=INFO Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/test/resources/pollen-fake.properties =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/test/resources/pollen-fake.properties 2012-03-07 11:35:46 UTC (rev 3164) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/test/resources/pollen-fake.properties 2012-03-07 16:43:44 UTC (rev 3165) @@ -33,6 +33,7 @@ topia.service.migration.callback=org.chorem.pollen.entities.migration.PollenMigrationCallback topia.service.migration.showSql=true +siteUrl=http://meFake/pollen upImgDir=${testDirectory}/.pollen/uploadedImages feedDir=${testDirectory}/.pollen/feeds pollen.emails.directory=${testDirectory}/.pollen/emails