From 79662e616d94dcc2af363bc2d38c5fe7293ce0ca Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 24 Feb 2009 06:16:49 +0000
Subject: [PATCH] Demo structure

git-svn-id: https://svn.argeo.org/slc/trunk@2169 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 demo/org.argeo.slc.demo.basic/.classpath                    | 1 -
 demo/org.argeo.slc.demo.basic/.springBeans                  | 1 -
 demo/org.argeo.slc.demo.basic/pom.xml                       | 6 ++----
 .../{slc => main/resources}/conf/BasicExecutionFlow.groovy  | 0
 .../src/{slc => main/resources}/conf/basic.xml              | 0
 .../src/{slc => main/resources}/conf/common.xml             | 0
 .../src/{slc => main/resources}/conf/main.xml               | 0
 .../src/{slc => main/resources}/conf/slc.properties         | 0
 .../src/{slc => main/resources}/conf/test.xml               | 0
 .../{slc => main/resources}/conf/testCases/basic-001.xml    | 0
 .../{slc => main/resources}/conf/testCases/basic-002.xml    | 0
 org.argeo.slc/pom.xml                                       | 4 ++--
 12 files changed, 4 insertions(+), 8 deletions(-)
 rename demo/org.argeo.slc.demo.basic/src/{slc => main/resources}/conf/BasicExecutionFlow.groovy (100%)
 rename demo/org.argeo.slc.demo.basic/src/{slc => main/resources}/conf/basic.xml (100%)
 rename demo/org.argeo.slc.demo.basic/src/{slc => main/resources}/conf/common.xml (100%)
 rename demo/org.argeo.slc.demo.basic/src/{slc => main/resources}/conf/main.xml (100%)
 rename demo/org.argeo.slc.demo.basic/src/{slc => main/resources}/conf/slc.properties (100%)
 rename demo/org.argeo.slc.demo.basic/src/{slc => main/resources}/conf/test.xml (100%)
 rename demo/org.argeo.slc.demo.basic/src/{slc => main/resources}/conf/testCases/basic-001.xml (100%)
 rename demo/org.argeo.slc.demo.basic/src/{slc => main/resources}/conf/testCases/basic-002.xml (100%)

diff --git a/demo/org.argeo.slc.demo.basic/.classpath b/demo/org.argeo.slc.demo.basic/.classpath
index 2bc0b0bd8..df54f154b 100644
--- a/demo/org.argeo.slc.demo.basic/.classpath
+++ b/demo/org.argeo.slc.demo.basic/.classpath
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src/main/resources"/>
-	<classpathentry kind="src" path="src/slc"/>
 	<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"/>
diff --git a/demo/org.argeo.slc.demo.basic/.springBeans b/demo/org.argeo.slc.demo.basic/.springBeans
index 72eabe66e..c11d81486 100644
--- a/demo/org.argeo.slc.demo.basic/.springBeans
+++ b/demo/org.argeo.slc.demo.basic/.springBeans
@@ -7,7 +7,6 @@
 	</configSuffixes>
 	<enableImports><![CDATA[true]]></enableImports>
 	<configs>
-		<config>src/slc/conf/main.xml</config>
 	</configs>
 	<configSets>
 	</configSets>
diff --git a/demo/org.argeo.slc.demo.basic/pom.xml b/demo/org.argeo.slc.demo.basic/pom.xml
index 3bab63176..33d29dd73 100644
--- a/demo/org.argeo.slc.demo.basic/pom.xml
+++ b/demo/org.argeo.slc.demo.basic/pom.xml
@@ -23,10 +23,9 @@
 				<version>${version.maven-bundle-plugin}</version>
 				<configuration>
 					<instructions>
-						<Export-Package>
-							org.argeo.slc.*
-						</Export-Package>
+						<Import-Package>org.apache.commons.logging,org.springframework.beans.factory.config</Import-Package>
 						<Require-Bundle>org.argeo.slc.execution,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/main.xml</Spring-Context>
 					</instructions>
 				</configuration>
 			</plugin>
@@ -34,7 +33,6 @@
 	</build>
 	<dependencies>
 
-
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.execution</artifactId>
diff --git a/demo/org.argeo.slc.demo.basic/src/slc/conf/BasicExecutionFlow.groovy b/demo/org.argeo.slc.demo.basic/src/main/resources/conf/BasicExecutionFlow.groovy
similarity index 100%
rename from demo/org.argeo.slc.demo.basic/src/slc/conf/BasicExecutionFlow.groovy
rename to demo/org.argeo.slc.demo.basic/src/main/resources/conf/BasicExecutionFlow.groovy
diff --git a/demo/org.argeo.slc.demo.basic/src/slc/conf/basic.xml b/demo/org.argeo.slc.demo.basic/src/main/resources/conf/basic.xml
similarity index 100%
rename from demo/org.argeo.slc.demo.basic/src/slc/conf/basic.xml
rename to demo/org.argeo.slc.demo.basic/src/main/resources/conf/basic.xml
diff --git a/demo/org.argeo.slc.demo.basic/src/slc/conf/common.xml b/demo/org.argeo.slc.demo.basic/src/main/resources/conf/common.xml
similarity index 100%
rename from demo/org.argeo.slc.demo.basic/src/slc/conf/common.xml
rename to demo/org.argeo.slc.demo.basic/src/main/resources/conf/common.xml
diff --git a/demo/org.argeo.slc.demo.basic/src/slc/conf/main.xml b/demo/org.argeo.slc.demo.basic/src/main/resources/conf/main.xml
similarity index 100%
rename from demo/org.argeo.slc.demo.basic/src/slc/conf/main.xml
rename to demo/org.argeo.slc.demo.basic/src/main/resources/conf/main.xml
diff --git a/demo/org.argeo.slc.demo.basic/src/slc/conf/slc.properties b/demo/org.argeo.slc.demo.basic/src/main/resources/conf/slc.properties
similarity index 100%
rename from demo/org.argeo.slc.demo.basic/src/slc/conf/slc.properties
rename to demo/org.argeo.slc.demo.basic/src/main/resources/conf/slc.properties
diff --git a/demo/org.argeo.slc.demo.basic/src/slc/conf/test.xml b/demo/org.argeo.slc.demo.basic/src/main/resources/conf/test.xml
similarity index 100%
rename from demo/org.argeo.slc.demo.basic/src/slc/conf/test.xml
rename to demo/org.argeo.slc.demo.basic/src/main/resources/conf/test.xml
diff --git a/demo/org.argeo.slc.demo.basic/src/slc/conf/testCases/basic-001.xml b/demo/org.argeo.slc.demo.basic/src/main/resources/conf/testCases/basic-001.xml
similarity index 100%
rename from demo/org.argeo.slc.demo.basic/src/slc/conf/testCases/basic-001.xml
rename to demo/org.argeo.slc.demo.basic/src/main/resources/conf/testCases/basic-001.xml
diff --git a/demo/org.argeo.slc.demo.basic/src/slc/conf/testCases/basic-002.xml b/demo/org.argeo.slc.demo.basic/src/main/resources/conf/testCases/basic-002.xml
similarity index 100%
rename from demo/org.argeo.slc.demo.basic/src/slc/conf/testCases/basic-002.xml
rename to demo/org.argeo.slc.demo.basic/src/main/resources/conf/testCases/basic-002.xml
diff --git a/org.argeo.slc/pom.xml b/org.argeo.slc/pom.xml
index 54e1ecaad..f6092a1ff 100644
--- a/org.argeo.slc/pom.xml
+++ b/org.argeo.slc/pom.xml
@@ -84,7 +84,7 @@ limitations under the License.
 					<artifactId>maven-jar-plugin</artifactId>
 					<configuration>
 						<archive>
-							<manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
+							<manifestFile>target/classes/META-INF/MANIFEST.MF</manifestFile>
 						</archive>
 					</configuration>
 				</plugin>
@@ -192,7 +192,7 @@ limitations under the License.
 					<version>${version.maven-bundle-plugin}</version>
 					<extensions>true</extensions>
 					<configuration>
-						<manifestLocation>src/main/resources/META-INF</manifestLocation>
+						<manifestLocation>target/classes/META-INF</manifestLocation>
 						<instructions>
 							<Bundle-SymbolicName>
 								${pom.artifactId}
-- 
2.39.2