Introduce SLC SDK

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

diff --git a/buildSite.sh b/buildSite.sh
index c4011e57dbdc06a48c1a5edda86a23de1709da6e..0c56aa1c6780fdc42783e36af2803b131680f77a 100755 (executable)
--- a/buildSite.sh
+++ b/buildSite.sh
@@ -34,4 +34,7 @@ else
        mail -s "SiteGeneration@$HOSTNAME FAILURE - $DATE - $BUILD_DIR" $TO < siteGeneration.log
 fi
 
+cd dist/org.argeo.slc.sdk
+mvn deploy
+
 exit $EXIT_STATUS

diff --git a/dep/org.argeo.slc.dep.server/pom.xml b/dep/org.argeo.slc.dep.server/pom.xml
index e362c0612810429616ef913b0dbbaa9f75c8ddc0..ec90e19d829cdf3d82b710b1cdba59422c37f8ed 100644 (file)
--- a/dep/org.argeo.slc.dep.server/pom.xml
+++ b/dep/org.argeo.slc.dep.server/pom.xml
@@ -102,6 +102,18 @@
                        <artifactId>org.argeo.security.dep.ads</artifactId>
                        <type>pom</type>
                </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons.server</groupId>
+                       <artifactId>org.argeo.server.modules</artifactId>
+                       <version>${version.argeo-commons}</version>
+                       <type>pom</type>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons.security</groupId>
+                       <artifactId>org.argeo.security.modules</artifactId>
+                       <version>${version.argeo-commons}</version>
+                       <type>pom</type>
+               </dependency>
                <dependency>
                        <groupId>org.argeo.commons.server</groupId>
                        <artifactId>org.argeo.server.ads</artifactId>

diff --git a/dist/org.argeo.slc.sdk/META-INF/MANIFEST.MF b/dist/org.argeo.slc.sdk/META-INF/MANIFEST.MF
new file mode 100644 (file)
index 0000000..0168fa4
--- /dev/null
+++ b/dist/org.argeo.slc.sdk/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Bundle-Version: 0.12.1.SNAPSHOT
+Bundle-SymbolicName: org.argeo.slc.sdk

diff --git a/dist/org.argeo.slc.sdk/p2.inf b/dist/org.argeo.slc.sdk/p2.inf
new file mode 100644 (file)
index 0000000..0423aa5
--- /dev/null
+++ b/dist/org.argeo.slc.sdk/p2.inf
@@ -0,0 +1,2 @@
+properties.1.name=org.eclipse.equinox.p2.type.category
+properties.1.value=true
\ No newline at end of file

diff --git a/dist/org.argeo.slc.sdk/pom.xml b/dist/org.argeo.slc.sdk/pom.xml
new file mode 100644 (file)
index 0000000..6099b57
--- /dev/null
+++ b/dist/org.argeo.slc.sdk/pom.xml
@@ -0,0 +1,154 @@
+<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>dep</artifactId>
+               <version>0.12.1-SNAPSHOT</version>
+       </parent>
+       <groupId>org.argeo.slc.dist</groupId>
+       <artifactId>org.argeo.slc.sdk</artifactId>
+       <packaging>jar</packaging>
+       <name>SLC SDK</name>
+       <properties>
+               <argeo.p2.cmd>/opt/equinox-p2-agent/eclipse</argeo.p2.cmd>
+               <argeo.p2.repository>/var/argeo/projects/SLC/www/sdk-dev</argeo.p2.repository>
+       </properties>
+       <build>
+               <plugins>
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-dependency-plugin</artifactId>
+                               <executions>
+                                       <execution>
+                                               <id>copy-dependencies</id>
+                                               <phase>process-resources</phase>
+                                               <goals>
+                                                       <goal>copy-dependencies</goal>
+                                               </goals>
+                                               <configuration>
+                                                       <includeTypes>jar</includeTypes>
+                                                       <outputDirectory>${project.build.directory}</outputDirectory>
+                                               </configuration>
+                                       </execution>
+                               </executions>
+                       </plugin>
+                       <plugin>
+                               <artifactId>maven-resources-plugin</artifactId>
+                               <executions>
+                                       <execution>
+                                               <phase>validate</phase>
+                                               <goals>
+                                                       <goal>copy-resources</goal>
+                                               </goals>
+                                               <configuration>
+                                                       <outputDirectory>${basedir}/target/base</outputDirectory>
+                                                       <resources>
+                                                               <resource>
+                                                                       <directory>src/main/base</directory>
+                                                                       <filtering>true</filtering>
+                                                               </resource>
+                                                       </resources>
+                                               </configuration>
+                                       </execution>
+                               </executions>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-assembly-plugin</artifactId>
+                               <configuration>
+                                       <descriptors>
+                                               <descriptor>src/assembly/dist.xml</descriptor>
+                                       </descriptors>
+                               </configuration>
+                               <executions>
+                                       <execution>
+                                               <id>attach-assembly</id>
+                                               <phase>package</phase>
+                                               <goals>
+                                                       <goal>single</goal>
+                                               </goals>
+                                       </execution>
+                               </executions>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.codehaus.mojo</groupId>
+                               <artifactId>exec-maven-plugin</artifactId>
+                               <version>1.1</version>
+                               <executions>
+                                       <execution>
+                                               <id>create-repository</id>
+                                               <phase>deploy</phase>
+                                               <goals>
+                                                       <goal>exec</goal>
+                                               </goals>
+                                       </execution>
+                               </executions>
+                               <configuration>
+                                       <executable>${argeo.p2.cmd}</executable>
+                                       <!-- optional -->
+                                       <workingDirectory>/tmp</workingDirectory>
+                                       <arguments>
+                                               <argument>-noSplash</argument>
+                                               <argument>-application</argument>
+                                               <argument>org.eclipse.equinox.p2.publisher.FeaturesAndBundlesPublisher</argument>
+                                               <argument>-metadataRepository</argument>
+                                               <argument>file:${argeo.p2.repository}</argument>
+                                               <argument>-artifactRepository</argument>
+                                               <argument>file:${argeo.p2.repository}</argument>
+                                               <argument>-bundles</argument>
+                                               <argument>${project.build.directory}</argument>
+                                               <argument>-features</argument>
+                                               <argument>${project.build.directory}</argument>
+                                               <argument>-compress</argument>
+                                               <argument>-publishArtifacts</argument>
+                                       </arguments>
+                               </configuration>
+                       </plugin>
+
+               </plugins>
+       </build>
+       <dependencies>
+               <dependency>
+                       <groupId>org.argeo.slc.dep</groupId>
+                       <artifactId>org.argeo.slc.dep.server</artifactId>
+                       <version>${project.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.slc.server</groupId>
+                       <artifactId>org.argeo.slc.ria</artifactId>
+               </dependency>
+
+               <!-- Modules -->
+               <dependency>
+                       <groupId>org.argeo.slc.modules</groupId>
+                       <artifactId>org.argeo.slc.modules.agent.bundles</artifactId>
+                       <version>${project.version}</version>
+                       <type>pom</type>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.slc.modules</groupId>
+                       <artifactId>org.argeo.slc.modules.server.bundles</artifactId>
+                       <version>${project.version}</version>
+                       <type>pom</type>
+               </dependency>
+
+               <!-- Launcher -->
+               <dependency>
+                       <groupId>org.argeo.slc.runtime</groupId>
+                       <artifactId>org.argeo.slc.launcher</artifactId>
+                       <version>${project.version}</version>
+                       <type>tar.gz</type>
+                       <classifier>base</classifier>
+               </dependency>
+
+       </dependencies>
+       <profiles>
+               <profile>
+                       <id>release</id>
+                       <properties>
+                               <argeo.p2.repository>/var/argeo/projects/SLC/www/sdk</argeo.p2.repository>
+                       </properties>
+               </profile>
+       </profiles>
+</project>
\ No newline at end of file

diff --git a/dist/org.argeo.slc.sdk/src/assembly/dist.xml b/dist/org.argeo.slc.sdk/src/assembly/dist.xml
new file mode 100644 (file)
index 0000000..f2053a4
--- /dev/null
+++ b/dist/org.argeo.slc.sdk/src/assembly/dist.xml
@@ -0,0 +1,32 @@
+<assembly 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/xsd/assembly-1.1.0-SNAPSHOT.xsd">
+       <id>dist</id>
+       <baseDirectory>slc</baseDirectory>
+       <formats>
+               <format>zip</format>
+       </formats>
+       <filesets>
+               <fileSet>
+                       <directory>target/base</directory>
+                       <outputDirectory></outputDirectory>
+               </fileSet>
+       </filesets>
+       <dependencySets>
+               <dependencySet>
+                       <unpack>false</unpack>
+                       <outputFileNameMapping>${artifact.artifactId}-${artifact.baseVersion}.${artifact.extension}
+                       </outputFileNameMapping>
+                       <outputDirectory>lib</outputDirectory>
+                       <includes>
+                               <include>*:jar</include>
+                       </includes>
+               </dependencySet>
+               <dependencySet>
+                       <unpack>true</unpack>
+                       <includes>
+                               <include>org.argeo.slc.runtime:org.argeo.slc.launcher:tar.gz:base
+                               </include>
+                       </includes>
+               </dependencySet>
+       </dependencySets>
+</assembly>
\ No newline at end of file

diff --git a/dist/org.argeo.slc.sdk/src/main/base/work/server/conf/config.ini b/dist/org.argeo.slc.sdk/src/main/base/work/server/conf/config.ini
new file mode 100644 (file)
index 0000000..30d4ab2
--- /dev/null
+++ b/dist/org.argeo.slc.sdk/src/main/base/work/server/conf/config.ini
@@ -0,0 +1,7 @@
+osgi.bundles=org.argeo.osgi.boot-${version.argeo-commons}.jar@start
+argeo.osgi.bundles=${osgi.install.area};in=*.jar
+argeo.osgi.start=org.springframework.osgi.extender,\
+       org.argeo.server.ads.server,\
+       org.argeo.slc.server.hsqldb,\
+       org.argeo.slc.server.main,\
+       org.argeo.slc.ria

diff --git a/dist/pom.xml b/dist/pom.xml
index 1bc8906ccc7039f5da146969496296b02f946ef9..d8a782e995b74fd8d5f7c8b9e0239d26a45f31c7 100644 (file)
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -11,6 +11,5 @@
        <packaging>pom</packaging>
        <name>SLC Distribution</name>
        <modules>
-               <module>slc-sdk</module>
        </modules>
 </project>
\ No newline at end of file

diff --git a/dist/slc-sdk/pom.xml b/dist/slc-sdk/pom.xml
deleted file mode 100644 (file)
index 1450352..0000000
--- a/dist/slc-sdk/pom.xml
+++ /dev/null
@@ -1,84 +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>dist</artifactId>
-               <version>0.12.1-SNAPSHOT</version>
-               <relativePath>..</relativePath>
-       </parent>
-       <groupId>org.argeo.slc.dist</groupId>
-       <artifactId>slc-sdk</artifactId>
-       <packaging>pom</packaging>
-       <name>SLC SDK</name>
-       <properties>
-               <argeo.p2.cmd>/home/mbaudier/dev/tools/eclipse-rcp-galileo-SR1/eclipse</argeo.p2.cmd>
-               <argeo.p2.repository>/var/www/html/dev/slc/repository</argeo.p2.repository>
-       </properties>
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-dependency-plugin</artifactId>
-                               <executions>
-                                       <execution>
-                                               <id>copy-dependencies</id>
-                                               <phase>process-resources</phase>
-                                               <goals>
-                                                       <goal>copy-dependencies</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <includeTypes>jar</includeTypes>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.codehaus.mojo</groupId>
-                               <artifactId>exec-maven-plugin</artifactId>
-                               <version>1.1</version>
-                               <executions>
-                                       <execution>
-                                               <id>create-repository</id>
-                                               <phase>package</phase>
-                                               <goals>
-                                                       <goal>exec</goal>
-                                               </goals>
-                                       </execution>
-                               </executions>
-                               <configuration>
-                                       <executable>${argeo.p2.cmd}</executable>
-                                       <!-- optional -->
-                                       <workingDirectory>/tmp</workingDirectory>
-                                       <arguments>
-                                               <argument>-noSplash</argument>
-                                               <argument>-application</argument>
-                                               <argument>org.eclipse.equinox.p2.publisher.FeaturesAndBundlesPublisher</argument>
-                                               <argument>-metadataRepository</argument>
-                                               <argument>file:${argeo.p2.repository}</argument>
-                                               <argument>-artifactRepository</argument>
-                                               <argument>file:${argeo.p2.repository}</argument>
-                                               <argument>-bundles</argument>
-                                               <argument>${project.build.directory}/dependency</argument>
-                                               <argument>-features</argument>
-                                               <argument>${project.build.directory}/dependency</argument>
-                                               <argument>-compress</argument>
-                                               <argument>-publishArtifacts</argument>
-                                       </arguments>
-                               </configuration>
-                       </plugin>
-
-               </plugins>
-       </build>
-       <dependencies>
-               <dependency>
-                       <groupId>org.argeo.slc.dep</groupId>
-                       <artifactId>org.argeo.slc.dep.server</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.slc.server</groupId>
-                       <artifactId>org.argeo.slc.ria</artifactId>
-               </dependency>
-       </dependencies>
-</project>
\ No newline at end of file

diff --git a/pom.xml b/pom.xml
index cc92d1fe08bb6a3a24fe088075d0375452d6c9c5..a63ef2761ed0c0507a2f69a629c4e0187dbf7892 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -11,6 +11,18 @@
        <packaging>pom</packaging>
        <name>Argeo SLC</name>
        <version>0.12.1-SNAPSHOT</version>
+       <properties>
+               <developmentCycle>0.12</developmentCycle>
+               <version.argeo-distribution>1.0.2</version.argeo-distribution>
+               <version.argeo-ria>0.12.2</version.argeo-ria>
+               <version.argeo-commons>0.1.2</version.argeo-commons>
+               <version.equinox>3.5.1.R35x_v20090827</version.equinox>
+               <version.maven-bundle-plugin>2.0.1</version.maven-bundle-plugin>
+               <version.maven-argeo-osgi>0.1.25</version.maven-argeo-osgi>
+               <version.maven-argeo-qooxdoo>0.8.3.0</version.maven-argeo-qooxdoo>
+               <site.repoBase>file:///var/argeo/projects/SLC/www/site</site.repoBase>
+               <site.urlBase>http://www.argeo.org/projects/slc/site</site.urlBase>
+       </properties>
        <modules>
                <module>runtime</module>
                <module>dep</module>
@@ -20,17 +32,6 @@
                <module>integration-tests</module>
                <module>archetypes</module>
        </modules>
-       <properties>
-               <developmentCycle>0.12</developmentCycle>
-               <version.argeo-ria>0.12.2-SNAPSHOT</version.argeo-ria>
-               <version.argeo-commons>0.1.2-SNAPSHOT</version.argeo-commons>
-               <version.equinox>3.5.1.R35x_v20090827</version.equinox>
-               <version.maven-bundle-plugin>2.0.0</version.maven-bundle-plugin>
-               <version.maven-argeo-osgi>0.1.24</version.maven-argeo-osgi>
-               <version.maven-argeo-qooxdoo>0.8.2.1</version.maven-argeo-qooxdoo>
-               <site.repoBase>file:///var/argeo/projects/SLC/www/site</site.repoBase>
-               <site.urlBase>http://www.argeo.org/projects/slc/site</site.urlBase>
-       </properties>
        <url>${site.urlBase}/${developmentCycle}</url>
        <scm>
                <connection>scm:svn:https://www.argeo.org/svn/slc/trunk</connection>
@@ -151,7 +152,6 @@ limitations under the License.
                        <plugin>
                                <groupId>org.codehaus.mojo</groupId>
                                <artifactId>buildnumber-maven-plugin</artifactId>
-                               <version>1.0-beta-3</version>
                                <executions>
                                        <execution>
                                                <phase>validate</phase>
@@ -199,8 +199,8 @@ limitations under the License.
                        <!-- Third Parties -->
                        <dependency>
                                <groupId>org.argeo.dep</groupId>
-                               <artifactId>versions</artifactId>
-                               <version>1.0.1-SNAPSHOT</version>
+                               <artifactId>versions-all</artifactId>
+                               <version>${version.argeo-distribution}</version>
                                <type>pom</type>
                                <scope>import</scope>
                        </dependency>
@@ -422,10 +422,6 @@ limitations under the License.
                                        <aggregate>true</aggregate>
                                </configuration>
                        </plugin>
-                       <!--
-                               <plugin> <groupId>org.codehaus.mojo</groupId>
-                               <artifactId>scmchangelog-maven-plugin</artifactId> </plugin>
-                       -->
                        <plugin>
                                <groupId>org.codehaus.mojo</groupId>
                                <artifactId>taglist-maven-plugin</artifactId>
@@ -438,11 +434,6 @@ limitations under the License.
                                        </tags>
                                </configuration>
                        </plugin>
-                       <!--
-                               <plugin> <groupId>org.codehaus.mojo</groupId>
-                               <artifactId>clirr-maven-plugin</artifactId>
-                               <inherited>false</inherited> </plugin>
-                       -->
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-changelog-plugin</artifactId>