Improve logging and project structure

git-svn-id: https://svn.argeo.org/slc/trunk@1705 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/sandbox/argeo.slc.jemmytest/src/main/java/org/argeo/slc/jemmytest/MainFrame.java b/sandbox/argeo.slc.jemmytest/src/main/java/org/argeo/slc/jemmytest/MainFrame.java
deleted file mode 100644 (file)
index 581d406..0000000
--- a/sandbox/argeo.slc.jemmytest/src/main/java/org/argeo/slc/jemmytest/MainFrame.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.argeo.slc.jemmytest;
-
-import org.argeo.slc.detached.DetachedContext;
-import org.argeo.slc.detached.DetachedRequest;
-import org.argeo.slc.detached.ui.UiPart;
-import org.netbeans.jemmy.operators.JButtonOperator;
-import org.netbeans.jemmy.operators.JFrameOperator;
-import org.netbeans.jemmy.operators.JLabelOperator;
-
-public class MainFrame implements UiPart {
-       private JFrameOperator frame = null;
-       private JButtonOperator button = null;
-       private JButtonOperator buttonStart = null;
-       private JLabelOperator label = null;
-
-       public void init(DetachedContext context, DetachedRequest request) {
-               frame = new JFrameOperator("HelloWorldSwing");
-               button = new JButtonOperator(frame, "Button");
-               buttonStart = new JButtonOperator(frame, "Start");
-               String labelStr = request.getProperties()
-                               .getProperty("jemmyTest.label");
-               label = new JLabelOperator(frame, labelStr);
-       }
-
-       public void changeLabel() {
-               button.push();
-       }
-
-       public void openDialog() {
-               buttonStart.push();
-       }
-
-       public String getLabelText() {
-               return label.getText();
-       }
-}

diff --git a/sandbox/argeo.slc.jemmytest/src/main/java/org/argeo/slc/jemmytest/MainFrameLabel.java b/sandbox/argeo.slc.jemmytest/src/main/java/org/argeo/slc/jemmytest/MainFrameLabel.java
deleted file mode 100644 (file)
index d4fc4c3..0000000
--- a/sandbox/argeo.slc.jemmytest/src/main/java/org/argeo/slc/jemmytest/MainFrameLabel.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.argeo.slc.jemmytest;
-
-import org.argeo.slc.detached.DetachedAnswer;
-import org.argeo.slc.detached.DetachedContext;
-import org.argeo.slc.detached.DetachedRequest;
-import org.argeo.slc.detached.ui.UiStep;
-
-public class MainFrameLabel extends UiStep {
-
-       protected DetachedAnswer executeUiStep(DetachedContext context,
-                       DetachedRequest request) {
-               MainFrame mainFrame = (MainFrame) getUiPart();
-               mainFrame.changeLabel();
-               String textAfterPush = mainFrame.getLabelText();
-
-               DetachedAnswer answer = new DetachedAnswer(request,
-                               "DummyStep passed!! textAfterPush=" + textAfterPush);
-               answer.getProperties().setProperty("jemmyTest.label", textAfterPush);
-               return answer;
-       }
-
-}

diff --git a/sandbox/argeo.slc.jemmytest/src/main/java/org/argeo/slc/jemmytest/TestDialog.java b/sandbox/argeo.slc.jemmytest/src/main/java/org/argeo/slc/jemmytest/TestDialog.java
deleted file mode 100644 (file)
index 4e06b4a..0000000
--- a/sandbox/argeo.slc.jemmytest/src/main/java/org/argeo/slc/jemmytest/TestDialog.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.argeo.slc.jemmytest;
-
-import org.argeo.slc.detached.DetachedContext;
-import org.argeo.slc.detached.DetachedRequest;
-import org.argeo.slc.detached.ui.UiPart;
-import org.netbeans.jemmy.operators.JDialogOperator;
-import org.netbeans.jemmy.operators.JLabelOperator;
-
-public class TestDialog implements UiPart {
-       private JDialogOperator dialog = null;
-       private JLabelOperator label = null;
-
-       public void init(DetachedContext context, DetachedRequest request) {
-               dialog = new JDialogOperator("TestDialog");
-               label = new JLabelOperator(dialog, "Dialog Open");
-       }
-
-       public String getLabelText() {
-               return label.getText();
-       }
-
-       public void close() {
-               dialog.close();
-       }
-}

diff --git a/sandbox/argeo.slc.jemmytest/src/main/java/org/argeo/slc/jemmytest/steps/MainFrameLabel.java b/sandbox/argeo.slc.jemmytest/src/main/java/org/argeo/slc/jemmytest/steps/MainFrameLabel.java
new file mode 100644 (file)
index 0000000..e8514f6
--- /dev/null
+++ b/sandbox/argeo.slc.jemmytest/src/main/java/org/argeo/slc/jemmytest/steps/MainFrameLabel.java
@@ -0,0 +1,23 @@
+package org.argeo.slc.jemmytest.steps;
+
+import org.argeo.slc.detached.DetachedAnswer;
+import org.argeo.slc.detached.DetachedContext;
+import org.argeo.slc.detached.DetachedRequest;
+import org.argeo.slc.detached.ui.UiStep;
+import org.argeo.slc.jemmytest.uiparts.MainFrame;
+
+public class MainFrameLabel extends UiStep {
+
+       protected DetachedAnswer executeUiStep(DetachedContext context,
+                       DetachedRequest request) {
+               MainFrame mainFrame = (MainFrame) getUiPart();
+               mainFrame.changeLabel();
+               String textAfterPush = mainFrame.getLabelText();
+
+               DetachedAnswer answer = new DetachedAnswer(request,
+                               "DummyStep passed!! textAfterPush=" + textAfterPush);
+               answer.getProperties().setProperty("jemmyTest.label", textAfterPush);
+               return answer;
+       }
+
+}

diff --git a/sandbox/argeo.slc.jemmytest/src/main/java/org/argeo/slc/jemmytest/uiparts/MainFrame.java b/sandbox/argeo.slc.jemmytest/src/main/java/org/argeo/slc/jemmytest/uiparts/MainFrame.java
new file mode 100644 (file)
index 0000000..ca17de3
--- /dev/null
+++ b/sandbox/argeo.slc.jemmytest/src/main/java/org/argeo/slc/jemmytest/uiparts/MainFrame.java
@@ -0,0 +1,36 @@
+package org.argeo.slc.jemmytest.uiparts;
+
+import org.argeo.slc.detached.DetachedContext;
+import org.argeo.slc.detached.DetachedRequest;
+import org.argeo.slc.detached.ui.UiPart;
+import org.netbeans.jemmy.operators.JButtonOperator;
+import org.netbeans.jemmy.operators.JFrameOperator;
+import org.netbeans.jemmy.operators.JLabelOperator;
+
+public class MainFrame implements UiPart {
+       private JFrameOperator frame = null;
+       private JButtonOperator button = null;
+       private JButtonOperator buttonStart = null;
+       private JLabelOperator label = null;
+
+       public void init(DetachedContext context, DetachedRequest request) {
+               frame = new JFrameOperator("HelloWorldSwing");
+               button = new JButtonOperator(frame, "Button");
+               buttonStart = new JButtonOperator(frame, "Start");
+               String labelStr = request.getProperties()
+                               .getProperty("jemmyTest.label");
+               label = new JLabelOperator(frame, labelStr);
+       }
+
+       public void changeLabel() {
+               button.push();
+       }
+
+       public void openDialog() {
+               buttonStart.push();
+       }
+
+       public String getLabelText() {
+               return label.getText();
+       }
+}

diff --git a/sandbox/argeo.slc.jemmytest/src/main/java/org/argeo/slc/jemmytest/uiparts/TestDialog.java b/sandbox/argeo.slc.jemmytest/src/main/java/org/argeo/slc/jemmytest/uiparts/TestDialog.java
new file mode 100644 (file)
index 0000000..1d2af58
--- /dev/null
+++ b/sandbox/argeo.slc.jemmytest/src/main/java/org/argeo/slc/jemmytest/uiparts/TestDialog.java
@@ -0,0 +1,25 @@
+package org.argeo.slc.jemmytest.uiparts;
+
+import org.argeo.slc.detached.DetachedContext;
+import org.argeo.slc.detached.DetachedRequest;
+import org.argeo.slc.detached.ui.UiPart;
+import org.netbeans.jemmy.operators.JDialogOperator;
+import org.netbeans.jemmy.operators.JLabelOperator;
+
+public class TestDialog implements UiPart {
+       private JDialogOperator dialog = null;
+       private JLabelOperator label = null;
+
+       public void init(DetachedContext context, DetachedRequest request) {
+               dialog = new JDialogOperator("TestDialog");
+               label = new JLabelOperator(dialog, "Dialog Open");
+       }
+
+       public String getLabelText() {
+               return label.getText();
+       }
+
+       public void close() {
+               dialog.close();
+       }
+}

diff --git a/sandbox/argeo.slc.jemmytest/src/main/resources/META-INF/spring/slc-detached.xml b/sandbox/argeo.slc.jemmytest/src/main/resources/META-INF/spring/slc-detached.xml
index 9bb6659be1eb8a55d43ed7d7b8a6fcc548b7ccff..2fc0e86df907149dc4c42c18cf93ac18c9113662 100644 (file)
--- a/sandbox/argeo.slc.jemmytest/src/main/resources/META-INF/spring/slc-detached.xml
+++ b/sandbox/argeo.slc.jemmytest/src/main/resources/META-INF/spring/slc-detached.xml
@@ -5,7 +5,13 @@
 
     <import resource="classpath:/org/argeo/slc/detached/spring.xml" />
 
-    <bean id="jemmyTest" class="org.argeo.slc.jemmytest.DummyStep">
+    <bean id="step.mainFrameLabel"
+        class="org.argeo.slc.jemmytest.steps.MainFrameLabel">
+        <property name="uiPart" ref="uipart.mainFrame" />
+    </bean>
+
+    <bean id="uipart.mainFrame"
+        class="org.argeo.slc.jemmytest.uiparts.MainFrame">
     </bean>
 
     <bean id="slcDetached.driver"

diff --git a/sandbox/argeo.slc.jemmytest/src/main/slc/conf/applicationContext.xml b/sandbox/argeo.slc.jemmytest/src/main/slc/conf/applicationContext.xml
index f857c1caffa46df09c6ba92b71a91d54c66d2293..d21e8072d07556e92c02f375532a6cee2ce41859 100644 (file)
--- a/sandbox/argeo.slc.jemmytest/src/main/slc/conf/applicationContext.xml
+++ b/sandbox/argeo.slc.jemmytest/src/main/slc/conf/applicationContext.xml
@@ -3,13 +3,14 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
-    <import resource="classpath:/META-INF/spring/slc-detached.xml" />
     <import resource="classpath:/org/argeo/slc/lib/detached/spring.xml" />
 
+    <import resource="classpath:/META-INF/spring/slc-detached.xml" />
+
     <bean id="detachedTestDef"
         class="org.argeo.slc.lib.detached.DetachedTestDefinition">
         <property name="client" ref="slcDetached.driver" />
-        <property name="step" ref="jemmyTest" />
+        <property name="step" ref="step.mainFrameLabel" />
     </bean>
 
     <bean id="slcDetached.driver"