Adjust generated jar names

diff --git a/distribution/aspectjinstaller-assembly.xml b/distribution/aspectjinstaller-assembly.xml
new file mode 100644 (file)
index 0000000..36e5526
--- /dev/null
+++ b/distribution/aspectjinstaller-assembly.xml
@@ -0,0 +1,49 @@
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
+
+       <id>aspectjinstaller</id>
+       <formats>
+               <format>jar</format>
+       </formats>
+       <includeBaseDirectory>false</includeBaseDirectory>
+
+       <fileSets>
+               <fileSet>
+                       <directory>../build/target/classes</directory>
+                       <outputDirectory>.</outputDirectory>
+                       <excludes>
+                               <exclude>org/**</exclude>
+                       </excludes>
+               </fileSet>
+               <fileSet>
+                       <directory>../aj-build/dist/docs</directory>
+                       <outputDirectory>files</outputDirectory>
+               </fileSet>
+               
+               <fileSet>
+                       <directory>../runtime/target/site/apidocs</directory>
+                       <outputDirectory>files/doc/runtime-apidocs</outputDirectory>
+               </fileSet>
+       </fileSets>
+
+       <files>
+               <file>
+                       <source>target/aspectjrt-${project.version}.jar</source>
+                       <outputDirectory>files/lib</outputDirectory>
+                       <destName>aspectjrt.jar</destName>
+               </file>
+               <file>
+                       <source>target/aspectjweaver-${project.version}.jar</source>
+                       <outputDirectory>files/lib</outputDirectory>
+                       <destName>aspectjweaver.jar</destName>
+               </file>
+               <file>
+                       <source>target/aspectjtools-${project.version}.jar</source>
+                       <outputDirectory>files/lib</outputDirectory>
+                       <destName>aspectjtools.jar</destName>
+               </file>
+       </files>
+
+</assembly>
+

diff --git a/distribution/pom.xml b/distribution/pom.xml
index 400e0c02afc7804591f80b53598e869abb13b60b..e4ac06ce66a422058283bbd63184b6742f4fbf28 100644 (file)
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -63,6 +63,7 @@
                                        </execution>
                                </executions>
                        </plugin>
+
                        <plugin>
                                <artifactId>maven-assembly-plugin</artifactId>
                                <executions>
@@ -73,6 +74,8 @@
                                                        <goal>single</goal>
                                                </goals>
                                                <configuration>
+                                                       <finalName>aspectjrt-${project.version}</finalName>
+                                                       <appendAssemblyId>false</appendAssemblyId>
                                                        <archive>
                                                                <manifestEntries>
                                                                        <Automatic-Module-Name>org.aspectj.runtime</Automatic-Module-Name>
@@ -114,6 +117,8 @@
                                                        <goal>single</goal>
                                                </goals>
                                                <configuration>
+                                                       <finalName>aspectjweaver-${project.version}</finalName>
+                                                       <appendAssemblyId>false</appendAssemblyId>
                                                        <archive>
                                                                <manifestEntries>
                                                                        <Automatic-Module-Name>org.aspectj.weaver</Automatic-Module-Name>
@@ -159,6 +164,8 @@
                                                        <goal>single</goal>
                                                </goals>
                                                <configuration>
+                                                       <finalName>aspectjtools-${project.version}</finalName>
+                                                       <appendAssemblyId>false</appendAssemblyId>
                                                        <archive>
                                                                <manifestEntries>
                                                                        <Automatic-Module-Name>org.aspectj.tools</Automatic-Module-Name>
@@ -192,6 +199,26 @@
                                                        </descriptors>
                                                </configuration>
                                        </execution>
+                                       
+                                       <execution>
+                                               <id>aspectjinstaller-assembly</id>
+                                               <phase>package</phase>
+                                               <goals>
+                                                       <goal>single</goal>
+                                               </goals>
+                                               <configuration>
+                                                       <finalName>aspectj-${project.version}</finalName>
+                                                       <appendAssemblyId>false</appendAssemblyId>
+                                                       <archive>
+                                                               <manifestEntries>
+                                                               <Main-Class>$installer$.org.aspectj.Main</Main-Class>
+                                                               </manifestEntries>
+                                                       </archive>
+                                                       <descriptors>
+                                                               <descriptor>aspectjinstaller-assembly.xml</descriptor>
+                                                       </descriptors>
+                                               </configuration>
+                                       </execution>
                                </executions>
                        </plugin>
                </plugins>