You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by vs...@apache.org on 2009/04/15 23:35:11 UTC
svn commit: r765372 - in
/incubator/shindig/branches/1.0.x-incubating/assembly: pom.xml
src/main/assembly/binary.xml src/main/assembly/java.xml
src/main/assembly/php.xml src/main/assembly/source.xml
Author: vsiveton
Date: Wed Apr 15 21:35:11 2009
New Revision: 765372
URL: http://svn.apache.org/viewvc?rev=765372&view=rev
Log:
o using the single goal since attached is deprecated
o using pom version in the assembly
o renamed binary to java assembly
o excluded more IDE files
Added:
incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/java.xml
- copied, changed from r765145, incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/binary.xml
Removed:
incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/binary.xml
Modified:
incubator/shindig/branches/1.0.x-incubating/assembly/pom.xml
incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/php.xml
incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/source.xml
Modified: incubator/shindig/branches/1.0.x-incubating/assembly/pom.xml
URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/assembly/pom.xml?rev=765372&r1=765371&r2=765372&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/assembly/pom.xml (original)
+++ incubator/shindig/branches/1.0.x-incubating/assembly/pom.xml Wed Apr 15 21:35:11 2009
@@ -44,21 +44,22 @@
</filters>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptors>
<descriptor>src/main/assembly/php.xml</descriptor>
+ <descriptor>src/main/assembly/java.xml</descriptor>
<descriptor>src/main/assembly/source.xml</descriptor>
- <descriptor>src/main/assembly/binary.xml</descriptor>
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
</configuration>
<executions>
<execution>
- <id>make-assembly</id> <!-- this is used for inheritance merges -->
- <phase>package</phase> <!-- append to the packaging phase. -->
+ <id>make-assembly</id>
+ <phase>package</phase>
<goals>
- <goal>attached</goal> <!-- goals == mojos -->
+ <goal>single</goal>
</goals>
</execution>
</executions>
@@ -66,7 +67,6 @@
<plugin>
<groupId>org.apache.geronimo.genesis.plugins</groupId>
<artifactId>tools-maven-plugin</artifactId>
- <version>1.4</version>
<executions>
<execution>
<id>verify-legal-files</id>
Copied: incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/java.xml (from r765145, incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/binary.xml)
URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/java.xml?p2=incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/java.xml&p1=incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/binary.xml&r1=765145&r2=765372&rev=765372&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/binary.xml (original)
+++ incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/java.xml Wed Apr 15 21:35:11 2009
@@ -26,7 +26,7 @@
<includeBaseDirectory>false</includeBaseDirectory>
<dependencySets>
<dependencySet>
- <outputDirectory>shindig-binary</outputDirectory>
+ <outputDirectory>shindig-${pom.version}-java</outputDirectory>
<outputFileNameMapping>${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<useTransitiveDependencies>false</useTransitiveDependencies>
<includes>
@@ -40,7 +40,7 @@
</dependencySets>
<fileSets>
<fileSet>
- <outputDirectory>shindig-binary</outputDirectory>
+ <outputDirectory>shindig-${pom.version}-java</outputDirectory>
<directory>../</directory>
<includes>
<include>COMMITTERS</include>
@@ -51,7 +51,7 @@
</includes>
</fileSet>
<fileSet>
- <outputDirectory>shindig-binary</outputDirectory>
+ <outputDirectory>shindig-${pom.version}-java</outputDirectory>
<directory>src/main/assembly/binary-src/</directory>
<filtered>true</filtered>
<includes>
Modified: incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/php.xml
URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/php.xml?rev=765372&r1=765371&r2=765372&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/php.xml (original)
+++ incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/php.xml Wed Apr 15 21:35:11 2009
@@ -26,7 +26,7 @@
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
- <outputDirectory>shindig-php</outputDirectory>
+ <outputDirectory>shindig-${pom.version}-php</outputDirectory>
<directory>../</directory>
<includes>
<include>features/**</include>
@@ -47,12 +47,17 @@
<!-- scm -->
<exclude>**/.git/**</exclude>
<exclude>**/.svn/**</exclude>
- <!-- eclipse -->
+ <!-- IDE -->
+ <exclude>**/*.iws</exclude>
+ <exclude>**/*.ipr</exclude>
+ <exclude>**/*.iml</exclude>
<exclude>**/.project/**</exclude>
<exclude>**/.classpath/**</exclude>
<exclude>**/.settings/**</exclude>
<exclude>**/.externalToolBuilders/**</exclude>
<exclude>**/maven-eclipse.xml</exclude>
+ <exclude>**/.deployables</**/exclude>
+ <exclude>**/.wtpmodules/**</exclude>
<!-- maven -->
<exclude>**/pom.xml</exclude>
<exclude>**/target/**</exclude>
@@ -63,19 +68,24 @@
</excludes>
</fileSet>
<fileSet>
- <outputDirectory>shindig-php</outputDirectory>
+ <outputDirectory>shindig-${pom.version}-php</outputDirectory>
<directory>../php</directory>
<excludes>
<exclude>config/**</exclude>
<!-- scm -->
<exclude>**/.git/**</exclude>
<exclude>**/.svn/**</exclude>
- <!-- eclipse -->
+ <!-- IDE -->
+ <exclude>**/*.iws</exclude>
+ <exclude>**/*.ipr</exclude>
+ <exclude>**/*.iml</exclude>
<exclude>**/.project/**</exclude>
<exclude>**/.classpath/**</exclude>
<exclude>**/.settings/**</exclude>
<exclude>**/.externalToolBuilders/**</exclude>
<exclude>**/maven-eclipse.xml</exclude>
+ <exclude>**/.deployables</**/exclude>
+ <exclude>**/.wtpmodules/**</exclude>
<!-- maven -->
<exclude>**/pom.xml</exclude>
<exclude>**/target/**</exclude>
@@ -92,7 +102,7 @@
<!-- Using the temp container.php created by Maven using Antrun plugin to rewrite
default configuration to release structure -->
<fileSet>
- <outputDirectory>shindig-php/config</outputDirectory>
+ <outputDirectory>shindig-${pom.version}-php/config</outputDirectory>
<directory>target/php/config</directory>
<excludes>
<!-- scm -->
Modified: incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/source.xml
URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/source.xml?rev=765372&r1=765371&r2=765372&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/source.xml (original)
+++ incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/source.xml Wed Apr 15 21:35:11 2009
@@ -26,27 +26,31 @@
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
- <outputDirectory>shindig</outputDirectory>
+ <outputDirectory>shindig-${pom.version}-src</outputDirectory>
<directory>../</directory>
<includes>
<include>*/**</include>
</includes>
<excludes>
+ <!-- scm -->
<exclude>**/.git/**</exclude>
<exclude>**/.svn/**</exclude>
+ <!-- maven -->
<exclude>**/target/**</exclude>
- <exclude>**/*.patch</exclude>
- <exclude>**/*.diff</exclude>
+ <!-- IDE -->
<exclude>**/*.iws</exclude>
<exclude>**/*.ipr</exclude>
<exclude>**/*.iml</exclude>
<exclude>**/.project</exclude>
<exclude>**/.classpath</exclude>
<exclude>**/.settings/**</exclude>
- <exclude>**/.deployables</exclude>
- <exclude>**/.wtpmodules</exclude>
+ <exclude>**/.deployables/**</exclude>
+ <exclude>**/.wtpmodules/**</exclude>
<exclude>**/.externalToolBuilders/**</exclude>
<exclude>**/maven-eclipse.xml</exclude>
+ <!-- misc -->
+ <exclude>**/*.patch</exclude>
+ <exclude>**/*.diff</exclude>
<exclude>**/*.log</exclude>
<exclude>**/*.bak</exclude>
<exclude>**/*~</exclude>