From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 25 Oct 2012 15:12:19 +0000 (+0000)
Subject: Introduce execution module archetype
X-Git-Tag: argeo-slc-2.1.7~585
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=ca9526438a73fa5c35199c1d796e2fb6c40dfbd8;p=gpl%2Fargeo-slc.git

Introduce execution module archetype

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

diff --git a/archetypes/org.argeo.slc.archetype.basic/.project b/archetypes/org.argeo.slc.archetype.basic/.project
deleted file mode 100644
index 663f17321..000000000
--- a/archetypes/org.argeo.slc.archetype.basic/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.argeo.slc.archetype.basic</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>
diff --git a/archetypes/org.argeo.slc.archetype.basic/archetype.properties b/archetypes/org.argeo.slc.archetype.basic/archetype.properties
deleted file mode 100644
index 00dcecbc1..000000000
--- a/archetypes/org.argeo.slc.archetype.basic/archetype.properties
+++ /dev/null
@@ -1 +0,0 @@
-slcArchetype.slc.version=0.11.2-SNAPSHOT
\ No newline at end of file
diff --git a/archetypes/org.argeo.slc.archetype.basic/pom.xml b/archetypes/org.argeo.slc.archetype.basic/pom.xml
deleted file mode 100644
index 6274d40cf..000000000
--- a/archetypes/org.argeo.slc.archetype.basic/pom.xml
+++ /dev/null
@@ -1,12 +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>archetype</artifactId>
-		<version>0.11.4</version>
-		<relativePath>..</relativePath>
-	</parent>
-	<groupId>org.argeo.slc.archetypes</groupId>
-	<artifactId>org.argeo.slc.archetype.basic</artifactId>
-	<name>SLC Basic Project Archetype</name>
-</project>
\ No newline at end of file
diff --git a/archetypes/org.argeo.slc.archetype.basic/src/main/resources/META-INF/maven/archetype-metadata.xml b/archetypes/org.argeo.slc.archetype.basic/src/main/resources/META-INF/maven/archetype-metadata.xml
deleted file mode 100644
index 343af3d6a..000000000
--- a/archetypes/org.argeo.slc.archetype.basic/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<archetype-descriptor name="org.argeo.slc.archetype.basic">
-	<requiredProperties>
-		<requiredProperty key="slcArchetype.slc.version">
-			<defaultValue>0.11.2-SNAPSHOT</defaultValue>
-		</requiredProperty>
-	</requiredProperties>
-	<fileSets>
-	<!-- 
-		<fileSet filtered="true">
-			<directory>src/slc</directory>
-			<includes>
-				<include>*/**</include>
-			</includes>
-		</fileSet>
-		 -->
-		<fileSet filtered="true">
-			<directory></directory>
-			<includes>
-				<include>pom.xml</include>
-			</includes>
-		</fileSet>
-	</fileSets>
-</archetype-descriptor>
\ No newline at end of file
diff --git a/archetypes/org.argeo.slc.archetype.basic/src/main/resources/META-INF/maven/archetype.xml b/archetypes/org.argeo.slc.archetype.basic/src/main/resources/META-INF/maven/archetype.xml
deleted file mode 100644
index 648c707e4..000000000
--- a/archetypes/org.argeo.slc.archetype.basic/src/main/resources/META-INF/maven/archetype.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<archetype>
-  <id>org.argeo.slc.archetype.basic</id>
-  <resources>
-  <!-- 
-    <resource>src/assembly/slcapp.xml</resource>
-    <resource>src/slc/conf/runtime/default.xml</resource>
-    <resource>src/slc/conf/applicationContext.xml</resource>
-    <resource>src/slc/conf/slc.properties</resource>
-    <resource>src/slc/root/slcRoot.properties</resource>
-    <resource>src/slc/work/log/slcApp.log</resource>
-     -->
-  </resources>
- </archetype>
diff --git a/archetypes/org.argeo.slc.archetype.basic/src/main/resources/archetype-resources/pom.xml b/archetypes/org.argeo.slc.archetype.basic/src/main/resources/archetype-resources/pom.xml
deleted file mode 100644
index 228f0e03e..000000000
--- a/archetypes/org.argeo.slc.archetype.basic/src/main/resources/archetype-resources/pom.xml
+++ /dev/null
@@ -1,56 +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>
-	<groupId>${groupId}</groupId>
-	<artifactId>${artifactId}</artifactId>
-	<version>${version}</version>
-	<name>(Generated SLC Application Template)</name>
-	<properties>
-		<slc.version>${slcArchetype.slc.version}</slc.version>
-	</properties>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<configuration>
-					<descriptors>
-						<descriptor>src/assembly/slcapp.xml</descriptor>
-					</descriptors>
-				</configuration>
-				<executions>
-					<execution>
-						<id>assembly-slcapp</id>
-						<phase>package</phase>
-						<goals>
-							<goal>single</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-	<dependencies>
-		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.support.simple</artifactId>
-			<version>${slc.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.support.ant</artifactId>
-			<version>${slc.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.support.castor</artifactId>
-			<version>${slc.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.launcher</artifactId>
-			<version>${slc.version}</version>
-			<scope>provided</scope>
-		</dependency>
-	</dependencies>
-</project>
\ No newline at end of file
diff --git a/archetypes/org.argeo.slc.executionmodule/.project b/archetypes/org.argeo.slc.executionmodule/.project
new file mode 100644
index 000000000..663f17321
--- /dev/null
+++ b/archetypes/org.argeo.slc.executionmodule/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.argeo.slc.archetype.basic</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
diff --git a/archetypes/org.argeo.slc.executionmodule/archetype.properties b/archetypes/org.argeo.slc.executionmodule/archetype.properties
new file mode 100644
index 000000000..e69de29bb
diff --git a/archetypes/org.argeo.slc.executionmodule/pom.xml b/archetypes/org.argeo.slc.executionmodule/pom.xml
new file mode 100644
index 000000000..71c6891f2
--- /dev/null
+++ b/archetypes/org.argeo.slc.executionmodule/pom.xml
@@ -0,0 +1,20 @@
+<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>archetypes</artifactId>
+		<version>1.1.4-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
+	<artifactId>org.argeo.slc.executionmodule</artifactId>
+	<name>SLC Basic Project Archetype</name>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+</project>
\ No newline at end of file
diff --git a/archetypes/org.argeo.slc.executionmodule/src/main/resources/META-INF/maven/archetype-metadata.xml b/archetypes/org.argeo.slc.executionmodule/src/main/resources/META-INF/maven/archetype-metadata.xml
new file mode 100644
index 000000000..1d55c35ab
--- /dev/null
+++ b/archetypes/org.argeo.slc.executionmodule/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -0,0 +1,10 @@
+<archetype-descriptor name="org.argeo.slc.executionmodule">
+	<fileSets>
+		<fileSet filtered="true">
+			<directory></directory>
+			<includes>
+				<include>*/**</include>
+			</includes>
+		</fileSet>
+	</fileSets>
+</archetype-descriptor>
\ No newline at end of file
diff --git a/archetypes/org.argeo.slc.executionmodule/src/main/resources/META-INF/maven/archetype.xml b/archetypes/org.argeo.slc.executionmodule/src/main/resources/META-INF/maven/archetype.xml
new file mode 100644
index 000000000..e39a44eee
--- /dev/null
+++ b/archetypes/org.argeo.slc.executionmodule/src/main/resources/META-INF/maven/archetype.xml
@@ -0,0 +1,3 @@
+<archetype>
+  <id>org.argeo.slc.executionmodule</id>
+ </archetype>
diff --git a/archetypes/org.argeo.slc.executionmodule/src/main/resources/archetype-resources/.gitignore b/archetypes/org.argeo.slc.executionmodule/src/main/resources/archetype-resources/.gitignore
new file mode 100644
index 000000000..ea8c4bf7f
--- /dev/null
+++ b/archetypes/org.argeo.slc.executionmodule/src/main/resources/archetype-resources/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/archetypes/org.argeo.slc.executionmodule/src/main/resources/archetype-resources/.project b/archetypes/org.argeo.slc.executionmodule/src/main/resources/archetype-resources/.project
new file mode 100644
index 000000000..0fe55c472
--- /dev/null
+++ b/archetypes/org.argeo.slc.executionmodule/src/main/resources/archetype-resources/.project
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>${artifactId}</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+	</natures>
+</projectDescription>
diff --git a/archetypes/org.argeo.slc.executionmodule/src/main/resources/archetype-resources/META-INF/.gitignore b/archetypes/org.argeo.slc.executionmodule/src/main/resources/archetype-resources/META-INF/.gitignore
new file mode 100644
index 000000000..4854a41b9
--- /dev/null
+++ b/archetypes/org.argeo.slc.executionmodule/src/main/resources/archetype-resources/META-INF/.gitignore
@@ -0,0 +1 @@
+/MANIFEST.MF
diff --git a/archetypes/org.argeo.slc.executionmodule/src/main/resources/archetype-resources/META-INF/spring/main.xml b/archetypes/org.argeo.slc.executionmodule/src/main/resources/archetype-resources/META-INF/spring/main.xml
new file mode 100644
index 000000000..cca8c034b
--- /dev/null
+++ b/archetypes/org.argeo.slc.executionmodule/src/main/resources/archetype-resources/META-INF/spring/main.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns:flow="http://www.argeo.org/schema/slc-flow" xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
+	xsi:schemaLocation="
+	http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+	http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-1.2.xsd">
+
+	<!-- Hello world -->
+	<flow:flow name="hello">
+		<description>Print Hello World!</description>
+		<bean p:message="Hello World!" class="org.argeo.slc.core.execution.tasks.Echo" />
+	</flow:flow>
+
+
+	<flow:flow name="HelloWorld/WithVar">
+		<description>Print Hello World! with a variable and interface proxying
+			(lighter)</description>
+		<flow:spec>
+			<flow:primitive name="testKey" value="555" />
+		</flow:spec>
+		<bean p:message="Hello World! @{testKey}" class="org.argeo.slc.core.execution.tasks.Echo">
+			<flow:variable proxy-target-class="false" />
+		</bean>
+	</flow:flow>
+
+</beans>
\ No newline at end of file
diff --git a/archetypes/org.argeo.slc.executionmodule/src/main/resources/archetype-resources/META-INF/spring/osgi.xml b/archetypes/org.argeo.slc.executionmodule/src/main/resources/archetype-resources/META-INF/spring/osgi.xml
new file mode 100644
index 000000000..ceadbed3f
--- /dev/null
+++ b/archetypes/org.argeo.slc.executionmodule/src/main/resources/archetype-resources/META-INF/spring/osgi.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans:beans xmlns="http://www.springframework.org/schema/osgi"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
+	xsi:schemaLocation="http://www.springframework.org/schema/osgi  
+       http://www.springframework.org/schema/osgi/spring-osgi-1.1.xsd
+       http://www.springframework.org/schema/beans   
+       http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+
+	<!-- IMPORTS -->
+	<beans:import resource="classpath:org/argeo/slc/core/execution/spring.xml" />
+	<beans:import resource="classpath:org/argeo/slc/osgi/execution.xml" />
+
+</beans:beans>
\ No newline at end of file
diff --git a/archetypes/org.argeo.slc.executionmodule/src/main/resources/archetype-resources/build.properties b/archetypes/org.argeo.slc.executionmodule/src/main/resources/archetype-resources/build.properties
new file mode 100644
index 000000000..5f22cdd44
--- /dev/null
+++ b/archetypes/org.argeo.slc.executionmodule/src/main/resources/archetype-resources/build.properties
@@ -0,0 +1 @@
+bin.includes = META-INF/
diff --git a/archetypes/org.argeo.slc.executionmodule/src/main/resources/archetype-resources/pom.xml b/archetypes/org.argeo.slc.executionmodule/src/main/resources/archetype-resources/pom.xml
new file mode 100644
index 000000000..0cafa83a8
--- /dev/null
+++ b/archetypes/org.argeo.slc.executionmodule/src/main/resources/archetype-resources/pom.xml
@@ -0,0 +1,13 @@
+<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>lib</artifactId>
+		<version>${version}</version>
+		<relativePath>..</relativePath>
+	</parent>
+	<groupId>${groupId}</groupId>
+	<artifactId>${artifactId}</artifactId>
+	<name>(Generated SLC Execution Module Template)</name>
+</project>
\ No newline at end of file
diff --git a/archetypes/pom.xml b/archetypes/pom.xml
index 0548b9b8f..0f7afff1a 100644
--- a/archetypes/pom.xml
+++ b/archetypes/pom.xml
@@ -1,16 +1,33 @@
-<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>
 		<artifactId>argeo-slc</artifactId>
-		<version>0.11.4</version>
+		<version>1.1.4-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
-	<groupId>org.argeo.slc</groupId>
-	<artifactId>archetype</artifactId>
+	<artifactId>archetypes</artifactId>
 	<packaging>pom</packaging>
-	<name>SLC Maven Archetype</name>
+	<name>SLC Maven Archetypes</name>
 	<modules>
-		<module>org.argeo.slc.archetype.basic</module>
+		<module>org.argeo.slc.executionmodule</module>
 	</modules>
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-clean-plugin</artifactId>
+				<configuration>
+					<filesets>
+						<fileset>
+							<directory>META-INF</directory>
+							<includes>
+								<include>MANIFEST.MF</include>
+							</includes>
+						</fileset>
+					</filesets>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 </project>
\ No newline at end of file
diff --git a/lib/org.argeo.slc.lib.repo/.project b/lib/org.argeo.slc.lib.repo/.project
new file mode 100644
index 000000000..1a9a2c8af
--- /dev/null
+++ b/lib/org.argeo.slc.lib.repo/.project
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.argeo.slc.lib.repo</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+	</natures>
+</projectDescription>
diff --git a/lib/org.argeo.slc.lib.repo/build.properties b/lib/org.argeo.slc.lib.repo/build.properties
new file mode 100644
index 000000000..5f22cdd44
--- /dev/null
+++ b/lib/org.argeo.slc.lib.repo/build.properties
@@ -0,0 +1 @@
+bin.includes = META-INF/
diff --git a/lib/org.argeo.slc.lib.repo/pom.xml b/lib/org.argeo.slc.lib.repo/pom.xml
new file mode 100644
index 000000000..9cd454c61
--- /dev/null
+++ b/lib/org.argeo.slc.lib.repo/pom.xml
@@ -0,0 +1,12 @@
+<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>lib</artifactId>
+		<version>1.1.4-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
+	<artifactId>org.argeo.slc.lib.repo</artifactId>
+	<name>SLC Lib - Repository Utilities</name>
+</project>
diff --git a/pom.xml b/pom.xml
index 1169cb4ae..89ee2d48f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,9 +22,10 @@
 		<module>modules</module>
 		<module>lib</module>
 		<module>plugins</module>
-		<module>demo</module>
 		<module>dep</module>
+		<module>archetypes</module>
 		<module>dist</module>
+		<module>demo</module>
 	</modules>
 	<url>${site.urlBase}/${developmentCycle.slc}</url>
 	<scm>