wip - packaging up the artifacts we distribute

diff --git a/distribution/aspectjrt-assembly.xml b/distribution/aspectjrt-assembly.xml
new file mode 100644 (file)
index 0000000..76c56ae
--- /dev/null
+++ b/distribution/aspectjrt-assembly.xml
@@ -0,0 +1,57 @@
+<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>aspectjrt</id>
+
+  <formats><format>jar</format></formats>
+
+  <includeBaseDirectory>false</includeBaseDirectory>
+
+  <fileSets>
+   <fileSet>
+<!--
+    <directory>${basedir}/../runtime/target/classes</directory>
+-->
+    <directory>../runtime/target/classes</directory>
+<outputDirectory>.</outputDirectory>
+<!--
+<excludes>
+<exclude>MANIFEST.MF</exclude>
+</excludes>
+    <includes>
+     <include>*</include>
+    </includes>
+-->
+   </fileSet>
+  </fileSets>
+
+<!--
+<files>
+<file>
+<source>runtime.manifest.mf</source>
+<outputDirectory>META-INF</outputDirectory>
+<destName>MANIFEST.MF</destName>
+<filtered>true</filtered>
+</file>
+</files>
+-->
+
+
+<!--
+  <moduleSets>
+   <moduleSet>
+    <useAllReactorProjects>true</useAllReactorProjects>
+    <includes>
+      <include>org.aspectj:runtime:jar:</include>
+    </includes>
+    <binaries>
+      <outputDirectory>modules/maven-assembly-plugin</outputDirectory>
+      <unpack>true</unpack>
+    </binaries>
+   </moduleSet>
+  </moduleSets>
+-->
+
+
+</assembly>
+

diff --git a/distribution/aspectjtools-assembly.xml b/distribution/aspectjtools-assembly.xml
new file mode 100644 (file)
index 0000000..a3f7f73
--- /dev/null
+++ b/distribution/aspectjtools-assembly.xml
@@ -0,0 +1,91 @@
+<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>aspectjtools</id>
+       <formats>
+               <format>jar</format>
+       </formats>
+       <includeBaseDirectory>false</includeBaseDirectory>
+
+       <fileSets>
+               <!-- runtime -->
+               <fileSet>
+                       <directory>../runtime/target/classes</directory>
+                       <outputDirectory>.</outputDirectory>
+               </fileSet>
+
+               <!-- weaver -->
+               <fileSet>
+                       <directory>../weaver/target/classes</directory>
+                       <outputDirectory>.</outputDirectory>
+               </fileSet>
+               <fileSet>
+                       <directory>../util/target/classes</directory>
+                       <outputDirectory>.</outputDirectory>
+               </fileSet>
+               <fileSet>
+                       <directory>../bridge/target/classes</directory>
+                       <outputDirectory>.</outputDirectory>
+               </fileSet>
+               <fileSet>
+                       <directory>../asm/target/classes</directory>
+                       <outputDirectory>.</outputDirectory>
+               </fileSet>
+               <fileSet>
+                       <directory>../org.aspectj.matcher/target/classes</directory>
+                       <outputDirectory>.</outputDirectory>
+               </fileSet>
+               <fileSet>
+                       <directory>../bcel-builder/target/classes</directory>
+                       <outputDirectory>.</outputDirectory>
+               </fileSet>
+               <fileSet>
+                       <directory>../loadtime/target/classes</directory>
+                       <outputDirectory>.</outputDirectory>
+               </fileSet>
+               <fileSet>
+                       <directory>target/asm-unzipped</directory>
+                       <outputDirectory>.</outputDirectory>
+                       <excludes>
+                               <exclude>org/**</exclude>
+                               <exclude>META-INF/MANIFEST.MF</exclude>
+                       </excludes>
+               </fileSet>
+               
+               <!-- tools -->
+               <fileSet>
+                       <directory>../ajbrowser/target/classes</directory>
+                       <outputDirectory>.</outputDirectory>
+               </fileSet>
+               <fileSet>
+                       <directory>../ajde/target/classes</directory>
+                       <outputDirectory>.</outputDirectory>
+               </fileSet>
+               <fileSet>
+                       <directory>../ajde.core/target/classes</directory>
+                       <outputDirectory>.</outputDirectory>
+               </fileSet>
+               <fileSet>
+                       <directory>../ajdoc/target/classes</directory>
+                       <outputDirectory>.</outputDirectory>
+               </fileSet>
+               <fileSet>
+                       <directory>../org.aspectj.ajdt.core/target/classes</directory>
+                       <outputDirectory>.</outputDirectory>
+               </fileSet>
+               <fileSet>
+                       <directory>../taskdefs/target/classes</directory>
+                       <outputDirectory>.</outputDirectory>
+               </fileSet>
+               <fileSet>
+                       <directory>target/jdtcore-unzipped</directory>
+                       <outputDirectory>.</outputDirectory>
+                       <excludes>
+                               <exclude>META-INF/MANIFEST.MF</exclude>
+                       </excludes>
+               </fileSet>
+       </fileSets>
+
+</assembly>
+

diff --git a/distribution/aspectjweaver-assembly.xml b/distribution/aspectjweaver-assembly.xml
new file mode 100644 (file)
index 0000000..8c54cf5
--- /dev/null
+++ b/distribution/aspectjweaver-assembly.xml
@@ -0,0 +1,52 @@
+<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>aspectjweaver</id>
+  <formats><format>jar</format></formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+
+  <fileSets>
+   <fileSet>
+    <directory>../weaver/target/classes</directory>
+    <outputDirectory>.</outputDirectory>
+   </fileSet>
+   <fileSet>
+    <directory>../runtime/target/classes</directory>
+    <outputDirectory>.</outputDirectory>
+   </fileSet>
+   <fileSet>
+    <directory>../util/target/classes</directory>
+    <outputDirectory>.</outputDirectory>
+   </fileSet>
+   <fileSet>
+    <directory>../bridge/target/classes</directory>
+    <outputDirectory>.</outputDirectory>
+   </fileSet>
+   <fileSet>
+    <directory>../asm/target/classes</directory>
+    <outputDirectory>.</outputDirectory>
+   </fileSet>
+   <fileSet>
+    <directory>../org.aspectj.matcher/target/classes</directory>
+    <outputDirectory>.</outputDirectory>
+   </fileSet>
+   <fileSet>
+    <directory>../bcel-builder/target/classes</directory>
+    <outputDirectory>.</outputDirectory>
+   </fileSet>
+   <fileSet>
+    <directory>../loadtime/target/classes</directory>
+    <outputDirectory>.</outputDirectory>
+   </fileSet>
+   <fileSet>
+    <directory>target/asm-unzipped</directory>
+    <outputDirectory>.</outputDirectory>
+    <excludes>
+ <exclude>org/**</exclude>
+<exclude>META-INF/MANIFEST.MF</exclude>
+    </excludes>
+   </fileSet>
+  </fileSets>
+
+</assembly>
+

diff --git a/distribution/pom.xml b/distribution/pom.xml
new file mode 100644 (file)
index 0000000..400e0c0
--- /dev/null
+++ b/distribution/pom.xml
@@ -0,0 +1,199 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+       <modelVersion>4.0.0</modelVersion>
+
+       <parent>
+               <groupId>org.aspectj</groupId>
+               <artifactId>aspectj-parent</artifactId>
+               <version>1.9.3.BUILD-SNAPSHOT</version>
+       </parent>
+
+       <artifactId>distribution</artifactId>
+       <packaging>pom</packaging>
+       <name>Distribution</name>
+
+       <dependencies>
+               <dependency>
+                       <groupId>org.aspectj</groupId>
+                       <artifactId>run-all-junit-tests</artifactId>
+                       <version>${project.version}</version>
+               </dependency>
+       </dependencies>
+
+       <build>
+               <plugins>
+
+
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-antrun-plugin</artifactId>
+                               <version>1.6</version>
+                               <executions>
+                                       <execution>
+                                               <id>unzipasm</id>
+                                               <phase>validate</phase>
+                                               <configuration>
+                                                       <tasks>
+                                                               <echo message="unzip jarjar'd asm" />
+                                                               <unzip
+                                                                       src="${project.basedir}/../lib/asm/asm-7.0-beta.renamed.jar"
+                                                                       dest="target/asm-unzipped" />
+                                                       </tasks>
+                                               </configuration>
+                                               <goals>
+                                                       <goal>run</goal>
+                                               </goals>
+                                       </execution>
+                                       <execution>
+                                               <id>unzipjdt</id>
+                                               <phase>validate</phase>
+                                               <configuration>
+                                                       <tasks>
+                                                               <echo message="unzip patched jdtcore" />
+                                                               <unzip
+                                                                       src="${project.basedir}/../org.eclipse.jdt.core/jdtcore-for-aspectj.jar"
+                                                                       dest="target/jdtcore-unzipped" />
+                                                       </tasks>
+                                               </configuration>
+                                               <goals>
+                                                       <goal>run</goal>
+                                               </goals>
+                                       </execution>
+                               </executions>
+                       </plugin>
+                       <plugin>
+                               <artifactId>maven-assembly-plugin</artifactId>
+                               <executions>
+                                       <execution>
+                                               <id>aspectjrt-assembly</id>
+                                               <phase>package</phase>
+                                               <goals>
+                                                       <goal>single</goal>
+                                               </goals>
+                                               <configuration>
+                                                       <archive>
+                                                               <manifestEntries>
+                                                                       <Automatic-Module-Name>org.aspectj.runtime</Automatic-Module-Name>
+                                                               </manifestEntries>
+
+                                                               <manifestSections>
+                                                                       <manifestSection>
+                                                                               <name>org/aspectj/lang/</name>
+                                                                               <manifestEntries>
+
+                                                                                       <Specification-Title>AspectJ Runtime Classes</Specification-Title>
+                                                                                       <Specification-Version>${project.version}</Specification-Version>
+                                                                                       <Specification-Vendor>https://www.eclipse.org/aspectj/</Specification-Vendor>
+
+                                                                                       <Implementation-Title>org.aspectj.runtime</Implementation-Title>
+                                                                                       <Implementation-Version>${project.version}</Implementation-Version>
+                                                                                       <Implementation-Vendor>https://www.eclipse.org/aspectj/</Implementation-Vendor>
+
+                                                                                       <Bundle-Name>AspectJ Runtime</Bundle-Name>
+                                                                                       <Bundle-Version>${project.version}</Bundle-Version>
+                                                                                       <Bundle-Copyright>(C) Copyright 1999-2001 Xerox Corporation,
+                                                                                               2002 Palo Alto Research Center, Incorporated (PARC),
+                                                                                               2003-2019 Contributors. All Rights Reserved</Bundle-Copyright>
+                                                                               </manifestEntries>
+                                                                       </manifestSection>
+                                                               </manifestSections>
+                                                       </archive>
+
+                                                       <descriptors>
+                                                               <descriptor>aspectjrt-assembly.xml</descriptor>
+                                                       </descriptors>
+                                               </configuration>
+                                       </execution>
+
+                                       <execution>
+                                               <id>aspectjweaver-assembly</id>
+                                               <phase>package</phase>
+                                               <goals>
+                                                       <goal>single</goal>
+                                               </goals>
+                                               <configuration>
+                                                       <archive>
+                                                               <manifestEntries>
+                                                                       <Automatic-Module-Name>org.aspectj.weaver</Automatic-Module-Name>
+                                                                       <PremainClass>org.aspectj.weaver.loadtime.Agent</PremainClass>
+                                                                       <AgentClass>org.aspectj.weaver.loadtime.Agent</AgentClass>
+                                                                       <CanRedefineClasses>true</CanRedefineClasses>
+                                                               </manifestEntries>
+
+
+                                                               <manifestSections>
+                                                                       <manifestSection>
+                                                                               <name>org/aspectj/weaver/</name>
+                                                                               <manifestEntries>
+
+                                                                                       <Specification-Title>AspectJ Weaver Classes</Specification-Title>
+                                                                                       <Specification-Version>${project.version}</Specification-Version>
+                                                                                       <Specification-Vendor>https://www.eclipse.org/aspectj/</Specification-Vendor>
+
+                                                                                       <Implementation-Title>org.aspectj.weaver</Implementation-Title>
+                                                                                       <Implementation-Version>${project.version}</Implementation-Version>
+                                                                                       <Implementation-Vendor>https://www.eclipse.org/aspectj/</Implementation-Vendor>
+
+                                                                                       <Bundle-Name>AspectJ Weaver</Bundle-Name>
+                                                                                       <Bundle-Version>${project.version}</Bundle-Version>
+                                                                                       <Bundle-Copyright>(C) Copyright 1999-2001 Xerox Corporation,
+                                                                                               2002 Palo Alto Research Center, Incorporated (PARC),
+                                                                                               2003-2019 Contributors. All Rights Reserved</Bundle-Copyright>
+                                                                               </manifestEntries>
+                                                                       </manifestSection>
+                                                               </manifestSections>
+                                                       </archive>
+
+                                                       <descriptors>
+                                                               <descriptor>aspectjweaver-assembly.xml</descriptor>
+                                                       </descriptors>
+                                               </configuration>
+                                       </execution>
+
+                                       <execution>
+                                               <id>aspectjtools-assembly</id>
+                                               <phase>package</phase>
+                                               <goals>
+                                                       <goal>single</goal>
+                                               </goals>
+                                               <configuration>
+                                                       <archive>
+                                                               <manifestEntries>
+                                                                       <Automatic-Module-Name>org.aspectj.tools</Automatic-Module-Name>
+                                                               </manifestEntries>
+
+                                                               <manifestSections>
+                                                                       <manifestSection>
+                                                                               <name>org/aspectj/tools/</name>
+                                                                               <manifestEntries>
+
+                                                                                       <Specification-Title>AspectJ Tools Classes</Specification-Title>
+                                                                                       <Specification-Version>${project.version}</Specification-Version>
+                                                                                       <Specification-Vendor>https://www.eclipse.org/aspectj/</Specification-Vendor>
+
+                                                                                       <Implementation-Title>org.aspectj.tools</Implementation-Title>
+                                                                                       <Implementation-Version>${project.version}</Implementation-Version>
+                                                                                       <Implementation-Vendor>https://www.eclipse.org/aspectj/</Implementation-Vendor>
+
+                                                                                       <Bundle-Name>AspectJ Tools</Bundle-Name>
+                                                                                       <Bundle-Version>${project.version}</Bundle-Version>
+                                                                                       <Bundle-Copyright>(C) Copyright 1999-2001 Xerox Corporation,
+                                                                                               2002 Palo Alto Research Center, Incorporated (PARC),
+                                                                                               2003-2019 Contributors. All Rights Reserved</Bundle-Copyright>
+                                                                               </manifestEntries>
+                                                                       </manifestSection>
+                                                               </manifestSections>
+                                                       </archive>
+
+                                                       <descriptors>
+                                                               <descriptor>aspectjtools-assembly.xml</descriptor>
+                                                       </descriptors>
+                                               </configuration>
+                                       </execution>
+                               </executions>
+                       </plugin>
+               </plugins>
+       </build>
+</project>