Restructure the dependencies between UI projects

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

diff --git a/org.argeo.slc.autoui.launcher/.classpath b/org.argeo.slc.autoui.launcher/.classpath
index 0df7745b3088fb23a32984af0ed6124e56ae6270..1aa73cdbf084050c2f4611c2f74041009d5307dc 100644 (file)
--- a/org.argeo.slc.autoui.launcher/.classpath
+++ b/org.argeo.slc.autoui.launcher/.classpath
@@ -2,7 +2,7 @@
 <classpath>
        <classpathentry kind="src" path="src/main/java"/>
        <classpathentry kind="src" path="src/main/resources"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/LOCAL_JDK_1.3"/>
        <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>

diff --git a/org.argeo.slc.autoui.launcher/src/main/resources/org/argeo/slc/autoui/launcher/felix.properties b/org.argeo.slc.autoui.launcher/src/main/resources/org/argeo/slc/autoui/launcher/felix.properties
index 4d2157af29cdb8e503aa20cf63cb4a89fe55b0fb..403ec3a4d94aef3bc0a6463d61d213cf9e7acb14 100644 (file)
--- a/org.argeo.slc.autoui.launcher/src/main/resources/org/argeo/slc/autoui/launcher/felix.properties
+++ b/org.argeo.slc.autoui.launcher/src/main/resources/org/argeo/slc/autoui/launcher/felix.properties
@@ -28,7 +28,7 @@ felix.auto.start.1= \
  ${argeo.slc.mavenBase}org/apache/felix/org.apache.felix.shell/1.0.2/org.apache.felix.shell-1.0.2.jar \
  ${argeo.slc.mavenBase}org/apache/felix/org.apache.felix.shell.tui/1.0.2/org.apache.felix.shell.tui-1.0.2.jar \
  ${argeo.slc.mavenBase}org/argeo/dep/jemmy/org.argeo.dep.jemmy.nb61/0.2.1-SNAPSHOT/org.argeo.dep.jemmy.nb61-0.2.1-SNAPSHOT.jar \
- ${argeo.slc.mavenBase}org/argeo/slc/sandbox/org.argeo.slc.sandbox.jemmytest/0.1.1-SNAPSHOT/org.argeo.slc.sandbox.jemmytest-0.1.1-SNAPSHOT.jar"
+ ${argeo.slc.mavenBase}org/argeo/slc/sandbox/org.argeo.slc.sandbox.jemmytest/0.1.2-SNAPSHOT/org.argeo.slc.sandbox.jemmytest-0.1.2-SNAPSHOT.jar"
 
 
 felix.log.level=1