]> git.argeo.org Git - gpl/argeo-slc.git/commitdiff
Restructure the dependencies between UI projects
authorMathieu Baudier <mbaudier@argeo.org>
Wed, 24 Sep 2008 17:20:08 +0000 (17:20 +0000)
committerMathieu Baudier <mbaudier@argeo.org>
Wed, 24 Sep 2008 17:20:08 +0000 (17:20 +0000)
git-svn-id: https://svn.argeo.org/slc/trunk@1626 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

sandbox/argeo.slc.jemmytest/.classpath
sandbox/argeo.slc.jemmytest/.settings/org.eclipse.jdt.core.prefs
sandbox/argeo.slc.jemmytest/build.properties
sandbox/argeo.slc.jemmytest/pom.xml
sandbox/argeo.slc.jemmytest/src/test/java/org/argeo/slc/jemmytest/JemmyRemoteTest.java [deleted file]
sandbox/argeo.slc.jemmytest/src/test/java/org/argeo/slc/jemmytest/SwingTestJemmy.java [deleted file]
sandbox/argeo.slc.jemmytest/src/test/resources/log4j.properties [deleted file]

index cad23f08609300a45d912fee5ca1937d9221ae46..c3624f87cec710f92cfac0f17204466abf8b1bbf 100644 (file)
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
        <classpathentry kind="src" path="src/main/java"/>
-       <classpathentry kind="src" path="src/test/resources"/>
-       <classpathentry kind="src" path="src/test/java"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/j2sdk1.3.1"/>
        <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
        <classpathentry kind="output" path="bin"/>
 </classpath>
index 43b6819f9635c53370cf9cb752bd7d2b6f91a444..668eec6b7518f67847596a56d309836e3c2a2586 100644 (file)
@@ -1,12 +1,12 @@
-#Sun Sep 14 07:26:48 CEST 2008
+#Wed Sep 24 19:17:13 CEST 2008
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.3
+org.eclipse.jdt.core.compiler.compliance=1.4
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=ignore
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
 org.eclipse.jdt.core.compiler.source=1.3
index 528985695bef1d60762c9c8ce04e014f1ff2e8e1..1cdd7a6bfe693682c610932fe2a61177c863be7f 100644 (file)
@@ -1,5 +1,5 @@
 source.. = src/main/java/,\
            src/test/resources/,\
-           src/test/java/
+           java/
 bin.includes = META-INF/,\
                .
index ffa4476cb7778bf335940a4681a17c50dd509cec..efa8abce19d4647b53a7f36d17c403e4052f5f52 100644 (file)
@@ -5,7 +5,7 @@
        <groupId>org.argeo.slc.sandbox</groupId>
        <artifactId>org.argeo.slc.sandbox.jemmytest</artifactId>
        <name>SLC Sandbox JemmyTest</name>
-       <version>0.1.1-SNAPSHOT</version>
+       <version>0.1.2-SNAPSHOT</version>
        <packaging>bundle</packaging>
        <build>
                <plugins>
@@ -23,9 +23,6 @@
                                                <Bundle-Activator>
                                                        org.argeo.slc.jemmytest.JemmyTestActivator
                                                </Bundle-Activator>
-                                               <Import-Package>
-                                                       !org.apache.felix.*,*
-                                               </Import-Package>
                                                <Export-Package>
                                                        org.argeo.slc.jemmytest.*
                                                </Export-Package>
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.autoui</artifactId>
-                       <version>0.10.3-SNAPSHOT</version>
-                       <exclusions>
-                               <exclusion>
-                                       <groupId>org.apache.felix</groupId>
-                                       <artifactId>org.osgi.core</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.apache.felix</groupId>
-                                       <artifactId>org.apache.felix.main</artifactId>
-                               </exclusion>
-                       </exclusions>
+                       <version>0.11.1-SNAPSHOT</version>
                </dependency>
 
                <dependency>
                        <artifactId>org.argeo.dep.jemmy.nb61</artifactId>
                        <version>0.2.1-SNAPSHOT</version>
                </dependency>
-               <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-                       <version>3.8.2</version>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.slc.sandbox</groupId>
-                       <artifactId>org.argeo.slc.sandbox.testui</artifactId>
-                       <version>0.1.1-SNAPSHOT</version>
-                       <scope>test</scope>
-               </dependency>
 
-               <!-- OSGi -->
                <dependency>
-                       <groupId>org.apache.felix</groupId>
-                       <artifactId>org.osgi.core</artifactId>
-                       <version>1.0.0</version>
+                       <groupId>org.eclipse</groupId>
+                       <artifactId>osgi</artifactId>
+                       <version>3.3.0-v20070530</version>
                </dependency>
        </dependencies>
        <repositories>
diff --git a/sandbox/argeo.slc.jemmytest/src/test/java/org/argeo/slc/jemmytest/JemmyRemoteTest.java b/sandbox/argeo.slc.jemmytest/src/test/java/org/argeo/slc/jemmytest/JemmyRemoteTest.java
deleted file mode 100644 (file)
index 9f63d6c..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
-package org.argeo.slc.jemmytest;
-
-import java.io.Serializable;
-import java.rmi.registry.LocateRegistry;
-import java.rmi.registry.Registry;
-
-import junit.framework.TestCase;
-
-import org.argeo.slc.autoui.swingtest.rmi.AutoUiContext;
-import org.argeo.slc.autoui.swingtest.rmi.AutoUiServer;
-import org.argeo.slc.autoui.swingtest.rmi.AutoUiTask;
-import org.argeo.slc.testui.SwingTestUi;
-import org.netbeans.jemmy.ClassReference;
-import org.netbeans.jemmy.operators.JButtonOperator;
-import org.netbeans.jemmy.operators.JFrameOperator;
-import org.netbeans.jemmy.operators.JLabelOperator;
-
-public class JemmyRemoteTest extends TestCase implements Serializable {
-       static final long serialVersionUID = 1l;
-
-       public void testRemote() throws Exception {
-                if (System.getSecurityManager() == null) {
-                       System.setSecurityManager(new SecurityManager());
-               }
-               String name = "AutoUiServer";
-               Registry registry = LocateRegistry.getRegistry("localhost");
-               AutoUiServer server = (AutoUiServer) registry.lookup(name);
-               AutoUiTask startFrame = new AutoUiTask() {
-                       static final long serialVersionUID = 1l;
-
-                       public Object execute(AutoUiContext context) throws Exception {
-                               // Start application
-                               ClassReference classReference = new ClassReference(
-                                               SwingTestUi.class.getName());
-                               String[] args = { "noExitOnClose" };
-                               classReference.startApplication(args);
-
-                               // Find components
-                               JFrameOperator jFrameOperator = new JFrameOperator(
-                                               "HelloWorldSwing");
-                               JButtonOperator jButtonOperator = new JButtonOperator(
-                                               jFrameOperator, "Button");
-                               JLabelOperator jLabelOperator = new JLabelOperator(
-                                               jFrameOperator, "Hello World");
-
-                               context.setLocalRef("label", jLabelOperator);
-                               context.setLocalRef("button", jButtonOperator);
-                               return null;
-                       }
-
-               };
-
-               AutoUiTask pushButton = new AutoUiTask() {
-                       static final long serialVersionUID = 1l;
-
-                       public Object execute(AutoUiContext context) throws Exception {
-                               JButtonOperator jButtonOperator = (JButtonOperator) context
-                                               .getLocalRef("button");
-                               JLabelOperator jLabelOperator = (JLabelOperator) context
-                                               .getLocalRef("label");
-
-                               // Execute actions
-                               jButtonOperator.push();
-
-                               // Performs checks
-                               String textAfterPush = jLabelOperator.getText();
-                               Boolean pressed = new Boolean(textAfterPush.equals("Pressed!!"));
-                               return pressed;
-                       }
-
-               };
-
-               server.executeTask(startFrame);
-               Boolean pressed = (Boolean) server.executeTask(pushButton);
-               assertTrue("Has been pressed", pressed.booleanValue());
-       }
-
-       public static void main(String[] args){
-               try {
-                       JemmyRemoteTest jemmyRemoteTest = new JemmyRemoteTest();
-                       jemmyRemoteTest.testRemote();
-               } catch (Exception e) {
-                       e.printStackTrace();
-               }
-       }
-}
diff --git a/sandbox/argeo.slc.jemmytest/src/test/java/org/argeo/slc/jemmytest/SwingTestJemmy.java b/sandbox/argeo.slc.jemmytest/src/test/java/org/argeo/slc/jemmytest/SwingTestJemmy.java
deleted file mode 100644 (file)
index d05b5f5..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.argeo.slc.jemmytest;
-
-import junit.framework.TestCase;
-
-import org.argeo.slc.testui.SwingTestUi;
-import org.netbeans.jemmy.ClassReference;
-import org.netbeans.jemmy.operators.JButtonOperator;
-import org.netbeans.jemmy.operators.JFrameOperator;
-import org.netbeans.jemmy.operators.JLabelOperator;
-
-public class SwingTestJemmy extends TestCase {
-//     private final static Log log = LogFactory.getLog(SwingTestJemmy.class);
-
-       public void testSimple() throws Exception {
-               // Start application
-               ClassReference classReference = new ClassReference(SwingTestUi.class
-                               .getName());
-               String[] args = { "noExitOnClose" };
-               classReference.startApplication(args);
-
-               // Find components
-               JFrameOperator jFrameOperator = new JFrameOperator("HelloWorldSwing");
-               JButtonOperator jButtonOperator = new JButtonOperator(jFrameOperator,
-                               "Button");
-               JLabelOperator jLabelOperator = new JLabelOperator(jFrameOperator,
-                               "Hello World");
-
-               // Execute actions
-               jButtonOperator.push();
-
-               // Performs checks
-               String textAfterPush = jLabelOperator.getText();
-               assertEquals("Pressed!!", textAfterPush);
-
-               // Clean up
-               jFrameOperator.close();
-       }
-
-}
diff --git a/sandbox/argeo.slc.jemmytest/src/test/resources/log4j.properties b/sandbox/argeo.slc.jemmytest/src/test/resources/log4j.properties
deleted file mode 100644 (file)
index 48539ac..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-# Set root logger level to DEBUG and its only appender to A1.\r
-log4j.rootLogger=WARN, console\r
-\r
-## Levels\r
-# Slc\r
-log4j.logger.org.argeo.slc=DEBUG\r
-\r
-## Appenders\r
-# A1 is set to be a ConsoleAppender.\r
-log4j.appender.console=org.apache.log4j.ConsoleAppender\r
-\r
-# A1 uses PatternLayout.\r
-log4j.appender.console.layout=org.apache.log4j.PatternLayout\r
-log4j.appender.console.layout.ConversionPattern= %-5p %d{ISO8601} %m - %c %n\r
-\r