Author: veithen
Date: Fri Jul 18 23:11:18 2014
New Revision: 1611836
URL: http://svn.apache.org/r1611836
Log:
Move axiom-impl and axiom-dom to implementations.
Added:
webservices/axiom/trunk/implementations/axiom-dom/
- copied from r1611827, webservices/axiom/trunk/modules/axiom-dom/
webservices/axiom/trunk/implementations/axiom-impl/
- copied from r1611827, webservices/axiom/trunk/modules/axiom-impl/
Removed:
webservices/axiom/trunk/modules/axiom-dom/
webservices/axiom/trunk/modules/axiom-impl/
Modified:
webservices/axiom/trunk/implementations/axiom-dom/pom.xml
webservices/axiom/trunk/implementations/axiom-impl/pom.xml
webservices/axiom/trunk/implementations/pom.xml
webservices/axiom/trunk/pom.xml
Modified: webservices/axiom/trunk/implementations/axiom-dom/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-dom/pom.xml?rev=1611836&r1=1611827&r2=1611836&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/axiom-dom/pom.xml (original)
+++ webservices/axiom/trunk/implementations/axiom-dom/pom.xml Fri Jul 18
23:11:18 2014
@@ -21,22 +21,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom</artifactId>
+ <artifactId>implementations</artifactId>
<version>1.2.15-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>axiom-dom</artifactId>
<name>Axiom DOM</name>
<packaging>bundle</packaging>
<description>The Axiom DOM implementation.</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-dom</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/webservices/commons/trunk/modules/axiom/modules/axiom-dom</developerConnection>
-
<url>http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom</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>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -110,53 +101,23 @@
<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>
- <aspectLibraries>
- <aspectLibrary>
- <groupId>${project.groupId}</groupId>
- <artifactId>core-aspects</artifactId>
- </aspectLibrary>
- <aspectLibrary>
- <groupId>${project.groupId}</groupId>
- <artifactId>om-aspects</artifactId>
- </aspectLibrary>
- <aspectLibrary>
- <groupId>${project.groupId}</groupId>
- <artifactId>dom-aspects</artifactId>
- </aspectLibrary>
- </aspectLibraries>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
<configuration>
- <excludeDependencies>true</excludeDependencies>
- <instructions>
- <Private-Package>org.apache.axiom.*</Private-Package>
- <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
- <Import-Package>!org.aspectj.*,*</Import-Package>
- </instructions>
+ <aspectLibraries>
+ <aspectLibrary>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>core-aspects</artifactId>
+ </aspectLibrary>
+ <aspectLibrary>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>om-aspects</artifactId>
+ </aspectLibrary>
+ <aspectLibrary>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>dom-aspects</artifactId>
+ </aspectLibrary>
+ </aspectLibraries>
</configuration>
</plugin>
<plugin>
@@ -167,34 +128,8 @@
<goals>
<goal>shade</goal>
</goals>
- <configuration>
- <artifactSet>
- <includes>
-
<include>${project.groupId}:*-aspects</include>
- <include>org.aspectj:aspectjrt</include>
- </includes>
- </artifactSet>
- <transformers>
- <transformer
implementation="org.apache.axiom.buildutils.shade.osgi.OSGiManifestResourceTransformer"
/>
- </transformers>
- <createSourcesJar>true</createSourcesJar>
- </configuration>
</execution>
</executions>
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>shade-osgi</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- <skipDeploy>true</skipDeploy>
- </configuration>
</plugin>
</plugins>
</build>
Modified: webservices/axiom/trunk/implementations/axiom-impl/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-impl/pom.xml?rev=1611836&r1=1611827&r2=1611836&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/axiom-impl/pom.xml (original)
+++ webservices/axiom/trunk/implementations/axiom-impl/pom.xml Fri Jul 18
23:11:18 2014
@@ -21,22 +21,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom</artifactId>
+ <artifactId>implementations</artifactId>
<version>1.2.15-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>axiom-impl</artifactId>
<name>Axiom Impl</name>
<packaging>bundle</packaging>
<description>The Axiom default implementation.</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-impl</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/webservices/commons/trunk/modules/axiom/modules/axiom-impl</developerConnection>
-
<url>http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-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>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -99,48 +90,19 @@
<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>
- <aspectLibraries>
- <aspectLibrary>
- <groupId>${project.groupId}</groupId>
- <artifactId>core-aspects</artifactId>
- </aspectLibrary>
- <aspectLibrary>
- <groupId>${project.groupId}</groupId>
- <artifactId>om-aspects</artifactId>
- </aspectLibrary>
- </aspectLibraries>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
<configuration>
- <excludeDependencies>true</excludeDependencies>
- <instructions>
- <Private-Package>org.apache.axiom.*</Private-Package>
- <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
- </instructions>
+ <aspectLibraries>
+ <aspectLibrary>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>core-aspects</artifactId>
+ </aspectLibrary>
+ <aspectLibrary>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>om-aspects</artifactId>
+ </aspectLibrary>
+ </aspectLibraries>
</configuration>
</plugin>
<plugin>
@@ -151,34 +113,8 @@
<goals>
<goal>shade</goal>
</goals>
- <configuration>
- <artifactSet>
- <includes>
-
<include>${project.groupId}:*-aspects</include>
- <include>org.aspectj:aspectjrt</include>
- </includes>
- </artifactSet>
- <transformers>
- <transformer
implementation="org.apache.axiom.buildutils.shade.osgi.OSGiManifestResourceTransformer"
/>
- </transformers>
- <createSourcesJar>true</createSourcesJar>
- </configuration>
</execution>
</executions>
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>shade-osgi</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- <skipDeploy>true</skipDeploy>
- </configuration>
</plugin>
</plugins>
</build>
Modified: webservices/axiom/trunk/implementations/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/pom.xml?rev=1611836&r1=1611835&r2=1611836&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/pom.xml (original)
+++ webservices/axiom/trunk/implementations/pom.xml Fri Jul 18 23:11:18 2014
@@ -28,6 +28,8 @@
<name>Implementations</name>
<packaging>pom</packaging>
<modules>
+ <module>axiom-impl</module>
+ <module>axiom-dom</module>
<module>dom</module>
</modules>
<build>
@@ -64,6 +66,7 @@
<instructions>
<Private-Package>org.apache.axiom.*</Private-Package>
<Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
+ <Import-Package>!org.aspectj.*,*</Import-Package>
</instructions>
</configuration>
</plugin>
Modified: webservices/axiom/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/pom.xml?rev=1611836&r1=1611835&r2=1611836&view=diff
==============================================================================
--- webservices/axiom/trunk/pom.xml (original)
+++ webservices/axiom/trunk/pom.xml Fri Jul 18 23:11:18 2014
@@ -900,8 +900,6 @@
<module>buildutils</module>
<module>modules/axiom-buildutils</module>
<module>modules/axiom-api</module>
- <module>modules/axiom-impl</module>
- <module>modules/axiom-dom</module>
<module>modules/axiom-compat</module>
<module>modules/axiom-jaxb</module>
<module>modules/axiom-c14n</module>
