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:43:35 UTC
svn commit: r765381 - in /incubator/shindig/trunk/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:43:35 2009
New Revision: 765381
URL: http://svn.apache.org/viewvc?rev=765381&view=rev
Log:
o merged r765148, r765372, r765378
Added:
incubator/shindig/trunk/assembly/src/main/assembly/java.xml
- copied, changed from r761629, incubator/shindig/trunk/assembly/src/main/assembly/binary.xml
Removed:
incubator/shindig/trunk/assembly/src/main/assembly/binary.xml
Modified:
incubator/shindig/trunk/assembly/pom.xml
incubator/shindig/trunk/assembly/src/main/assembly/php.xml
incubator/shindig/trunk/assembly/src/main/assembly/source.xml
Modified: incubator/shindig/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/assembly/pom.xml?rev=765381&r1=765380&r2=765381&view=diff
==============================================================================
--- incubator/shindig/trunk/assembly/pom.xml (original)
+++ incubator/shindig/trunk/assembly/pom.xml Wed Apr 15 21:43:35 2009
@@ -46,21 +46,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>
@@ -68,7 +69,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>
@@ -82,6 +82,35 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>align-php-structure</id>
+ <phase>validate</phase>
+ <configuration>
+ <tasks>
+
+ <!-- Rewrite default configuration to release structure -->
+ <mkdir dir="${project.build.directory}/php/config"/>
+ <copy todir="${project.build.directory}/php/config">
+ <fileset dir="../php/config"/>
+ </copy>
+
+ <replace file="${project.build.directory}/php/config/container.php">
+ <replacetoken><![CDATA[/../../]]></replacetoken>
+ <replacevalue><![CDATA[/../]]></replacevalue>
+ </replace>
+
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
<dependencies>
Copied: incubator/shindig/trunk/assembly/src/main/assembly/java.xml (from r761629, incubator/shindig/trunk/assembly/src/main/assembly/binary.xml)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/assembly/src/main/assembly/java.xml?p2=incubator/shindig/trunk/assembly/src/main/assembly/java.xml&p1=incubator/shindig/trunk/assembly/src/main/assembly/binary.xml&r1=761629&r2=765381&rev=765381&view=diff
==============================================================================
--- incubator/shindig/trunk/assembly/src/main/assembly/binary.xml (original)
+++ incubator/shindig/trunk/assembly/src/main/assembly/java.xml Wed Apr 15 21:43:35 2009
@@ -17,7 +17,7 @@
* under the License.
-->
<assembly>
- <id>binary</id>
+ <id>java</id>
<formats>
<format>zip</format>
<format>tar.gz</format>
@@ -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/trunk/assembly/src/main/assembly/php.xml
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/assembly/src/main/assembly/php.xml?rev=765381&r1=765380&r2=765381&view=diff
==============================================================================
--- incubator/shindig/trunk/assembly/src/main/assembly/php.xml (original)
+++ incubator/shindig/trunk/assembly/src/main/assembly/php.xml Wed Apr 15 21:43:35 2009
@@ -26,34 +26,88 @@
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
- <outputDirectory>shindig-php</outputDirectory>
+ <outputDirectory>shindig-${pom.version}-php</outputDirectory>
<directory>../</directory>
<includes>
- <include>php/**</include>
<include>features/**</include>
<include>javascript/**</include>
<include>config/**</include>
<include>COMMITTERS</include>
<include>COPYING</include>
+ <include>DISCLAIMER</include>
<include>LICENSE</include>
<include>NOTICE</include>
- <include>README</include>
</includes>
<excludes>
<exclude>site/**</exclude>
<exclude>resources/**</exclude>
<exclude>etc/**</exclude>
- <exclude>pom.xml</exclude>
<exclude>assembly/**</exclude>
<exclude>java/**</exclude>
+ <!-- scm -->
<exclude>**/.git/**</exclude>
<exclude>**/.svn/**</exclude>
+ <!-- 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>
+ <!-- misc -->
<exclude>*.patch</exclude>
<exclude>*.diff</exclude>
+ <exclude>README</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <outputDirectory>shindig-${pom.version}-php</outputDirectory>
+ <directory>../php</directory>
+ <excludes>
+ <exclude>config/**</exclude>
+ <!-- scm -->
+ <exclude>**/.git/**</exclude>
+ <exclude>**/.svn/**</exclude>
+ <!-- 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>
+ <!-- misc -->
+ <exclude>*.patch</exclude>
+ <exclude>*.diff</exclude>
+ <exclude>*.zip</exclude>
+ <exclude>*.tar.gz</exclude>
+ <exclude>*.tar.bz2</exclude>
+ <exclude>*.sh</exclude>
+ <exclude>*.bat</exclude>
+ </excludes>
+ </fileSet>
+ <!-- Using the temp container.php created by Maven using Antrun plugin to rewrite
+ default configuration to release structure -->
+ <fileSet>
+ <outputDirectory>shindig-${pom.version}-php/config</outputDirectory>
+ <directory>target/php/config</directory>
+ <excludes>
+ <!-- scm -->
+ <exclude>**/.git/**</exclude>
+ <exclude>**/.svn/**</exclude>
</excludes>
</fileSet>
</fileSets>
Modified: incubator/shindig/trunk/assembly/src/main/assembly/source.xml
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/assembly/src/main/assembly/source.xml?rev=765381&r1=765380&r2=765381&view=diff
==============================================================================
--- incubator/shindig/trunk/assembly/src/main/assembly/source.xml (original)
+++ incubator/shindig/trunk/assembly/src/main/assembly/source.xml Wed Apr 15 21:43:35 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>