Update demo

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

diff --git a/demo/org.argeo.slc.demo.basic/.classpath b/demo/org.argeo.slc.demo.basic/.classpath
deleted file mode 100644 (file)
index 624a6cf..0000000
--- a/demo/org.argeo.slc.demo.basic/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-       <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/J2SE-1.5"/>
-       <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-       <classpathentry kind="output" path="target/classes"/>
-</classpath>

diff --git a/demo/org.argeo.slc.demo.basic/.project b/demo/org.argeo.slc.demo.basic/.project
deleted file mode 100644 (file)
index 6a65410..0000000
--- a/demo/org.argeo.slc.demo.basic/.project
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-       <name>org.argeo.slc.demo.basic</name>
-       <comment></comment>
-       <projects>
-       </projects>
-       <buildSpec>
-               <buildCommand>
-                       <name>org.eclipse.jdt.core.javabuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-               <buildCommand>
-                       <name>org.maven.ide.eclipse.maven2Builder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-               <buildCommand>
-                       <name>org.springframework.ide.eclipse.core.springbuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-       </buildSpec>
-       <natures>
-               <nature>org.springframework.ide.eclipse.core.springnature</nature>
-               <nature>org.maven.ide.eclipse.maven2Nature</nature>
-               <nature>org.eclipse.jdt.core.javanature</nature>
-       </natures>
-</projectDescription>

diff --git a/demo/org.argeo.slc.demo.basic/.settings/org.eclipse.jdt.core.prefs b/demo/org.argeo.slc.demo.basic/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644 (file)
index 52560ee..0000000
--- a/demo/org.argeo.slc.demo.basic/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Mon Feb 23 12:46:02 CET 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-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=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5

diff --git a/demo/org.argeo.slc.demo.basic/.settings/org.springframework.ide.eclipse.core.prefs b/demo/org.argeo.slc.demo.basic/.settings/org.springframework.ide.eclipse.core.prefs
deleted file mode 100644 (file)
index 52534ea..0000000
--- a/demo/org.argeo.slc.demo.basic/.settings/org.springframework.ide.eclipse.core.prefs
+++ /dev/null
@@ -1,19 +0,0 @@
-#Mon Feb 23 10:19:09 CET 2009
-eclipse.preferences.version=1
-org.springframework.ide.eclipse.core.builders.enable.beanmetadatabuilder=false
-org.springframework.ide.eclipse.core.enable.project.preferences=false
-org.springframework.ide.eclipse.core.validator.enable.org.springframework.ide.eclipse.beans.core.beansvalidator=false
-org.springframework.ide.eclipse.core.validator.enable.org.springframework.ide.eclipse.core.springvalidator=false
-org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanAlias-org.springframework.ide.eclipse.beans.core.beansvalidator=false
-org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanClass-org.springframework.ide.eclipse.beans.core.beansvalidator=false
-org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanConstructorArgument-org.springframework.ide.eclipse.beans.core.beansvalidator=false
-org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanDefinition-org.springframework.ide.eclipse.beans.core.beansvalidator=false
-org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanDefinitionHolder-org.springframework.ide.eclipse.beans.core.beansvalidator=false
-org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanFactory-org.springframework.ide.eclipse.beans.core.beansvalidator=false
-org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanInitDestroyMethod-org.springframework.ide.eclipse.beans.core.beansvalidator=false
-org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanProperty-org.springframework.ide.eclipse.beans.core.beansvalidator=false
-org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanReference-org.springframework.ide.eclipse.beans.core.beansvalidator=false
-org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.methodOverride-org.springframework.ide.eclipse.beans.core.beansvalidator=false
-org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.parsingProblems-org.springframework.ide.eclipse.beans.core.beansvalidator=false
-org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.requiredProperty-org.springframework.ide.eclipse.beans.core.beansvalidator=false
-org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.core.springClasspath-org.springframework.ide.eclipse.core.springvalidator=false

diff --git a/demo/org.argeo.slc.demo.basic/.springBeans b/demo/org.argeo.slc.demo.basic/.springBeans
deleted file mode 100644 (file)
index c11d814..0000000
--- a/demo/org.argeo.slc.demo.basic/.springBeans
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beansProjectDescription>
-       <version>1</version>
-       <pluginVersion><![CDATA[2.2.1.v200811281800]]></pluginVersion>
-       <configSuffixes>
-               <configSuffix><![CDATA[xml]]></configSuffix>
-       </configSuffixes>
-       <enableImports><![CDATA[true]]></enableImports>
-       <configs>
-       </configs>
-       <configSets>
-       </configSets>
-</beansProjectDescription>

diff --git a/demo/org.argeo.slc.demo.basic/pom.xml b/demo/org.argeo.slc.demo.basic/pom.xml
deleted file mode 100644 (file)
index cc9e1ea..0000000
--- a/demo/org.argeo.slc.demo.basic/pom.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<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>
-               <artifactId>argeo-slc-demo</artifactId>
-               <version>0.11.3-SNAPSHOT</version>
-               <relativePath>..</relativePath>
-       </parent>
-       <groupId>org.argeo.slc.demo</groupId>
-       <artifactId>org.argeo.slc.demo.basic</artifactId>
-       <name>Argeo SLC Demo Basic Test Module</name>
-       <packaging>jar</packaging>
-       <properties></properties>
-       <build>
-               <plugins>
-                       <plugin>
-                               <artifactId>maven-jar-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.felix</groupId>
-                               <artifactId>maven-bundle-plugin</artifactId>
-                               <version>${version.maven-bundle-plugin}</version>
-                               <configuration>
-                                       <instructions>
-                                               <Import-Package>org.apache.commons.logging,org.springframework.beans.factory.config</Import-Package>
-                                               <Require-Bundle>org.argeo.slc.support.equinox,org.argeo.slc.specs,org.argeo.slc.support.simple,org.springframework.aop,com.springsource.net.sf.cglib,com.springsource.org.aopalliance</Require-Bundle>
-                                               <Spring-Context>conf/*,conf/testCases/*</Spring-Context>
-                                       </instructions>
-                               </configuration>
-                               <executions>
-                                       <execution>
-                                               <goals>
-                                                       <goal>manifest</goal>
-                                               </goals>
-                                               <phase>resources</phase>
-                                       </execution>
-                               </executions>
-                       </plugin>
-               </plugins>
-       </build>
-       <dependencies>
-
-               <dependency>
-                       <groupId>org.argeo.slc.runtime</groupId>
-                       <artifactId>org.argeo.slc.support.equinox</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.slc.runtime</groupId>
-                       <artifactId>org.argeo.slc.support.simple</artifactId>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.argeo.slc.demo</groupId>
-                       <artifactId>org.argeo.slc.demo.log4j</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-
-       </dependencies>
-</project>

diff --git a/demo/org.argeo.slc.demo.basic/src/test/java/org/argeo/slc/demo/basic/BasicExecutionTest.java b/demo/org.argeo.slc.demo.basic/src/test/java/org/argeo/slc/demo/basic/BasicExecutionTest.java
deleted file mode 100644 (file)
index 0d703cd..0000000
--- a/demo/org.argeo.slc.demo.basic/src/test/java/org/argeo/slc/demo/basic/BasicExecutionTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.argeo.slc.demo.basic;
-
-import java.util.Map;
-
-import junit.framework.TestCase;
-
-import org.argeo.slc.core.execution.ExecutionContext;
-import org.argeo.slc.execution.ExecutionFlow;
-import org.springframework.beans.factory.generic.GenericBeanFactoryAccessor;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-public class BasicExecutionTest extends TestCase {
-       public void testExecution() throws Exception {
-               String[] files = { "conf/imports.xml", "conf/common.xml",
-                               "conf/basic.xml", "conf/canonic.xml",
-                               "conf/testCases/basic-001.xml", "conf/testCases/basic-002.xml",
-                               "conf/testCases/canonic-001.xml",
-                               "conf/testCases/canonic-002.xml", "conf/main.xml" };
-               ClassPathXmlApplicationContext applicationContext = new ClassPathXmlApplicationContext(
-                               files);
-               applicationContext.start();
-
-               // GenericBeanFactoryAccessor accessor = new
-               // GenericBeanFactoryAccessor(applicationContext);
-               // Map<String, Execut>
-
-               String bean = "main";
-               ExecutionContext.registerExecutionContext(new ExecutionContext());
-               ExecutionContext.getVariables().put("slc.flows", bean);
-               ExecutionFlow executionFlow = (ExecutionFlow) applicationContext
-                               .getBean(bean);
-               executionFlow.execute();
-
-               // SlcExecution slcExecution = new SlcExecution();
-               // slcExecution.getAttributes().put("slc.flows", "main");
-               // applicationContext.publishEvent(new NewExecutionEvent(this,
-               // slcExecution));
-               //               
-               // Thread.sleep(5000);
-
-               applicationContext.close();
-       }
-}

diff --git a/demo/org.argeo.slc.demo.log4j/.classpath b/demo/org.argeo.slc.demo.log4j/.classpath
deleted file mode 100644 (file)
index df54f15..0000000
--- a/demo/org.argeo.slc.demo.log4j/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-       <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/J2SE-1.5"/>
-       <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-       <classpathentry kind="output" path="target/classes"/>
-</classpath>

diff --git a/demo/org.argeo.slc.demo.log4j/.project b/demo/org.argeo.slc.demo.log4j/.project
deleted file mode 100644 (file)
index 7101391..0000000
--- a/demo/org.argeo.slc.demo.log4j/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-       <name>org.argeo.slc.demo.log4j</name>
-       <comment></comment>
-       <projects>
-       </projects>
-       <buildSpec>
-               <buildCommand>
-                       <name>org.eclipse.jdt.core.javabuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-               <buildCommand>
-                       <name>org.maven.ide.eclipse.maven2Builder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-       </buildSpec>
-       <natures>
-               <nature>org.maven.ide.eclipse.maven2Nature</nature>
-               <nature>org.eclipse.jdt.core.javanature</nature>
-       </natures>
-</projectDescription>

diff --git a/demo/org.argeo.slc.demo.log4j/pom.xml b/demo/org.argeo.slc.demo.log4j/pom.xml
deleted file mode 100644 (file)
index d6babe9..0000000
--- a/demo/org.argeo.slc.demo.log4j/pom.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<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>
-               <artifactId>argeo-slc-demo</artifactId>
-               <version>0.11.3-SNAPSHOT</version>
-               <relativePath>..</relativePath>
-       </parent>
-       <groupId>org.argeo.slc.demo</groupId>
-       <artifactId>org.argeo.slc.demo.log4j</artifactId>
-       <name>Argeo SLC Demo Logging</name>
-       <packaging>jar</packaging>
-       <properties></properties>
-       <build>
-               <plugins>
-                       <plugin>
-                               <artifactId>maven-jar-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.felix</groupId>
-                               <artifactId>maven-bundle-plugin</artifactId>
-                               <version>${version.maven-bundle-plugin}</version>
-                               <configuration>
-                                       <instructions>
-                                               <Fragment-Host>com.springsource.org.apache.log4j</Fragment-Host>
-                                       </instructions>
-                               </configuration>
-                               <executions>
-                                       <execution>
-                                               <goals>
-                                                       <goal>manifest</goal>
-                                               </goals>
-                                               <phase>resources</phase>
-                                       </execution>
-                               </executions>
-                       </plugin>
-               </plugins>
-       </build>
-       <dependencies>
-
-               <dependency>
-                       <groupId>org.apache.log4j</groupId>
-                       <artifactId>com.springsource.org.apache.log4j</artifactId>
-               </dependency>
-       </dependencies>
-</project>

diff --git a/demo/org.argeo.slc.demo.log4j/src/main/resources/log4j.properties b/demo/org.argeo.slc.demo.log4j/src/main/resources/log4j.properties
deleted file mode 100644 (file)
index 9489460..0000000
--- a/demo/org.argeo.slc.demo.log4j/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-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.osgi=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
-
-testCase=002
\ No newline at end of file

diff --git a/demo/org.argeo.slc.demo.manager/.classpath b/demo/org.argeo.slc.demo.manager/.classpath
deleted file mode 100644 (file)
index 624a6cf..0000000
--- a/demo/org.argeo.slc.demo.manager/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-       <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/J2SE-1.5"/>
-       <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-       <classpathentry kind="output" path="target/classes"/>
-</classpath>

diff --git a/demo/org.argeo.slc.demo.manager/.project b/demo/org.argeo.slc.demo.manager/.project
deleted file mode 100644 (file)
index ffa5f4c..0000000
--- a/demo/org.argeo.slc.demo.manager/.project
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-       <name>org.argeo.slc.demo.manager</name>
-       <comment></comment>
-       <projects>
-       </projects>
-       <buildSpec>
-               <buildCommand>
-                       <name>org.eclipse.jdt.core.javabuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-               <buildCommand>
-                       <name>org.maven.ide.eclipse.maven2Builder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-               <buildCommand>
-                       <name>org.springframework.ide.eclipse.core.springbuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-       </buildSpec>
-       <natures>
-               <nature>org.springframework.ide.eclipse.core.springnature</nature>
-               <nature>org.maven.ide.eclipse.maven2Nature</nature>
-               <nature>org.eclipse.jdt.core.javanature</nature>
-       </natures>
-</projectDescription>

diff --git a/demo/org.argeo.slc.demo.manager/.settings/org.eclipse.jdt.core.prefs b/demo/org.argeo.slc.demo.manager/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644 (file)
index 23ab29a..0000000
--- a/demo/org.argeo.slc.demo.manager/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Tue Feb 24 17:26:20 CET 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-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=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5

diff --git a/demo/org.argeo.slc.demo.manager/.settings/org.springframework.ide.eclipse.beans.core.prefs b/demo/org.argeo.slc.demo.manager/.settings/org.springframework.ide.eclipse.beans.core.prefs
deleted file mode 100644 (file)
index 47103a3..0000000
--- a/demo/org.argeo.slc.demo.manager/.settings/org.springframework.ide.eclipse.beans.core.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Feb 24 17:23:36 CET 2009
-eclipse.preferences.version=1
-org.springframework.ide.eclipse.beans.core.ignoreMissingNamespaceHandler=false

diff --git a/demo/org.argeo.slc.demo.manager/.settings/org.springframework.ide.eclipse.core.prefs b/demo/org.argeo.slc.demo.manager/.settings/org.springframework.ide.eclipse.core.prefs
deleted file mode 100644 (file)
index a88b4c7..0000000
--- a/demo/org.argeo.slc.demo.manager/.settings/org.springframework.ide.eclipse.core.prefs
+++ /dev/null
@@ -1,19 +0,0 @@
-#Tue Feb 24 17:23:36 CET 2009
-eclipse.preferences.version=1
-org.springframework.ide.eclipse.core.builders.enable.beanmetadatabuilder=false
-org.springframework.ide.eclipse.core.enable.project.preferences=false
-org.springframework.ide.eclipse.core.validator.enable.org.springframework.ide.eclipse.beans.core.beansvalidator=false
-org.springframework.ide.eclipse.core.validator.enable.org.springframework.ide.eclipse.core.springvalidator=false
-org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanAlias-org.springframework.ide.eclipse.beans.core.beansvalidator=false
-org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanClass-org.springframework.ide.eclipse.beans.core.beansvalidator=false
-org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanConstructorArgument-org.springframework.ide.eclipse.beans.core.beansvalidator=false
-org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanDefinition-org.springframework.ide.eclipse.beans.core.beansvalidator=false
-org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanDefinitionHolder-org.springframework.ide.eclipse.beans.core.beansvalidator=false
-org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanFactory-org.springframework.ide.eclipse.beans.core.beansvalidator=false
-org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanInitDestroyMethod-org.springframework.ide.eclipse.beans.core.beansvalidator=false
-org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanProperty-org.springframework.ide.eclipse.beans.core.beansvalidator=false
-org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanReference-org.springframework.ide.eclipse.beans.core.beansvalidator=false
-org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.methodOverride-org.springframework.ide.eclipse.beans.core.beansvalidator=false
-org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.parsingProblems-org.springframework.ide.eclipse.beans.core.beansvalidator=false
-org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.requiredProperty-org.springframework.ide.eclipse.beans.core.beansvalidator=false
-org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.core.springClasspath-org.springframework.ide.eclipse.core.springvalidator=false

diff --git a/demo/org.argeo.slc.demo.manager/.springBeans b/demo/org.argeo.slc.demo.manager/.springBeans
deleted file mode 100644 (file)
index c11d814..0000000
--- a/demo/org.argeo.slc.demo.manager/.springBeans
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beansProjectDescription>
-       <version>1</version>
-       <pluginVersion><![CDATA[2.2.1.v200811281800]]></pluginVersion>
-       <configSuffixes>
-               <configSuffix><![CDATA[xml]]></configSuffix>
-       </configSuffixes>
-       <enableImports><![CDATA[true]]></enableImports>
-       <configs>
-       </configs>
-       <configSets>
-       </configSets>
-</beansProjectDescription>

diff --git a/demo/org.argeo.slc.demo.manager/pom.xml b/demo/org.argeo.slc.demo.manager/pom.xml
deleted file mode 100644 (file)
index cae507a..0000000
--- a/demo/org.argeo.slc.demo.manager/pom.xml
+++ /dev/null
@@ -1,161 +0,0 @@
-<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>
-               <artifactId>argeo-slc-demo</artifactId>
-               <version>0.11.3-SNAPSHOT</version>
-               <relativePath>..</relativePath>
-       </parent>
-       <groupId>org.argeo.slc.demo</groupId>
-       <artifactId>org.argeo.slc.demo.manager</artifactId>
-       <name>Argeo SLC Demo Manager</name>
-       <packaging>jar</packaging>
-       <properties></properties>
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.felix</groupId>
-                               <artifactId>maven-bundle-plugin</artifactId>
-                               <version>${version.maven-bundle-plugin}</version>
-                               <configuration>
-                                       <instructions>
-                                               <Import-Package>org.apache.commons.logging,org.springframework.beans.factory.config</Import-Package>
-                                               <Require-Bundle>org.springframework.jms,com.springsource.org.castor,org.argeo.dep.osgi.activemq,org.argeo.slc.support.equinox,org.argeo.slc.support.activemq,org.argeo.slc.specs,org.argeo.slc.support.simple,org.springframework.aop,org.springframework.oxm,com.springsource.net.sf.cglib,com.springsource.org.aopalliance,org.argeo.dep.osgi.maven.embedder</Require-Bundle>
-                                               <Spring-Context>conf/*</Spring-Context>
-                                       </instructions>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.codehaus.mojo</groupId>
-                               <artifactId>exec-maven-plugin</artifactId>
-                               <version>1.1-beta-1</version>
-                               <!--
-                                       <configuration>
-                                       <mainClass>org.argeo.slc.detached.launcher.Main</mainClass>
-                                       <systemProperties> <systemProperty>
-                                       <key>slc.osgi.scanClasspath</key> <value>true</value>
-                                       </systemProperty> <systemProperty> <key>slc.osgi.start</key>
-                                       <value>*</value> </systemProperty> </systemProperties>
-                                       <classpathScope>test</classpathScope> </configuration>
-                               -->
-                               <configuration>
-                                       <executable>${java.home}${file.separator}bin${file.separator}java</executable>
-                                       <arguments>
-                                               <argument>-Xbootclasspath/p:${settings.localRepository}${file.separator}org${file.separator}apache${file.separator}xerces${file.separator}com.springsource.org.apache.xerces${file.separator}2.8.1${file.separator}com.springsource.org.apache.xerces-2.8.1.jar${path.separator}${settings.localRepository}${file.separator}org${file.separator}apache${file.separator}xmlcommons${file.separator}com.springsource.org.apache.xmlcommons${file.separator}1.3.3${file.separator}com.springsource.org.apache.xmlcommons-1.3.3.jar</argument>
-                                               <argument>-Dslc.osgi.scanClasspath=true</argument>
-                                               <argument>-Dslc.osgi.start=*</argument>
-                                               <argument>-classpath</argument>
-                                               <classpath />
-                                               <argument>org.argeo.slc.detached.launcher.Main</argument>
-                                       </arguments>
-                                       <workingDirectory>target</workingDirectory>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <artifactId>maven-antrun-plugin</artifactId>
-                               <configuration>
-                                       <tasks>
-                                               <property name="xerces.jar"
-                                                       location="${settings.localRepository}/org/apache/xerces/com.springsource.org.apache.xerces/2.8.1/com.springsource.org.apache.xerces-2.8.1.jar" />
-                                               <property name="xmlcommons.jar"
-                                                       location="${settings.localRepository}/org/apache/xmlcommons/com.springsource.org.apache.xmlcommons/1.3.3/com.springsource.org.apache.xmlcommons-1.3.3.jar" />
-
-                                               <echo message="${xmlcommons.jar}" />
-                                               <echo message="${xerces.jar}" />
-                                               <!--
-                                                       <property name="xerces.jar"
-                                                       refid="maven.dependency.org.apache.xerces:com.springsource.org.apache.xerces::jar.path"
-                                                       /> <property name="xmlcommons.jar"
-                                                       refid="maven.dependency.org.apache.xmlcommons:com.springsource.org.apache.xmlcommons::jar.path"
-                                                       />
-                                               -->
-                                               <java classname="org.argeo.slc.detached.launcher.Main" fork="true">
-                                                       <classpath>
-                                                               <path refid="maven.compile.classpath" />
-                                                       </classpath>
-                                                       <sysproperty key="slc.osgi.scanClasspath" value="true" />
-                                                       <sysproperty key="slc.osgi.start" value="*" />
-                                                       <jvmarg
-                                                               value="-Xbootclasspath/p:${xmlcommons.jar}${path.separator}${xerces.jar}" />
-                                               </java>
-                                       </tasks>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <artifactId>maven-dependency-plugin</artifactId>
-                               <executions>
-                                       <execution>
-                                               <id>manager</id>
-                                               <phase>initialize</phase>
-                                               <goals>
-                                                       <goal>list</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <outputFile>target/classes/META-INF/slc/dep/manager.maven</outputFile>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-
-               </plugins>
-       </build>
-       <dependencies>
-
-               <dependency>
-                       <groupId>org.argeo.slc.runtime</groupId>
-                       <artifactId>org.argeo.slc.support.equinox</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.slc.runtime</groupId>
-                       <artifactId>org.argeo.slc.support.activemq</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.slc.runtime</groupId>
-                       <artifactId>org.argeo.slc.support.castor</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.slc.runtime</groupId>
-                       <artifactId>org.argeo.slc.support.maven</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.argeo.slc</groupId>
-                       <artifactId>org.argeo.slc.detached.launcher</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.argeo.slc.demo</groupId>
-                       <artifactId>org.argeo.slc.demo.basic</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.slc.demo</groupId>
-                       <artifactId>org.argeo.slc.demo.log4j</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-
-
-               <dependency>
-                       <groupId>com.thoughtworks.xstream</groupId>
-                       <artifactId>com.springsource.com.thoughtworks.xstream</artifactId>
-                       <version>1.2.2</version>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.apache.xerces</groupId>
-                       <artifactId>
-                                       com.springsource.org.apache.xerces
-                               </artifactId>
-                       <version>2.8.1</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.xmlcommons</groupId>
-                       <artifactId>com.springsource.org.apache.xmlcommons</artifactId>
-                       <version>1.3.3</version>
-               </dependency>
-
-       </dependencies>
-</project>

diff --git a/demo/org.argeo.slc.demo.manager/src/test/java/org/argeo/slc/demo/manager/JmsTesting.java b/demo/org.argeo.slc.demo.manager/src/test/java/org/argeo/slc/demo/manager/JmsTesting.java
deleted file mode 100644 (file)
index 31122e2..0000000
--- a/demo/org.argeo.slc.demo.manager/src/test/java/org/argeo/slc/demo/manager/JmsTesting.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package org.argeo.slc.demo.manager;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-
-import javax.jms.ConnectionFactory;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.Session;
-import javax.jms.TextMessage;
-
-import org.apache.activemq.broker.BrokerService;
-import org.apache.activemq.broker.TransportConnector;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
-import org.springframework.jms.core.JmsTemplate;
-import org.springframework.jms.core.MessageCreator;
-
-public class JmsTesting {
-       private final static Log log = LogFactory.getLog(JmsTesting.class);
-
-       /**
-        * @param args
-        */
-       public static void main(String[] args) {
-//             BrokerService broker;
-//             try {
-//                     broker = new BrokerService();
-//                     broker.setPersistent(false);
-//                     TransportConnector transportConnector = new TransportConnector();
-//                     transportConnector.setUri(new URI("tcp://localhost:61616"));
-//                     broker.addConnector(transportConnector);
-//                     broker.start();
-//                     
-//                     Thread.sleep(5000);
-//             } catch (URISyntaxException e1) {
-//                     // TODO Auto-generated catch block
-//                     e1.printStackTrace();
-//             } catch (Exception e1) {
-//                     // TODO Auto-generated catch block
-//                     e1.printStackTrace();
-//             }
-
-               ClassPathXmlApplicationContext applicationContext = new ClassPathXmlApplicationContext(
-                               "org/argeo/slc/activemq/spring.xml");
-               try {
-
-
-                       ConnectionFactory connectionFactory = (ConnectionFactory) applicationContext
-                                       .getBean("slcDefault.jms.connectionFactory");
-                       JmsTemplate jmsTemplate = new JmsTemplate(connectionFactory);
-
-                       jmsTemplate.send("modulesManager.request", new MessageCreator() {
-
-                               public Message createMessage(Session session)
-                                               throws JMSException {
-                                       TextMessage message = session.createTextMessage();
-                                       message.setStringProperty("action",
-                                                       "getExecutionModuleDescriptor");
-                                       message.setStringProperty("name",
-                                                       "org.argeo.slc.demo.basic");
-                                       message.setStringProperty("version", "LATEST");
-                                       return message;
-                               }
-                       });
-
-                       TextMessage message = (TextMessage) jmsTemplate
-                                       .receive("modulesManager.response");
-                       log.info("Received message: " + message.getText() + "\n");
-
-               } catch (Exception e) {
-                       e.printStackTrace();
-               } finally {
-                       applicationContext.close();
-               }
-       }
-
-}

diff --git a/pom.xml b/pom.xml
index fda8831ba1b2ce7dbe93eaf0e43953153b75ed5a..d4f0dbf6ad4530d996d91e209e3a7940d3ed8fb1 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
        <modules>
                <module>org.argeo.slc</module>
                <module>runtime</module>
-               <module>demo</module>
+               <module>demo/site</module>
                <module>server/org.argeo.slc.siteserver</module>
 
                <module>org.argeo.slc.detached.launcher</module>