New build structure for SLC

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

diff --git a/server/org.argeo.slc.ria/config.json b/server/org.argeo.slc.ria/config.json
index 04f6e9d93b9c32917f51ed6a20dfc9ec13a28452..c42d673f298caa77855f9143676d88da3b925b76 100644 (file)
--- a/server/org.argeo.slc.ria/config.json
+++ b/server/org.argeo.slc.ria/config.json
@@ -22,7 +22,7 @@
     "API_EXCLUDE"  : ["qx.legacy.*"],\r
     "LOCALES"      : [ "en" ],\r
     "ROOT"         : "src/argeo-ria-src",\r
     "API_EXCLUDE"  : ["qx.legacy.*"],\r
     "LOCALES"      : [ "en" ],\r
     "ROOT"         : "src/argeo-ria-src",\r

-       "BUILD_PATH"   : "src/argeo-ria",\r
+       "BUILD_PATH"   : "target/classes/argeo-ria",\r

        "RIA_LIB_PATH" : "src/argeo-ria-lib",\r
        "RIA_LIB_URI"  : "../argeo-ria-lib",\r
        "CACHE"            : "cache" ,\r
        "RIA_LIB_PATH" : "src/argeo-ria-lib",\r
        "RIA_LIB_URI"  : "../argeo-ria-lib",\r
        "CACHE"            : "cache" ,\r

diff --git a/server/org.argeo.slc.ria/pom.xml b/server/org.argeo.slc.ria/pom.xml
index b535b3fcb05022a0f9385de1e943cf4d96a48ff0..4640658386e62b1eb85239c853dd01c2169582a1 100644 (file)
--- a/server/org.argeo.slc.ria/pom.xml
+++ b/server/org.argeo.slc.ria/pom.xml
@@ -12,11 +12,16 @@
        <packaging>jar</packaging>
        <name>Argeo SLC RIA</name>
        <build>
        <packaging>jar</packaging>
        <name>Argeo SLC RIA</name>
        <build>

+               <resources>
+                       <resource>
+                               <directory>src</directory>
+                               <includes>
+                                       <include>index.jsp</include>
+                                       <include>WEB-INF/*</include>
+                               </includes>
+                       </resource>
+               </resources>

                <plugins>
                <plugins>

-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-compiler-plugin</artifactId>
-                       </plugin>

                        <plugin>
                                <groupId>org.argeo.maven.plugins</groupId>
                                <artifactId>maven-argeo-qooxdoo-plugin</artifactId>
                        <plugin>
                                <groupId>org.argeo.maven.plugins</groupId>
                                <artifactId>maven-argeo-qooxdoo-plugin</artifactId>


@@ -85,17 +90,40 @@
                                <artifactId>maven-jar-plugin</artifactId>
                                <configuration>
                                        <archive>
                                <artifactId>maven-jar-plugin</artifactId>
                                <configuration>
                                        <archive>

-                                               <compress>false</compress>
-                                               <manifestFile>src/META-INF/MANIFEST.MF</manifestFile>
+                                               <manifestFile>target/classes/META-INF/MANIFEST.MF</manifestFile>

                                        </archive>
                                        </archive>

-                                       <classesDirectory>src/</classesDirectory>
-                                       <includes>
-                                               <include>index.jsp</include>
-                                               <include>argeo-ria/**</include>
-                                               <include>WEB-INF/*</include>
-                                       </includes>

                                </configuration>
                        </plugin>
                                </configuration>
                        </plugin>

+                       <plugin>
+                               <groupId>org.apache.felix</groupId>
+                               <artifactId>maven-bundle-plugin</artifactId>
+                               <version>${version.maven-bundle-plugin}</version>
+                               <configuration>
+                                       <instructions>
+                                               <Bundle-Version>${project.version}-r${buildNumber}</Bundle-Version>
+                                               <Export-Package></Export-Package>
+                                               <Import-Package>
+                                                       javax.servlet,
+                                                       javax.servlet.http,
+                                                       javax.servlet.jsp,
+                                                       javax.servlet.jsp.jstl.core,
+                                                       javax.servlet.jsp.jstl.fmt,
+                                                       javax.servlet.jsp.jstl.tlv,
+                                                       javax.servlet.resources
+                                               </Import-Package>
+                                               <Web-ContextPath>org.argeo.slc.ria</Web-ContextPath>
+                                       </instructions>
+                               </configuration>
+                               <executions>
+                                       <execution>
+                                               <id>bundle-manifest</id>
+                                               <phase>process-classes</phase>
+                                               <goals>
+                                                       <goal>manifest</goal>
+                                               </goals>
+                                       </execution>
+                               </executions>
+                       </plugin>

                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-dependency-plugin</artifactId>
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-dependency-plugin</artifactId>

diff --git a/server/org.argeo.slc.ria/src/META-INF/MANIFEST.MF b/server/org.argeo.slc.ria/src/META-INF/MANIFEST.MF
deleted file mode 100644 (file)
index d639b07..0000000
--- a/server/org.argeo.slc.ria/src/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0\r
-Bundle-Classpath: .\r
-Bundle-Version: 0.11.4.SNAPSHOT\r
-Bundle-Name: SLC RIA\r
-Import-Package: javax.servlet,javax.servlet.http,javax.servlet.jsp,jav\r
- ax.servlet.jsp.jstl.core,javax.servlet.jsp.jstl.fmt,javax.servlet.jsp\r
- .jstl.tlv,javax.servlet.resources\r
-Bundle-SymbolicName: org.argeo.slc.ria\r
-Web-ContextPath: org.argeo.slc.ria\r
-\r