Author: veithen Date: Sun Aug 1 16:30:51 2010 New Revision: 981262 URL: http://svn.apache.org/viewvc?rev=981262&view=rev Log: Changed the artifactId of the scripting module from "axis2-scripting" to "scripting" to match the convention used by the other Axis2 modules. This also implies that we no longer need to apply special processing to that module when building the binary distribution.
Modified: axis/axis2/java/core/trunk/modules/distribution/pom.xml axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/repository.xml axis/axis2/java/core/trunk/modules/integration/pom.xml axis/axis2/java/core/trunk/modules/scripting/pom.xml axis/axis2/java/core/trunk/modules/webapp/pom.xml Modified: axis/axis2/java/core/trunk/modules/distribution/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/distribution/pom.xml?rev=981262&r1=981261&r2=981262&view=diff ============================================================================== --- axis/axis2/java/core/trunk/modules/distribution/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/distribution/pom.xml Sun Aug 1 16:30:51 2010 @@ -171,7 +171,7 @@ </dependency> <dependency> <groupId>org.apache.axis2</groupId> - <artifactId>axis2-scripting</artifactId> + <artifactId>scripting</artifactId> <version>${pom.version}</version> <type>mar</type> </dependency> Modified: axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/repository.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/repository.xml?rev=981262&r1=981261&r2=981262&view=diff ============================================================================== --- axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/repository.xml (original) +++ axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/repository.xml Sun Aug 1 16:30:51 2010 @@ -31,18 +31,6 @@ <includes> <include>*:*:mar</include> </includes> - <excludes> - <exclude>org.apache.axis2:axis2-scripting</exclude> - </excludes> - </dependencySet> - <dependencySet> - <!-- TODO: maybe we should rename the artifact from axis2-scripting to scripting??? --> - <outputDirectory>modules</outputDirectory> - <useProjectArtifact>false</useProjectArtifact> - <includes> - <include>org.apache.axis2:axis2-scripting:mar</include> - </includes> - <outputFileNameMapping>scripting-${artifact.version}.mar</outputFileNameMapping> </dependencySet> <dependencySet> <!-- TODO: mex is not available as a mar artifact; this is obviously an issue --> Modified: axis/axis2/java/core/trunk/modules/integration/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/integration/pom.xml?rev=981262&r1=981261&r2=981262&view=diff ============================================================================== --- axis/axis2/java/core/trunk/modules/integration/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/integration/pom.xml Sun Aug 1 16:30:51 2010 @@ -52,7 +52,7 @@ </dependency> <dependency> <groupId>org.apache.axis2</groupId> - <artifactId>axis2-scripting</artifactId> + <artifactId>scripting</artifactId> <type>mar</type> <version>${project.version}</version> </dependency> Modified: axis/axis2/java/core/trunk/modules/scripting/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/scripting/pom.xml?rev=981262&r1=981261&r2=981262&view=diff ============================================================================== --- axis/axis2/java/core/trunk/modules/scripting/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/scripting/pom.xml Sun Aug 1 16:30:51 2010 @@ -27,7 +27,7 @@ <version>SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> - <artifactId>axis2-scripting</artifactId> + <artifactId>scripting</artifactId> <packaging>mar</packaging> <name>Apache Axis2 - Scripting</name> <description>Axis2 scripting support for services implemented with scripting languages</description> Modified: axis/axis2/java/core/trunk/modules/webapp/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/pom.xml?rev=981262&r1=981261&r2=981262&view=diff ============================================================================== --- axis/axis2/java/core/trunk/modules/webapp/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/webapp/pom.xml Sun Aug 1 16:30:51 2010 @@ -1105,7 +1105,7 @@ </dependency> <dependency> <groupId>org.apache.axis2</groupId> - <artifactId>axis2-scripting</artifactId> + <artifactId>scripting</artifactId> <version>${project.version}</version> <type>mar</type> <exclusions>