Author: veithen
Date: Fri Jul 18 22:22:11 2014
New Revision: 1611826
URL: http://svn.apache.org/r1611826
Log:
Rename axiom-common-impl to om-aspects.
Added:
webservices/axiom/trunk/aspects/om-aspects/
- copied from r1611822, webservices/axiom/trunk/modules/axiom-common-impl/
Removed:
webservices/axiom/trunk/modules/axiom-common-impl/
Modified:
webservices/axiom/trunk/aspects/om-aspects/pom.xml
webservices/axiom/trunk/aspects/pom.xml
webservices/axiom/trunk/code-coverage/pom.xml
webservices/axiom/trunk/implementations/pom.xml
webservices/axiom/trunk/modules/axiom-dom/pom.xml
webservices/axiom/trunk/modules/axiom-impl/pom.xml
webservices/axiom/trunk/pom.xml
Modified: webservices/axiom/trunk/aspects/om-aspects/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/pom.xml?rev=1611826&r1=1611822&r2=1611826&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/pom.xml (original)
+++ webservices/axiom/trunk/aspects/om-aspects/pom.xml Fri Jul 18 22:22:11 2014
@@ -21,25 +21,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom</artifactId>
+ <artifactId>aspects</artifactId>
<version>1.2.15-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>axiom-common-impl</artifactId>
- <name>Axiom Common Implementation Classes</name>
- <!-- Although axiom-common-impl will never be used as a bundle itself, we
still need the OSGi metadata
+ <artifactId>om-aspects</artifactId>
+ <name>OM Aspects</name>
+ <!-- Although om-aspects will never be used as a bundle itself, we still
need the OSGi metadata
so that we can generate a correct manifest when the classes are
included in axiom-impl and
axiom-dom by maven-shade-plugin. -->
<packaging>bundle</packaging>
- <description>Contains implementation classes shared by LLOM and
DOOM.</description>
- <!-- This needs to be set explicitly because the project structure implies
that the Maven calculated defaults are wrong -->
- <scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/webservices/commons/trunk/modules/axiom/modules/axiom-common-impl</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/webservices/commons/trunk/modules/axiom/modules/axiom-common-impl</developerConnection>
-
<url>http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-common-impl</url>
- </scm>
- <!-- This also needs to be set explicitly because the Maven calculated URL
would point to nowhere -->
- <url>http://ws.apache.org/axiom/</url>
+ <description>Contains aspects and implementation classes shared by LLOM
and DOOM.</description>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -61,57 +52,4 @@
<scope>test</scope>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <executions>
- <execution>
- <id>default-compile</id>
- <phase>none</phase>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>aspectj-maven-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>compile</goal>
- </goals>
- <configuration>
- <complianceLevel>1.5</complianceLevel>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <!-- Note: axiom-common-impl is not intended to be used as an
OSGi bundle.
- We generate OSGi metadata only for the shading process in
axiom-impl and axiom-dom. -->
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <excludeDependencies>true</excludeDependencies>
- <instructions>
- <Export-Package>*;-noimport:=true</Export-Package>
- <Import-Package>
- <!-- aspectjrt is not an OSGi bundle; we don't
need to generate imports because
- axiom-impl and axiom-dom include these
classes into the final JARs -->
- !org.aspectj.*,
- *
- </Import-Package>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- <skipDeploy>true</skipDeploy>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
Modified: webservices/axiom/trunk/aspects/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/pom.xml?rev=1611826&r1=1611825&r2=1611826&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/pom.xml (original)
+++ webservices/axiom/trunk/aspects/pom.xml Fri Jul 18 22:22:11 2014
@@ -30,6 +30,7 @@
<modules>
<module>core-aspects</module>
<module>dom-aspects</module>
+ <module>om-aspects</module>
</modules>
<build>
<plugins>
@@ -88,4 +89,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: webservices/axiom/trunk/code-coverage/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/code-coverage/pom.xml?rev=1611826&r1=1611825&r2=1611826&view=diff
==============================================================================
--- webservices/axiom/trunk/code-coverage/pom.xml (original)
+++ webservices/axiom/trunk/code-coverage/pom.xml Fri Jul 18 22:22:11 2014
@@ -59,18 +59,18 @@
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>axiom-common-impl</artifactId>
+ <artifactId>om-aspects</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>axiom-common-impl</artifactId>
+ <artifactId>om-aspects</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>axiom-common-impl</artifactId>
+ <artifactId>om-aspects</artifactId>
<version>${project.version}</version>
<classifier>jacoco</classifier>
<type>exec</type>
Modified: webservices/axiom/trunk/implementations/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/pom.xml?rev=1611826&r1=1611825&r2=1611826&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/pom.xml (original)
+++ webservices/axiom/trunk/implementations/pom.xml Fri Jul 18 22:22:11 2014
@@ -73,7 +73,6 @@
<artifactSet>
<includes>
<include>${project.groupId}:*-aspects</include>
-
<include>${project.groupId}:axiom-common-impl</include>
<include>org.aspectj:aspectjrt</include>
</includes>
</artifactSet>
Modified: webservices/axiom/trunk/modules/axiom-dom/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-dom/pom.xml?rev=1611826&r1=1611825&r2=1611826&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-dom/pom.xml (original)
+++ webservices/axiom/trunk/modules/axiom-dom/pom.xml Fri Jul 18 22:22:11 2014
@@ -45,7 +45,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>axiom-common-impl</artifactId>
+ <artifactId>om-aspects</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -135,7 +135,7 @@
</aspectLibrary>
<aspectLibrary>
<groupId>${project.groupId}</groupId>
- <artifactId>axiom-common-impl</artifactId>
+ <artifactId>om-aspects</artifactId>
</aspectLibrary>
<aspectLibrary>
<groupId>${project.groupId}</groupId>
@@ -171,7 +171,6 @@
<artifactSet>
<includes>
<include>${project.groupId}:*-aspects</include>
-
<include>${project.groupId}:axiom-common-impl</include>
<include>org.aspectj:aspectjrt</include>
</includes>
</artifactSet>
Modified: webservices/axiom/trunk/modules/axiom-impl/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-impl/pom.xml?rev=1611826&r1=1611825&r2=1611826&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-impl/pom.xml (original)
+++ webservices/axiom/trunk/modules/axiom-impl/pom.xml Fri Jul 18 22:22:11 2014
@@ -45,7 +45,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>axiom-common-impl</artifactId>
+ <artifactId>om-aspects</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -124,7 +124,7 @@
</aspectLibrary>
<aspectLibrary>
<groupId>${project.groupId}</groupId>
- <artifactId>axiom-common-impl</artifactId>
+ <artifactId>om-aspects</artifactId>
</aspectLibrary>
</aspectLibraries>
</configuration>
@@ -155,7 +155,6 @@
<artifactSet>
<includes>
<include>${project.groupId}:*-aspects</include>
-
<include>${project.groupId}:axiom-common-impl</include>
<include>org.aspectj:aspectjrt</include>
</includes>
</artifactSet>
Modified: webservices/axiom/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/pom.xml?rev=1611826&r1=1611825&r2=1611826&view=diff
==============================================================================
--- webservices/axiom/trunk/pom.xml (original)
+++ webservices/axiom/trunk/pom.xml Fri Jul 18 22:22:11 2014
@@ -900,7 +900,6 @@
<module>buildutils</module>
<module>modules/axiom-buildutils</module>
<module>modules/axiom-api</module>
- <module>modules/axiom-common-impl</module>
<module>modules/axiom-impl</module>
<module>modules/axiom-dom</module>
<module>modules/axiom-compat</module>
