Integrate demo in web

[gpl/argeo-slc.git] / demo / org.argeo.slc.demo.basic / pom.xml

diff --git a/demo/org.argeo.slc.demo.basic/pom.xml b/demo/org.argeo.slc.demo.basic/pom.xml
index 3bab63176122d6a60059c7247c67ec98d0808de4..cc9e1ea1cb4c635a7d5594bffb4d022181ec8d6b 100644 (file)
--- a/demo/org.argeo.slc.demo.basic/pom.xml
+++ b/demo/org.argeo.slc.demo.basic/pom.xml
@@ -3,13 +3,13 @@
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.slc</groupId>
-               <artifactId>argeo-slc</artifactId>
+               <artifactId>argeo-slc-demo</artifactId>
                <version>0.11.3-SNAPSHOT</version>
-               <relativePath>../../org.argeo.slc</relativePath>
+               <relativePath>..</relativePath>
        </parent>
        <groupId>org.argeo.slc.demo</groupId>
        <artifactId>org.argeo.slc.demo.basic</artifactId>
-       <name>SLC Demo Basic Test Module</name>
+       <name>Argeo SLC Demo Basic Test Module</name>
        <packaging>jar</packaging>
        <properties></properties>
        <build>
@@ -23,40 +23,38 @@
                                <version>${version.maven-bundle-plugin}</version>
                                <configuration>
                                        <instructions>
-                                               <Export-Package>
-                                                       org.argeo.slc.*
-                                               </Export-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>
+                                               <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.execution</artifactId>
+                       <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</groupId>
-                       <artifactId>org.argeo.slc.detached.launcher</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
 
                <dependency>
-                       <groupId>org.eclipse.osgi</groupId>
-                       <artifactId>org.eclipse.osgi</artifactId>
+                       <groupId>org.argeo.slc.demo</groupId>
+                       <artifactId>org.argeo.slc.demo.log4j</artifactId>
+                       <version>${project.version}</version>
                </dependency>
 
-               <dependency>
-                       <groupId>org.springframework.osgi</groupId>
-                       <artifactId>org.springframework.osgi.extender</artifactId>
-               </dependency>
        </dependencies>
 </project>