Author: vsiveton
Date: Sat Jul 25 14:17:07 2009
New Revision: 797770
URL: http://svn.apache.org/viewvc?rev=797770&view=rev
Log:
o merge r797769
Modified:
incubator/shindig/branches/1.0.x-incubating/assembly/pom.xml
incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/java.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
incubator/shindig/branches/1.0.x-incubating/java/NOTICE
incubator/shindig/branches/1.0.x-incubating/java/README
incubator/shindig/branches/1.0.x-incubating/php/NOTICE
incubator/shindig/branches/1.0.x-incubating/php/README
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=797770&r1=797769&r2=797770&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/assembly/pom.xml (original)
+++ incubator/shindig/branches/1.0.x-incubating/assembly/pom.xml Sat Jul 25
14:17:07 2009
@@ -53,6 +53,9 @@
<descriptor>src/main/assembly/source.xml</descriptor>
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
+ <filters>
+
<filter>${project.build.directory}/assemblyFilter.properties</filter>
+ </filters>
</configuration>
<executions>
<execution>
@@ -101,6 +104,13 @@
<replacevalue><![CDATA[/../]]></replacevalue>
</replace>
+ <tstamp>
+ <format property="year" pattern="yyyy" />
+ </tstamp>
+ <echo
file="${project.build.directory}/assemblyFilter.properties">
+year=${year}
+ </echo>
+
</tasks>
</configuration>
<goals>
Modified:
incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/java.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/java.xml?rev=797770&r1=797769&r2=797770&view=diff
==============================================================================
---
incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/java.xml
(original)
+++
incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/java.xml
Sat Jul 25 14:17:07 2009
@@ -55,9 +55,19 @@
<directory>../java</directory>
<includes>
<include>LICENSE</include>
- <include>NOTICE</include>
- <include>README</include>
</includes>
</fileSet>
</fileSets>
+ <files>
+ <file>
+ <source>../java/README</source>
+ <outputDirectory>shindig-${pom.version}-java</outputDirectory>
+ <filtered>true</filtered>
+ </file>
+ <file>
+ <source>../java/NOTICE</source>
+ <outputDirectory>shindig-${pom.version}-java</outputDirectory>
+ <filtered>true</filtered>
+ </file>
+ </files>
</assembly>
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=797770&r1=797769&r2=797770&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
Sat Jul 25 14:17:07 2009
@@ -95,6 +95,11 @@
<exclude>*.tar.bz2</exclude>
<exclude>*.sh</exclude>
<exclude>*.bat</exclude>
+ <exclude>**/*.log</exclude>
+ <exclude>**/*.bak</exclude>
+
+ <exclude>NOTICE</exclude>
+ <exclude>README</exclude>
</excludes>
</fileSet>
<!-- Using the temp container.php created by Maven using Antrun plugin to
rewrite
@@ -109,4 +114,16 @@
</excludes>
</fileSet>
</fileSets>
+ <files>
+ <file>
+ <source>../php/README</source>
+ <outputDirectory>shindig-${pom.version}-php</outputDirectory>
+ <filtered>true</filtered>
+ </file>
+ <file>
+ <source>../php/NOTICE</source>
+ <outputDirectory>shindig-${pom.version}-php</outputDirectory>
+ <filtered>true</filtered>
+ </file>
+ </files>
</assembly>
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=797770&r1=797769&r2=797770&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
Sat Jul 25 14:17:07 2009
@@ -46,16 +46,21 @@
<exclude>**/maven-eclipse.xml</exclude>
<exclude>**/.deployables/**</exclude>
<exclude>**/.wtpmodules/**</exclude>
- <exclude>java/samples/create.sql</exclude>
- <exclude>java/samples/drop.sql</exclude>
- <exclude>java/samples/derby.log</exclude>
<!-- maven -->
<exclude>**/target/**</exclude>
<exclude>**/pom.xml.releaseBackup</exclude>
<exclude>**/release.properties</exclude>
<!-- misc -->
- <exclude>*.patch</exclude>
- <exclude>*.diff</exclude>
+ <exclude>**/*.patch</exclude>
+ <exclude>**/*.diff</exclude>
+ <exclude>**/*.log</exclude>
+ <exclude>**/*.bak</exclude>
+ <exclude>**/*~</exclude>
+ <exclude>**/#*#</exclude>
+ <exclude>**/%*%</exclude>
+ <exclude>**/samples/create.sql</exclude>
+ <exclude>**/samples/drop.sql</exclude>
+ <exclude>**/derby.log</exclude>
</excludes>
</fileSet>
</fileSets>
Modified: incubator/shindig/branches/1.0.x-incubating/java/NOTICE
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/NOTICE?rev=797770&r1=797769&r2=797770&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/NOTICE (original)
+++ incubator/shindig/branches/1.0.x-incubating/java/NOTICE Sat Jul 25 14:17:07
2009
@@ -1,5 +1,5 @@
Apache Shindig
-Copyright 2009 The Apache Software Foundation
+Copyright ${year} The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Modified: incubator/shindig/branches/1.0.x-incubating/java/README
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/README?rev=797770&r1=797769&r2=797770&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/README (original)
+++ incubator/shindig/branches/1.0.x-incubating/java/README Sat Jul 25 14:17:07
2009
@@ -40,15 +40,16 @@
Installing Shindig Java
-----------------------
- Unzip the distribution archive, i.e. shindig-1.0-incubating-java.zip to
+ Unzip the distribution archive, i.e. shindig-${project.version}-java.zip to
the directory you wish to install Shindig.
The following explains how to deploy the Shindig war file to Apache
Tomcat. If you are using an other container, please read its documentation
- on how to proceed.
+ on how to proceed. You could download the war from:
+
http://repo1.maven.org/maven2/org/apache/shindig/shindig-server/${project.version}/shindig-server-${project.version}.war
The easiest way to deploy Shindig on Apache Tomcat is to rename the
- shindig-server-1.0-incubating.war file to ROOT.war and drop it in the
+ shindig-server-${project.version}.war file to ROOT.war and drop it in the
Tomcat webapps.
Be sure to delete $TOMCAT_HOME/webapps/ROOT dir before starting Tomcat.
Modified: incubator/shindig/branches/1.0.x-incubating/php/NOTICE
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/php/NOTICE?rev=797770&r1=797769&r2=797770&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/php/NOTICE (original)
+++ incubator/shindig/branches/1.0.x-incubating/php/NOTICE Sat Jul 25 14:17:07
2009
@@ -1,5 +1,5 @@
Apache Shindig
-Copyright 2009 The Apache Software Foundation
+Copyright ${year} The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Modified: incubator/shindig/branches/1.0.x-incubating/php/README
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/php/README?rev=797770&r1=797769&r2=797770&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/php/README (original)
+++ incubator/shindig/branches/1.0.x-incubating/php/README Sat Jul 25 14:17:07
2009
@@ -44,10 +44,10 @@
Installing Shindig
------------------
- Unzip the distribution archive, i.e. shindig-1.0-incubating-php.zip to
+ Unzip the distribution archive, i.e. shindig-${project.version}-php.zip to
the web document root, e.g. /var/www/html.
- Rename the created shindig-1.0-incubating-php dir to shindig.
+ Rename the created shindig-${project.version}-php dir to shindig.
a. Create a new virtual host
