[jbehave-scm] [1166] trunk/web/examples/trader-web: Renamed web-runner packages, in line with the new module name, which could support runner implemented with different web frameworks.

Sat, 15 Aug 2009 05:18:18 -0700

Title: [1166] trunk/web/examples/trader-web: Renamed web-runner packages, in line with the new module name, which could support runner implemented with different web frameworks.
Revision
1166
Author
mauro
Date
2009-08-15 07:17:35 -0500 (Sat, 15 Aug 2009)

Log Message

Renamed web-runner packages, in line with the new module name, which could support runner implemented with different web frameworks.


Modified Paths




Added Paths




Removed Paths

Diff

Modified: trunk/web/distribution/src/main/assembly/assembly-bin.xml (1165 => 1166)

--- trunk/web/distribution/src/main/assembly/assembly-bin.xml	2009-08-15 12:08:51 UTC (rev 1165)
+++ trunk/web/distribution/src/main/assembly/assembly-bin.xml	2009-08-15 12:17:35 UTC (rev 1166)
@@ -21,7 +21,7 @@
       </outputFileNameMapping>
       <unpack>true</unpack>
       <includes>
-        <include>${pom.groupId}:jbehave-web-waffle</include>
+        <include>${pom.groupId}:jbehave-web-runner</include>
       </includes>
     </dependencySet>
     <dependencySet>

Modified: trunk/web/examples/trader-web/README.txt (1165 => 1166)

--- trunk/web/examples/trader-web/README.txt	2009-08-15 12:08:51 UTC (rev 1165)
+++ trunk/web/examples/trader-web/README.txt	2009-08-15 12:17:35 UTC (rev 1166)
@@ -33,7 +33,7 @@
    Then the alert status should be ON
 
 Note: src/main/webapp only contains the custom resources that override the default ones contained in 
-jbehave-web-waffle.  So, e.g. to change override default style, only src/main/webapp/style/jbehave.css needs
+jbehave-web-runner.  So, e.g. to change override default style, only src/main/webapp/style/jbehave.css needs
 to be added. Similary, to change home page template, only src/main/webapp/ftl/home.ftl is needed.  If any of 
 these are removed the defaults will apply.

Copied: trunk/web/examples/trader-web/src/main/java/org/jbehave/web/examples/trader/runner (from rev 1164, trunk/web/examples/trader-web/src/main/java/org/jbehave/web/examples/trader/waffle) ( => )

Modified: trunk/web/examples/trader-web/src/main/java/org/jbehave/web/examples/trader/runner/TraderRegistrar.java
===================================================================
--- trunk/web/examples/trader-web/src/main/java/org/jbehave/web/examples/trader/waffle/TraderRegistrar.java	2009-08-02 22:48:20 UTC (rev 1164)
+++ trunk/web/examples/trader-web/src/main/java/org/jbehave/web/examples/trader/runner/TraderRegistrar.java	2009-08-15 12:17:35 UTC (rev 1166)
@@ -1,9 +1,9 @@
-package org.jbehave.web.examples.trader.waffle;
+package org.jbehave.web.examples.trader.runner;
 
 import org.codehaus.waffle.registrar.Registrar;
 import org.jbehave.web.examples.trader.scenarios.StockExchangeSteps;
 import org.jbehave.web.examples.trader.scenarios.TraderSteps;
-import org.jbehave.web.waffle.JBehaveRegistrar;
+import org.jbehave.web.runner.waffle.JBehaveRegistrar;
 
 public class TraderRegistrar extends JBehaveRegistrar {

Modified: trunk/web/examples/trader-web/src/main/webapp/WEB-INF/web.xml (1165 => 1166)

--- trunk/web/examples/trader-web/src/main/webapp/WEB-INF/web.xml	2009-08-15 12:08:51 UTC (rev 1165)
+++ trunk/web/examples/trader-web/src/main/webapp/WEB-INF/web.xml	2009-08-15 12:17:35 UTC (rev 1166)
@@ -8,7 +8,7 @@
   <!-- Waffle Registrar and custom components -->
   <context-param>
     <param-name>org.codehaus.waffle.registrar.Registrar</param-name>
-    <param-value>org.jbehave.web.examples.trader.waffle.TraderRegistrar</param-value>
+    <param-value>org.jbehave.web.examples.trader.runner.TraderRegistrar</param-value>
   </context-param>
   <context-param>
     <param-name>register:DateValueConverter</param-name>

Copied: trunk/web/web-runner/src/main/java/org/jbehave/web/runner/waffle/JBehaveRegistrar.java (from rev 1165, trunk/web/web-runner/src/main/java/org/jbehave/web/waffle/JBehaveRegistrar.java) (0 => 1166)

--- trunk/web/web-runner/src/main/java/org/jbehave/web/runner/waffle/JBehaveRegistrar.java	                        (rev 0)
+++ trunk/web/web-runner/src/main/java/org/jbehave/web/runner/waffle/JBehaveRegistrar.java	2009-08-15 12:17:35 UTC (rev 1166)
@@ -0,0 +1,109 @@
+package org.jbehave.web.runner.waffle;
+
+import static java.io.File.separator;
+import static java.lang.System.getProperty;
+import static java.util.Arrays.asList;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.fileupload.disk.DiskFileItemFactory;
+import org.codehaus.waffle.io.RequestFileUploader;
+import org.codehaus.waffle.menu.Menu;
+import org.codehaus.waffle.menu.MenuAwareController;
+import org.codehaus.waffle.registrar.AbstractRegistrar;
+import org.codehaus.waffle.registrar.Registrar;
+import org.codehaus.waffle.view.ViewResolver;
+import org.jbehave.scenario.MostUsefulConfiguration;
+import org.jbehave.scenario.ScenarioRunner;
+import org.jbehave.scenario.parser.PatternScenarioParser;
+import org.jbehave.scenario.steps.DefaultStepdocGenerator;
+import org.jbehave.scenario.steps.Steps;
+import org.jbehave.web.io.ArchivingFileManager;
+import org.jbehave.web.io.ZipFileArchiver;
+import org.jbehave.web.runner.waffle.controllers.FileUploadController;
+import org.jbehave.web.runner.waffle.controllers.FilesController;
+import org.jbehave.web.runner.waffle.controllers.ScenarioController;
+import org.jbehave.web.runner.waffle.controllers.StepdocController;
+
+public class JBehaveRegistrar extends AbstractRegistrar {
+
+	public JBehaveRegistrar(Registrar delegate) {
+		super(delegate);
+	}
+
+	@Override
+	public void application() {
+		registerMenu();
+		registerConfiguration();
+		registerScenarioParser();
+		registerScenarioRunner();
+		registerSteps();
+		registerStepdocGenerator();
+		registerFileManager();
+		register("data/files", FilesController.class);
+		configureViews();
+	}
+
+	@Override
+	public void session() {
+		register("scenario/scenario", ScenarioController.class);
+		register("scenario/stepdoc", StepdocController.class);
+	}
+	
+	@Override
+	public void request() {
+		register(DiskFileItemFactory.class);
+		register(RequestFileUploader.class);
+		register("data/upload", FileUploadController.class);
+	}
+
+	protected void registerMenu() {
+		register("home", MenuAwareController.class);
+		registerInstance("menu", createMenu());
+	}
+
+	protected Menu createMenu() {
+		Map<String, List<String>> content = new HashMap<String, List<String>>();
+		content.put("Menu", asList("Home:home", "Data Files:data/files", "Data Upload:data/upload", "Run Scenario:scenario/scenario", "Stepdoc:scenario/stepdoc"));
+		return new Menu(content);
+	}
+
+	protected void configureViews() {
+		ViewResolver viewResolver = getComponentRegistry().locateByKey(ViewResolver.class);
+		viewResolver.configureView("home", "ftl/home");
+		viewResolver.configureView("data/files", "ftl/data/files");
+		viewResolver.configureView("data/upload", "ftl/data/upload");
+		viewResolver.configureView("scenario/scenario", "ftl/scenario/scenario");
+		viewResolver.configureView("scenario/stepdoc", "ftl/scenario/stepdoc");
+	}
+
+	protected void registerConfiguration() {
+		register(MostUsefulConfiguration.class);
+	}
+
+	protected void registerScenarioParser() {
+		register(PatternScenarioParser.class);
+	}
+
+	protected void registerScenarioRunner() {
+		register(ScenarioRunner.class);
+	}
+
+	protected void registerSteps() {
+		register(Steps.class);
+	}
+
+	protected void registerStepdocGenerator() {
+		register(DefaultStepdocGenerator.class);
+	}
+
+	protected void registerFileManager() {
+		register(ZipFileArchiver.class);
+		register(ArchivingFileManager.class);
+		registerInstance("uploadDirectory", new File(getProperty("java.io.tmpdir")+separator+"upload"));
+	}
+
+}

Copied: trunk/web/web-runner/src/main/java/org/jbehave/web/runner/waffle/controllers (from rev 1165, trunk/web/web-runner/src/main/java/org/jbehave/web/waffle/controllers) ( => )

Modified: trunk/web/web-runner/src/main/java/org/jbehave/web/runner/waffle/controllers/FileUploadController.java
===================================================================
--- trunk/web/web-runner/src/main/java/org/jbehave/web/waffle/controllers/FileUploadController.java	2009-08-15 12:08:51 UTC (rev 1165)
+++ trunk/web/web-runner/src/main/java/org/jbehave/web/runner/waffle/controllers/FileUploadController.java	2009-08-15 12:17:35 UTC (rev 1166)
@@ -1,4 +1,4 @@
-package org.jbehave.web.waffle.controllers;
+package org.jbehave.web.runner.waffle.controllers;
 
 
 import java.io.File;

Modified: trunk/web/web-runner/src/main/java/org/jbehave/web/runner/waffle/controllers/FilesController.java (1165 => 1166)

--- trunk/web/web-runner/src/main/java/org/jbehave/web/waffle/controllers/FilesController.java	2009-08-15 12:08:51 UTC (rev 1165)
+++ trunk/web/web-runner/src/main/java/org/jbehave/web/runner/waffle/controllers/FilesController.java	2009-08-15 12:17:35 UTC (rev 1166)
@@ -1,4 +1,4 @@
-package org.jbehave.web.waffle.controllers;
+package org.jbehave.web.runner.waffle.controllers;
 
 import java.io.File;
 import java.util.ArrayList;

Modified: trunk/web/web-runner/src/main/java/org/jbehave/web/runner/waffle/controllers/ScenarioContext.java (1165 => 1166)

--- trunk/web/web-runner/src/main/java/org/jbehave/web/waffle/controllers/ScenarioContext.java	2009-08-15 12:08:51 UTC (rev 1165)
+++ trunk/web/web-runner/src/main/java/org/jbehave/web/runner/waffle/controllers/ScenarioContext.java	2009-08-15 12:17:35 UTC (rev 1166)
@@ -1,4 +1,4 @@
-package org.jbehave.web.waffle.controllers;
+package org.jbehave.web.runner.waffle.controllers;
 
 import static java.util.Arrays.asList;

Modified: trunk/web/web-runner/src/main/java/org/jbehave/web/runner/waffle/controllers/ScenarioController.java (1165 => 1166)

--- trunk/web/web-runner/src/main/java/org/jbehave/web/waffle/controllers/ScenarioController.java	2009-08-15 12:08:51 UTC (rev 1165)
+++ trunk/web/web-runner/src/main/java/org/jbehave/web/runner/waffle/controllers/ScenarioController.java	2009-08-15 12:17:35 UTC (rev 1166)
@@ -1,4 +1,4 @@
-package org.jbehave.web.waffle.controllers;
+package org.jbehave.web.runner.waffle.controllers;
 
 import static org.apache.commons.lang.StringUtils.isNotBlank;

Modified: trunk/web/web-runner/src/main/java/org/jbehave/web/runner/waffle/controllers/StepdocContext.java (1165 => 1166)

--- trunk/web/web-runner/src/main/java/org/jbehave/web/waffle/controllers/StepdocContext.java	2009-08-15 12:08:51 UTC (rev 1165)
+++ trunk/web/web-runner/src/main/java/org/jbehave/web/runner/waffle/controllers/StepdocContext.java	2009-08-15 12:17:35 UTC (rev 1166)
@@ -1,4 +1,4 @@
-package org.jbehave.web.waffle.controllers;
+package org.jbehave.web.runner.waffle.controllers;
 
 import java.util.ArrayList;
 import java.util.Arrays;

Modified: trunk/web/web-runner/src/main/java/org/jbehave/web/runner/waffle/controllers/StepdocController.java (1165 => 1166)

--- trunk/web/web-runner/src/main/java/org/jbehave/web/waffle/controllers/StepdocController.java	2009-08-15 12:08:51 UTC (rev 1165)
+++ trunk/web/web-runner/src/main/java/org/jbehave/web/runner/waffle/controllers/StepdocController.java	2009-08-15 12:17:35 UTC (rev 1166)
@@ -1,4 +1,4 @@
-package org.jbehave.web.waffle.controllers;
+package org.jbehave.web.runner.waffle.controllers;
 
 import org.codehaus.waffle.action.annotation.ActionMethod;
 import org.codehaus.waffle.menu.Menu;

Deleted: trunk/web/web-runner/src/main/java/org/jbehave/web/waffle/JBehaveRegistrar.java (1165 => 1166)

--- trunk/web/web-runner/src/main/java/org/jbehave/web/waffle/JBehaveRegistrar.java	2009-08-15 12:08:51 UTC (rev 1165)
+++ trunk/web/web-runner/src/main/java/org/jbehave/web/waffle/JBehaveRegistrar.java	2009-08-15 12:17:35 UTC (rev 1166)
@@ -1,109 +0,0 @@
-package org.jbehave.web.waffle;
-
-import static java.io.File.separator;
-import static java.lang.System.getProperty;
-import static java.util.Arrays.asList;
-
-import java.io.File;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.fileupload.disk.DiskFileItemFactory;
-import org.codehaus.waffle.io.RequestFileUploader;
-import org.codehaus.waffle.menu.Menu;
-import org.codehaus.waffle.menu.MenuAwareController;
-import org.codehaus.waffle.registrar.AbstractRegistrar;
-import org.codehaus.waffle.registrar.Registrar;
-import org.codehaus.waffle.view.ViewResolver;
-import org.jbehave.scenario.MostUsefulConfiguration;
-import org.jbehave.scenario.ScenarioRunner;
-import org.jbehave.scenario.parser.PatternScenarioParser;
-import org.jbehave.scenario.steps.DefaultStepdocGenerator;
-import org.jbehave.scenario.steps.Steps;
-import org.jbehave.web.io.ArchivingFileManager;
-import org.jbehave.web.io.ZipFileArchiver;
-import org.jbehave.web.waffle.controllers.FileUploadController;
-import org.jbehave.web.waffle.controllers.FilesController;
-import org.jbehave.web.waffle.controllers.ScenarioController;
-import org.jbehave.web.waffle.controllers.StepdocController;
-
-public class JBehaveRegistrar extends AbstractRegistrar {
-
-	public JBehaveRegistrar(Registrar delegate) {
-		super(delegate);
-	}
-
-	@Override
-	public void application() {
-		registerMenu();
-		registerConfiguration();
-		registerScenarioParser();
-		registerScenarioRunner();
-		registerSteps();
-		registerStepdocGenerator();
-		registerFileManager();
-		register("data/files", FilesController.class);
-		configureViews();
-	}
-
-	@Override
-	public void session() {
-		register("scenario/scenario", ScenarioController.class);
-		register("scenario/stepdoc", StepdocController.class);
-	}
-	
-	@Override
-	public void request() {
-		register(DiskFileItemFactory.class);
-		register(RequestFileUploader.class);
-		register("data/upload", FileUploadController.class);
-	}
-
-	protected void registerMenu() {
-		register("home", MenuAwareController.class);
-		registerInstance("menu", createMenu());
-	}
-
-	protected Menu createMenu() {
-		Map<String, List<String>> content = new HashMap<String, List<String>>();
-		content.put("Menu", asList("Home:home", "Data Files:data/files", "Data Upload:data/upload", "Run Scenario:scenario/scenario", "Stepdoc:scenario/stepdoc"));
-		return new Menu(content);
-	}
-
-	protected void configureViews() {
-		ViewResolver viewResolver = getComponentRegistry().locateByKey(ViewResolver.class);
-		viewResolver.configureView("home", "ftl/home");
-		viewResolver.configureView("data/files", "ftl/data/files");
-		viewResolver.configureView("data/upload", "ftl/data/upload");
-		viewResolver.configureView("scenario/scenario", "ftl/scenario/scenario");
-		viewResolver.configureView("scenario/stepdoc", "ftl/scenario/stepdoc");
-	}
-
-	protected void registerConfiguration() {
-		register(MostUsefulConfiguration.class);
-	}
-
-	protected void registerScenarioParser() {
-		register(PatternScenarioParser.class);
-	}
-
-	protected void registerScenarioRunner() {
-		register(ScenarioRunner.class);
-	}
-
-	protected void registerSteps() {
-		register(Steps.class);
-	}
-
-	protected void registerStepdocGenerator() {
-		register(DefaultStepdocGenerator.class);
-	}
-
-	protected void registerFileManager() {
-		register(ZipFileArchiver.class);
-		register(ArchivingFileManager.class);
-		registerInstance("uploadDirectory", new File(getProperty("java.io.tmpdir")+separator+"upload"));
-	}
-
-}

Copied: trunk/web/web-runner/src/test/java/org/jbehave/web/runner/waffle/JBehaveRegistrarTest.java (from rev 1165, trunk/web/web-runner/src/test/java/org/jbehave/web/waffle/JBehaveRegistrarTest.java) (0 => 1166)

--- trunk/web/web-runner/src/test/java/org/jbehave/web/runner/waffle/JBehaveRegistrarTest.java	                        (rev 0)
+++ trunk/web/web-runner/src/test/java/org/jbehave/web/runner/waffle/JBehaveRegistrarTest.java	2009-08-15 12:17:35 UTC (rev 1166)
@@ -0,0 +1,31 @@
+package org.jbehave.web.runner.waffle;
+
+import static org.codehaus.waffle.context.ContextLevel.APPLICATION;
+import static org.codehaus.waffle.context.ContextLevel.REQUEST;
+import static org.codehaus.waffle.context.ContextLevel.SESSION;
+import static org.junit.Assert.assertNotNull;
+
+import org.codehaus.waffle.testing.registrar.RegistrarHelper;
+import org.jbehave.web.runner.waffle.JBehaveRegistrar;
+import org.junit.Test;
+
+public class JBehaveRegistrarTest {
+
+    private static final Class<JBehaveRegistrar> CLASS = JBehaveRegistrar.class;
+
+    @Test
+    public void canRegisterComponentsAtDifferentLevels() {
+        RegistrarHelper helper = new RegistrarHelper();
+        helper.componentsFor(CLASS, APPLICATION);
+        helper.componentsFor(CLASS, SESSION);
+        helper.componentsFor(CLASS, REQUEST);
+    }
+
+    @Test
+    public void canRetrieveControllers() {
+        RegistrarHelper helper = new RegistrarHelper();
+        assertNotNull(helper.controllerFor(CLASS, APPLICATION, "data/files"));
+        assertNotNull(helper.controllerFor(CLASS, SESSION, "scenario/scenario"));
+        assertNotNull(helper.controllerFor(CLASS, REQUEST, "data/upload"));
+    }
+}

Copied: trunk/web/web-runner/src/test/java/org/jbehave/web/runner/waffle/controllers (from rev 1165, trunk/web/web-runner/src/test/java/org/jbehave/web/waffle/controllers) ( => )

Modified: trunk/web/web-runner/src/test/java/org/jbehave/web/runner/waffle/controllers/FileUploadControllerTest.java
===================================================================
--- trunk/web/web-runner/src/test/java/org/jbehave/web/waffle/controllers/FileUploadControllerTest.java	2009-08-15 12:08:51 UTC (rev 1165)
+++ trunk/web/web-runner/src/test/java/org/jbehave/web/runner/waffle/controllers/FileUploadControllerTest.java	2009-08-15 12:17:35 UTC (rev 1166)
@@ -1,4 +1,4 @@
-package org.jbehave.web.waffle.controllers;
+package org.jbehave.web.runner.waffle.controllers;
 
 import static java.util.Arrays.asList;
 import static org.junit.Assert.assertEquals;
@@ -11,6 +11,7 @@
 import org.codehaus.waffle.io.FileUploader;
 import org.codehaus.waffle.menu.Menu;
 import org.jbehave.web.io.FileManager;
+import org.jbehave.web.runner.waffle.controllers.FileUploadController;
 import org.jmock.Expectations;
 import org.jmock.Mockery;
 import org.jmock.integration.junit4.JMock;

Modified: trunk/web/web-runner/src/test/java/org/jbehave/web/runner/waffle/controllers/FilesControllerTest.java (1165 => 1166)

--- trunk/web/web-runner/src/test/java/org/jbehave/web/waffle/controllers/FilesControllerTest.java	2009-08-15 12:08:51 UTC (rev 1165)
+++ trunk/web/web-runner/src/test/java/org/jbehave/web/runner/waffle/controllers/FilesControllerTest.java	2009-08-15 12:17:35 UTC (rev 1166)
@@ -1,4 +1,4 @@
-package org.jbehave.web.waffle.controllers;
+package org.jbehave.web.runner.waffle.controllers;
 
 import static java.util.Arrays.asList;
 import static org.junit.Assert.assertEquals;
@@ -8,6 +8,7 @@
 
 import org.codehaus.waffle.menu.Menu;
 import org.jbehave.web.io.FileManager;
+import org.jbehave.web.runner.waffle.controllers.FilesController;
 import org.jmock.Expectations;
 import org.jmock.Mockery;
 import org.jmock.integration.junit4.JMock;

Modified: trunk/web/web-runner/src/test/java/org/jbehave/web/runner/waffle/controllers/ScenarioControllerTest.java (1165 => 1166)

--- trunk/web/web-runner/src/test/java/org/jbehave/web/waffle/controllers/ScenarioControllerTest.java	2009-08-15 12:08:51 UTC (rev 1165)
+++ trunk/web/web-runner/src/test/java/org/jbehave/web/runner/waffle/controllers/ScenarioControllerTest.java	2009-08-15 12:17:35 UTC (rev 1166)
@@ -1,4 +1,4 @@
-package org.jbehave.web.waffle.controllers;
+package org.jbehave.web.runner.waffle.controllers;
 
 import static java.util.Arrays.asList;
 import static org.junit.Assert.assertEquals;
@@ -14,6 +14,7 @@
 import org.jbehave.scenario.parser.PatternScenarioParser;
 import org.jbehave.scenario.parser.ScenarioParser;
 import org.jbehave.scenario.steps.Steps;
+import org.jbehave.web.runner.waffle.controllers.ScenarioController;
 import org.junit.Test;

Deleted: trunk/web/web-runner/src/test/java/org/jbehave/web/waffle/JBehaveRegistrarTest.java (1165 => 1166)

--- trunk/web/web-runner/src/test/java/org/jbehave/web/waffle/JBehaveRegistrarTest.java	2009-08-15 12:08:51 UTC (rev 1165)
+++ trunk/web/web-runner/src/test/java/org/jbehave/web/waffle/JBehaveRegistrarTest.java	2009-08-15 12:17:35 UTC (rev 1166)
@@ -1,31 +0,0 @@
-package org.jbehave.web.waffle;
-
-import static org.codehaus.waffle.context.ContextLevel.APPLICATION;
-import static org.codehaus.waffle.context.ContextLevel.REQUEST;
-import static org.codehaus.waffle.context.ContextLevel.SESSION;
-import static org.junit.Assert.assertNotNull;
-
-import org.codehaus.waffle.testing.registrar.RegistrarHelper;
-import org.jbehave.web.waffle.JBehaveRegistrar;
-import org.junit.Test;
-
-public class JBehaveRegistrarTest {
-
-    private static final Class<JBehaveRegistrar> CLASS = JBehaveRegistrar.class;
-
-    @Test
-    public void canRegisterComponentsAtDifferentLevels() {
-        RegistrarHelper helper = new RegistrarHelper();
-        helper.componentsFor(CLASS, APPLICATION);
-        helper.componentsFor(CLASS, SESSION);
-        helper.componentsFor(CLASS, REQUEST);
-    }
-
-    @Test
-    public void canRetrieveControllers() {
-        RegistrarHelper helper = new RegistrarHelper();
-        assertNotNull(helper.controllerFor(CLASS, APPLICATION, "data/files"));
-        assertNotNull(helper.controllerFor(CLASS, SESSION, "scenario/scenario"));
-        assertNotNull(helper.controllerFor(CLASS, REQUEST, "data/upload"));
-    }
-}

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Reply via email to