org.argeo.slc.detached.*
</Export-Package>
<Import-Package>
- *,
+ org.w3c.dom;version="0.0.0",
+ javax.xml.*;version="0.0.0",
org.springframework.beans.factory;version="2.0",
org.springframework.beans.factory.support;version="2.0",
org.springframework.beans.factory.xml;version="2.0",
org.springframework.context;version="2.0",
org.springframework.context.support;version="2.0",
- org.springframework.core.io;version="2.0"
+ org.springframework.core.io;version="2.0",
+ *
</Import-Package>
<Spring-Context>*;create-asynchronously:=false</Spring-Context>
</instructions>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.argeo.slc</groupId>
<Export-Package>
org.argeo.slc.*
</Export-Package>
+ <Import-Package>javax.xml.*;version="0.0.0",*</Import-Package>
</instructions>
</configuration>
</plugin>
org.argeo.slc.core.execution;resolution:=optional,
org.argeo.slc.msg;resolution:=optional,
org.argeo.slc.msg.process;resolution:=optional,
- org.argeo.slc.msg.test.tree;resolution:=optional
+ org.argeo.slc.msg.test.tree;resolution:=optional,
+ org.argeo.slc.detached;resolution:=optional
</Import-Package>
<Fragment-Host>com.springsource.org.castor</Fragment-Host>
<!--
import java.util.Iterator;
import java.util.List;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.argeo.slc.SlcException;
import org.argeo.slc.execution.ExecutionFlowDescriptor;
import org.argeo.slc.execution.ExecutionModule;
public class ExecutionCommandProvider implements CommandProvider,
BundleContextAware {
+ private final static Log log = LogFactory
+ .getLog(ExecutionCommandProvider.class);
+
private List<ExecutionModule> executionModules;
private BundleContext bundleContext;
if (bundle != null) {
moduleName = bundle.getSymbolicName();
-// try {
-// bundle.stop();
-// bundle.update();
-// bundle.start();
-//
-// // FIXME: potential infinite loop
-// while (bundle.getState() == Bundle.STARTING) {
-// try {
-// Thread.sleep(500);
-// } catch (InterruptedException e) {
-// // silent
-// }
-// }
-// } catch (BundleException e) {
-// throw new SlcException(
-// "Could not update the bundle for module " + moduleName,
-// e);
-// }
+ // try {
+ // bundle.stop();
+ // bundle.update();
+ // bundle.start();
+ //
+ // // FIXME: potential infinite loop
+ // while (bundle.getState() == Bundle.STARTING) {
+ // try {
+ // Thread.sleep(500);
+ // } catch (InterruptedException e) {
+ // // silent
+ // }
+ // }
+ // } catch (BundleException e) {
+ // throw new SlcException(
+ // "Could not update the bundle for module " + moduleName,
+ // e);
+ // }
}
// Find module
ExecutionFlowDescriptor descriptor = new ExecutionFlowDescriptor();
descriptor.setName(executionName);
module.execute(descriptor);
- return "Executed " + executionName + " from " + moduleName;
+ log.info("Executed " + executionName + " from " + moduleName);
} else
- return "Could not find any execution module matching these requirements.";
+ log
+ .warn("Could not find any execution module matching these requirements.");
+
+ return null;
}
public String getHelp() {
-slc.osgi.start=org.springframework.osgi.extender,org.argeo.slc.detached,org.argeo.slc.sandbox.jemmytest
\ No newline at end of file
+slc.osgi.start=org.springframework.osgi.extender,org.argeo.slc.detached,org.argeo.slc.sandbox.jemmytest
+slc.osgi.scanClasspath=true
\ No newline at end of file
--- /dev/null
+Bundle-Name: Log4j Configuration
+Bundle-SymbolicName: org.argeo.slc.jemmytest.log4j
+Bundle-Version: 1.0.0
+Fragment-Host: com.springsource.org.apache.log4j
+
--- /dev/null
+log4j.rootLogger=WARN, console
+
+## Levels
+log4j.logger.org.argeo=DEBUG
+log4j.logger.org.argeo.slc.execution.ExecutionParameterPostProcessor=TRACE
+log4j.logger.org.argeo.slc.execution.ExecutionContext=DEBUG
+log4j.logger.org.argeo.slc.execution.SimpleExecutionSpec=DEBUG
+
+log4j.logger.org.springframework=WARN
+
+log4j.logger.org.apache.activemq=WARN
+log4j.logger.org.apache.activemq.transport=WARN
+log4j.logger.org.apache.activemq.selector=WARN
+
+log4j.logger.org.apache.catalina=INFO
+log4j.logger.org.apache.coyote=INFO
+log4j.logger.org.apache.tomcat=INFO
+
+## Appenders
+# console is set to be a ConsoleAppender.
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+
+# console uses PatternLayout.
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern= %-5p %d{ISO8601} %m - %c%n
--- /dev/null
+Bundle-Name: Mx Launch
+Bundle-SymbolicName: org.argeo.slc.jemmytest.mxlaunch
+Bundle-Version: 1.0.0
+Bundle-Name: Sparta Mx Client Launcher
+Import-Package: org.argeo.slc.detached,
+ javax.swing,
+ javax.swing.border,
+ javax.swing.colorchooser,
+ javax.swing.event,
+ javax.swing.filechooser,
+ javax.swing.plaf,
+ javax.swing.plaf.basic,
+ javax.swing.plaf.metal,
+ javax.swing.plaf.multi,
+ javax.swing.plaf.synth,
+ javax.swing.table,
+ javax.swing.text,
+ javax.swing.text.html,
+ javax.swing.text.html.parser,
+ javax.swing.text.rtf,
+ javax.swing.tree,
+ javax.swing.undo
+Bundle-ClassPath: lib/mxjboot.jar
+
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ 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">
+
+ <bean id="mxClientLauncher" class="org.argeo.slc.detached.AppLauncher"
+ init-method="launch">
+ <!-- <property name="mainClass" value="murex.rmi.loader.RmiLoader" />-->
+ <property name="mainClass" value="org.argeo.slc.testui.SwingTestUi" />
+ <property name="systemProperties">
+ <props>
+ <prop key="java.rmi.server.codebase">http://FS_URL/murex.download.guiclient.download
+ </prop>
+ </props>
+ </property>
+ <property name="arguments">
+ <list>
+ <value>/MXJ_CLASS_NAME:murex.gui.xml.XmlGuiClientBoot
+ </value>
+ <value>/MXJ_SITE_NAME:site1</value>
+ </list>
+ </property>
+ </bean>
+
+</beans>
\ No newline at end of file
--- /dev/null
+Bundle-SymbolicName: org.argeo.slc.sandbox.jemmytest.tests\r
+Fragment-Host: org.argeo.slc.sandbox.jemmytest\r
+Bundle-Version: 0.11.3.SNAPSHOT\r
+Bundle-Name: SLC Sandbox JemmyTest Tests\r
+Require-Bundle: org.argeo.slc.detached,\r
+ org.argeo.slc.lib.detached,\r
+ org.argeo.slc.support.equinox,\r
+ org.argeo.slc.specs,\r
+ org.argeo.slc.support.simple\r
+Import-Package: org.springframework.oxm,\r
+ org.springframework.oxm.castor,\r
+ org.springframework.xml.xsd,\r
+ net.sf.cglib.core,\r
+ net.sf.cglib.proxy,\r
+ net.sf.cglib.reflect,\r
+ org.aopalliance.aop,\r
+ org.apache.commons.logging,\r
+ org.springframework.aop,\r
+ org.springframework.aop.framework,\r
+ org.springframework.aop.scope,\r
+ org.springframework.beans.factory.config,\r
+ org.springframework.core.io\r
+ \r
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
+ xmlns:aop="http://www.springframework.org/schema/aop"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+ http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-2.5.xsd
+ http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
+
+ <bean id="jemmyTest" parent="slcTemplate.simpleFlow">
+ <property name="path" value="/autoui/testcases" />
+ <property name="executables">
+ <list>
+ <bean parent="task.echo" scope="execution">
+ <property name="message" value="Executing step" />
+ <aop:scoped-proxy />
+ </bean>
+
+ <bean class="org.argeo.slc.core.test.SimpleTestRun">
+ <property name="testDefinition" ref="detachedTestDef" />
+ <property name="testData" ref="testData.mainFrameLabel1" />
+ <property name="testResult" ref="testResult" />
+ </bean>
+
+ </list>
+ </property>
+ </bean>
+
+ <bean id="testResult" parent="slcDefault.test.basicTreeTestResult">
+ <property name="listeners">
+ <list>
+ <bean class="org.argeo.slc.core.test.tree.TreeTestResultLogger" />
+ </list>
+ </property>
+ </bean>
+</beans>
\ No newline at end of file
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>\r
+<beans xmlns="http://www.springframework.org/schema/beans"\r
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
+ xsi:schemaLocation="\r
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">\r
+\r
+ <import resource="classpath:/org/argeo/slc/core/execution/spring.xml" />\r
+ <import resource="classpath:/org/argeo/slc/core/test/spring/applicationContext.xml" />\r
+\r
+</beans>
\ No newline at end of file
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>\r
+<beans:beans xmlns="http://www.springframework.org/schema/osgi"\r
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"\r
+ xsi:schemaLocation="http://www.springframework.org/schema/osgi \r
+ http://www.springframework.org/schema/osgi/spring-osgi-1.1.xsd\r
+ http://www.springframework.org/schema/beans \r
+ http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">\r
+\r
+ <service interface="org.argeo.slc.execution.ExecutionModule">\r
+ <beans:bean class="org.argeo.slc.osgi.OsgiExecutionModule">\r
+ <beans:property name="executionContext" ref="executionContext" />\r
+ </beans:bean>\r
+ </service>\r
+\r
+\r
+</beans:beans>
\ No newline at end of file
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ 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:/org/argeo/slc/lib/detached/spring.xml" />
+
+ <import resource="classpath:/META-INF/spring/slc-detached.xml" />
+
+ <bean id="detachedTestDef"
+ parent="slcTemplate.detached.testDefinition"
+ scope="prototype">
+ <property name="client" ref="slcDetached.driver" />
+ </bean>
+
+ <bean id="slcDetached.driver"
+ class="org.argeo.slc.detached.drivers.FileDriver" init-method="cleanPreviousRuns">
+ <property name="baseDir" value="${user.dir}/local/detached" />
+ <property name="xmlConverter"
+ ref="slcDefault.detached.xmlConverterCastor" />
+ </bean>
+
+ <bean id="testData.mainFrameLabel1"
+ class="org.argeo.slc.lib.detached.DetachedTestData"
+ scope="prototype">
+ <property name="values">
+ <map>
+ <entry key="jemmyTest.label" value="Hello World" />
+ </map>
+ </property>
+ <property name="expectedValues">
+ <map>
+ <entry key="jemmyTest.label" value="Pressed!!" />
+ </map>
+ </property>
+ </bean>
+
+ <bean id="testData.mainFrameLabel2"
+ class="org.argeo.slc.lib.detached.DetachedTestData"
+ scope="prototype">
+ <property name="values">
+ <map>
+ <entry key="jemmyTest.label" value="Pressed!!" />
+ </map>
+ </property>
+ <property name="expectedValues">
+ <map>
+ <entry key="jemmyTest.label" value="Hello World" />
+ </map>
+ </property>
+ </bean>
+
+ <bean id="testData.testDialogLabel"
+ class="org.argeo.slc.lib.detached.DetachedTestData"
+ scope="prototype">
+ <property name="expectedValues">
+ <map>
+ <entry key="jemmyTest.labelDialog" value="Dialog open" />
+ </map>
+ </property>
+ </bean>
+</beans>
\ No newline at end of file
<artifactId>org.argeo.slc.sandbox.jemmytest</artifactId>
<name>SLC Sandbox JemmyTest</name>
<packaging>jar</packaging>
- <properties></properties>
+ <properties>
+ <bundlesToStart>
+ org.springframework.osgi.extender,
+ org.argeo.slc.detached,
+ org.argeo.slc.sandbox.jemmytest,
+ org.argeo.slc.support.equinox
+ </bundlesToStart>
+ </properties>
<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration></configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <phase>initialize</phase>
+ <configuration>
+ <outputDirectory>target/equinox</outputDirectory>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.argeo.slc.runtime</groupId>
+ <artifactId>org.argeo.slc.osgiboot</artifactId>
+ <version>${project.version}</version>
+ <type>tar.gz</type>
+ <classifier>osgiboot</classifier>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <configuration>
+ <tasks>
+ <path id="slc.osgi.locations.raw">
+ <dirset dir="${user.dir}/modules">
+ <include name="*" />
+ <exclude name=".svn" />
+ </dirset>
+ <path refid="maven.compile.classpath" />
+ </path>
+ <pathconvert dirsep="/" property="slc.osgi.locations"
+ refid="slc.osgi.locations.raw" />
+
+ <property name="slc.osgi.start" value="${bundlesToStart}" />
+ <ant antfile="target/equinox/osgiboot.xml" />
+
+ </tasks>
+ </configuration>
+ </plugin>
+
</plugins>
</build>
<profiles></profiles>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>org.springframework.osgi.extender</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.argeo.slc.runtime</groupId>
+ <artifactId>org.argeo.slc.support.equinox</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
<!--
<dependency> <groupId>org.argeo.slc</groupId>
<artifactId>org.argeo.slc.detached</artifactId>
<!-- Runtime -->
<bean id="slcDetached.driver" parent="slcTemplate.detached.fileDriver"
init-method="start" destroy-method="stop">
- <property name="baseDir" value="${slc.workDir}/detached" />
+ <property name="baseDir" value="${user.dir}/local/detached" />
<property name="xmlConverter" ref="slcDefault.detached.xmlConverterCompat" />
<property name="executionServer" ref="executionServer.serviceref" />
</bean>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.4</source>
- <target>1.2</target>
+ <target>1.4</target>
</configuration>
</plugin>
<plugin>
projects / gpl / argeo-slc.git / commitdiff