Introduce base identifier

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

diff --git a/org.argeo.slc/pom.xml b/org.argeo.slc/pom.xml
index 7757c5d6475b216eb67aa8bc14bb326d7c2c51de..cc26b5716209b34d9e3753614e5a354b52999889 100644 (file)
--- a/org.argeo.slc/pom.xml
+++ b/org.argeo.slc/pom.xml
@@ -22,9 +22,7 @@
                <connection>\r
                        scm:svn:https://www.argeo.org/svn/slc/trunk/org.argeo.slc\r
                </connection>\r
-               <url>\r
-                       https://www.argeo.org/svn/slc/trunk/org.argeo.slc\r
-               </url>\r
+               <url>https://www.argeo.org/svn/slc/trunk/org.argeo.slc</url>\r
        </scm>\r
        <issueManagement>\r
                <system>Bugzilla</system>\r
@@ -92,20 +90,21 @@
                                        </execution>\r
                                </executions>\r
                        </plugin>\r
-                       <plugin>\r
+                       <!-- \r
+                               <plugin>\r
                                <groupId>org.apache.maven.plugins</groupId>\r
                                <artifactId>maven-site-plugin</artifactId>\r
                                <executions>\r
-                                       <execution>\r
-                                               <id>attach-javadoc</id>\r
-                                               <phase>verify</phase>\r
-                                               <goals>\r
-                                                       <goal>jar</goal>\r
-                                               </goals>\r
-                                       </execution>\r
+                               <execution>\r
+                               <id>attach-javadoc</id>\r
+                               <phase>verify</phase>\r
+                               <goals>\r
+                               <goal>jar</goal>\r
+                               </goals>\r
+                               </execution>\r
                                </executions>\r
-                       </plugin>\r
-\r
+                               </plugin>\r
+                       -->\r
                        <plugin>\r
                                <groupId>org.apache.maven.plugins</groupId>\r
                                <artifactId>maven-assembly-plugin</artifactId>\r
@@ -117,6 +116,23 @@
                                                </descriptor>\r
                                        </descriptors>\r
                                </configuration>\r
+                               <executions>\r
+                                       <execution>\r
+                                               <id>assembly-exampleSlcAppli</id>\r
+                                               <phase>verify</phase>\r
+                                               <inherited>false</inherited>\r
+                                               <goals>\r
+                                                       <goal>single</goal>\r
+                                               </goals>\r
+                                               <configuration>\r
+                                                       <descriptors>\r
+                                                               <descriptor>\r
+                                                                       src/assembly/base.xml\r
+                                                               </descriptor>\r
+                                                       </descriptors>\r
+                                               </configuration>\r
+                                       </execution>\r
+                               </executions>\r
                        </plugin>\r
                </plugins>\r
        </build>\r

diff --git a/org.argeo.slc/src/assembly/base.xml b/org.argeo.slc/src/assembly/base.xml
new file mode 100644 (file)
index 0000000..69c072f
--- /dev/null
+++ b/org.argeo.slc/src/assembly/base.xml
@@ -0,0 +1,15 @@
+<assembly xmlns="http://maven.apache.org/POM/4.0.0"\r
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd">\r
+       <id>base</id>\r
+       <includeBaseDirectory>false</includeBaseDirectory>\r
+       <formats>\r
+               <format>zip</format>\r
+       </formats>\r
+       <fileSets>\r
+               <fileSet>\r
+                       <directory>src/base</directory>\r
+                       <outputDirectory></outputDirectory>\r
+               </fileSet>\r
+       </fileSets>\r
+</assembly>
\ No newline at end of file

diff --git a/org.argeo.slc/src/assembly/with-dependencies.xml b/org.argeo.slc/src/assembly/with-dependencies.xml
index dab6d3fda94d176efabe4314d516322e033156d2..9886136555843497a5b85da7444bb1dfd6964ac8 100644 (file)
--- a/org.argeo.slc/src/assembly/with-dependencies.xml
+++ b/org.argeo.slc/src/assembly/with-dependencies.xml
@@ -40,9 +40,9 @@
                        </includes>\r
                        <binaries>\r
                                <unpack>true</unpack>\r
-                               <outputFileNameMapping>example</outputFileNameMapping>\r
+                               <outputFileNameMapping>${artifactId}</outputFileNameMapping>\r
                                <attachmentClassifier>slc</attachmentClassifier>\r
-                               <outputDirectory></outputDirectory>\r
+                               <outputDirectory>example</outputDirectory>\r
                                <includeDependencies>false</includeDependencies>\r
                        </binaries>\r
                </moduleSet>\r