Add sources to SDK update site

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

diff --git a/dep/org.argeo.slc.dep.sdk.sources/p2.inf b/dep/org.argeo.slc.dep.sdk.sources/p2.inf
new file mode 100644 (file)
index 0000000..0423aa5
--- /dev/null
+++ b/dep/org.argeo.slc.dep.sdk.sources/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/dep/org.argeo.slc.dep.sdk.sources/pom.xml b/dep/org.argeo.slc.dep.sdk.sources/pom.xml
new file mode 100644 (file)
index 0000000..35dbd96
--- /dev/null
+++ b/dep/org.argeo.slc.dep.sdk.sources/pom.xml
@@ -0,0 +1,53 @@
+<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.2-SNAPSHOT</version>
+               <relativePath>..</relativePath>
+       </parent>
+       <groupId>org.argeo.slc.dep</groupId>
+       <artifactId>org.argeo.slc.dep.sdk.sources</artifactId>
+       <packaging>jar</packaging>
+       <name>SLC Dependencies SDK Sources</name>
+       <build>
+               <plugins>
+                       <plugin>
+                               <groupId>org.argeo.maven.plugins</groupId>
+                               <artifactId>maven-argeo-osgi-plugin</artifactId>
+                               <version>${version.maven-argeo-osgi}</version>
+                               <executions>
+                                       <execution>
+                                               <id>pde-source</id>
+                                               <phase>initialize</phase>
+                                               <goals>
+                                                       <goal>pde-sources</goal>
+                                               </goals>
+                                               <configuration>
+                                                       <!--
+                                                               <outputDirectory>${project.build.directory}</outputDirectory>
+                                                       -->
+                                               </configuration>
+                                       </execution>
+                                       <execution>
+                                               <goals>
+                                                       <goal>descriptors</goal>
+                                               </goals>
+                                               <phase>generate-resources</phase>
+                                               <configuration>
+                                                       <jarDirectory>${project.build.directory}/libsrc</jarDirectory>
+                                               </configuration>
+                                       </execution>
+                               </executions>
+                       </plugin>
+               </plugins>
+       </build>
+       <dependencies>
+               <dependency>
+                       <groupId>org.argeo.slc.dep</groupId>
+                       <artifactId>org.argeo.slc.dep.sdk</artifactId>
+                       <version>${project.version}</version>
+               </dependency>
+       </dependencies>
+</project>
\ No newline at end of file

diff --git a/dep/pom.xml b/dep/pom.xml
index 3408188470b9d19aca9885353b8cdb1ac492b81b..f8e54197776acfc58aa8fb6b2e4aea87cf750ac9 100644 (file)
--- a/dep/pom.xml
+++ b/dep/pom.xml
@@ -16,6 +16,7 @@
                <module>org.argeo.slc.dep.agent</module>
                <module>org.argeo.slc.dep.detached</module>
                <module>org.argeo.slc.dep.sdk</module>
+               <module>org.argeo.slc.dep.sdk.sources</module>
        </modules>
        <build>
                <resources>
@@ -74,7 +75,7 @@
                                                <phase>generate-resources</phase>
                                        </execution>
                                </executions>
-                       </plugin>
+                       </plugin><!--
                        <plugin>
                                <groupId>org.codehaus.mojo</groupId>
                                <artifactId>build-helper-maven-plugin</artifactId>
@@ -97,6 +98,6 @@
                                        </execution>
                                </executions>
                        </plugin>
-               </plugins>
+               --></plugins>
        </build>
 </project>
\ No newline at end of file

diff --git a/dist/org.argeo.slc.sdk/pom.xml b/dist/org.argeo.slc.sdk/pom.xml
index e3b2e55afea45bf8d2b86e96cec53c5b49c24059..ccac1d406d6b20c5c88197fdfccd2b4e710f3ddb 100644 (file)
--- a/dist/org.argeo.slc.sdk/pom.xml
+++ b/dist/org.argeo.slc.sdk/pom.xml
@@ -109,7 +109,7 @@
                                                </goals>
                                        </execution>
                                </executions>
-                       </plugin>
+                       </plugin><!--
                        <plugin>
                                <groupId>org.codehaus.mojo</groupId>
                                <artifactId>exec-maven-plugin</artifactId>
@@ -125,7 +125,7 @@
                                </executions>
                                <configuration>
                                        <executable>${argeo.p2.cmd}</executable>
-                                       <!-- optional -->
+                                        optional 
                                        <workingDirectory>/tmp</workingDirectory>
                                        <arguments>
                                                <argument>-noSplash</argument>
@@ -144,6 +144,47 @@
                                        </arguments>
                                </configuration>
                        </plugin>
+                       --><plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-antrun-plugin</artifactId>
+                               <executions>
+                                       <execution>
+                                               <id>p2-copyToRepo</id>
+                                               <phase>deploy</phase>
+                                               <goals>
+                                                       <goal>run</goal>
+                                               </goals>
+                                               <configuration>
+                                                       <tasks>
+                                                               <mkdir dir="${project.build.directory}/repobase" />
+                                                               <copy todir="${project.build.directory}/repobase">
+                                                                       <fileset dir="${project.build.directory}">
+                                                                               <include name="lib/*.jar" />
+                                                                               <include name="libsrc/*.jar" />
+                                                                       </fileset>
+                                                               </copy>
+                                                               <exec executable="${argeo.p2.cmd}">
+                                                                       <arg value="-noSplash" />
+                                                                       <arg value="-application" />
+                                                                       <arg
+                                                                               value="org.eclipse.equinox.p2.publisher.FeaturesAndBundlesPublisher" />
+                                                                       <arg value="-metadataRepository" />
+                                                                       <arg value="file:${argeo.p2.repository}" />
+                                                                       <arg value="-artifactRepository" />
+                                                                       <arg value="file:${argeo.p2.repository}" />
+                                                                       <arg value="-bundles" />
+                                                                       <arg value="${project.build.directory}/repobase" />
+                                                                       <arg value="-features" />
+                                                                       <arg value="${project.build.directory}/repobase" />
+                                                                       <arg value="-compress" />
+                                                                       <arg value="-publishArtifacts" />
+                                                               </exec>
+
+                                                       </tasks>
+                                               </configuration>
+                                       </execution>
+                               </executions>
+                       </plugin>
                </plugins>
        </build>
        <dependencies>
@@ -152,6 +193,11 @@
                        <artifactId>org.argeo.slc.dep.sdk</artifactId>
                        <version>${project.version}</version>
                </dependency>
+               <dependency>
+                       <groupId>org.argeo.slc.dep</groupId>
+                       <artifactId>org.argeo.slc.dep.sdk.sources</artifactId>
+                       <version>${project.version}</version>
+               </dependency>
        </dependencies>
        <profiles>
                <profile>

diff --git a/runtime/org.argeo.slc.support.osgi/pom.xml b/runtime/org.argeo.slc.support.osgi/pom.xml
index ceff91f9a1ccb292182a15def8361e8f12ffdb7e..091d296c1a60e34cfb52f0af5c30d43a6fffc515 100644 (file)
--- a/runtime/org.argeo.slc.support.osgi/pom.xml
+++ b/runtime/org.argeo.slc.support.osgi/pom.xml
@@ -49,6 +49,11 @@
                        <artifactId>org.springframework.osgi.extender</artifactId>
                </dependency>
 
+               <dependency>
+                       <groupId>org.springframework.osgi</groupId>
+                       <artifactId>org.springframework.osgi.web</artifactId>
+               </dependency>
+
                <dependency>
                        <groupId>net.sourceforge.cglib</groupId>
                        <artifactId>com.springsource.net.sf.cglib</artifactId>