You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by ap...@apache.org on 2009/10/24 14:52:18 UTC
svn commit: r829358 - in /tiles/sandbox/trunk/tiles3: ./ assembly/
src/site/apt/ src/site/apt/dev/ src/site/apt/migration/
src/site/apt/tutorial/ src/site/resources/images/ src/site/xdoc/dev/
src/site/xdoc/images/ tiles-api/src/main/java/org/apache/til...
Author: apetrelli
Date: Sat Oct 24 12:52:16 2009
New Revision: 829358
URL: http://svn.apache.org/viewvc?rev=829358&view=rev
Log:
TILES-481
Merged from trunk to the sandbox.
Modified:
tiles/sandbox/trunk/tiles3/ (props changed)
tiles/sandbox/trunk/tiles3/assembly/pom.xml
tiles/sandbox/trunk/tiles3/src/site/apt/config-reference.apt (props changed)
tiles/sandbox/trunk/tiles3/src/site/apt/dev/ (props changed)
tiles/sandbox/trunk/tiles3/src/site/apt/getting_started.apt (props changed)
tiles/sandbox/trunk/tiles3/src/site/apt/migration/ (props changed)
tiles/sandbox/trunk/tiles3/src/site/apt/selenium.apt (props changed)
tiles/sandbox/trunk/tiles3/src/site/apt/tutorial/ (props changed)
tiles/sandbox/trunk/tiles3/src/site/resources/images/page_to_page.png (props changed)
tiles/sandbox/trunk/tiles3/src/site/resources/images/tiled_page.png (props changed)
tiles/sandbox/trunk/tiles3/src/site/xdoc/dev/building.xml (props changed)
tiles/sandbox/trunk/tiles3/src/site/xdoc/dev/snapshots.xml (props changed)
tiles/sandbox/trunk/tiles3/src/site/xdoc/images/page_to_page.svg (props changed)
tiles/sandbox/trunk/tiles3/src/site/xdoc/images/tiled_page.svg (props changed)
tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/ListAttribute.java (props changed)
tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/reflect/ (props changed)
tiles/sandbox/trunk/tiles3/tiles-compat/src/main/java/org/apache/tiles/compat/preparer/CompatibilityPreparerFactory.java (props changed)
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/startup/BasicTilesInitializer.java (props changed)
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/startup/TilesInitializer.java (props changed)
tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/el/JspExpressionFactoryFactory.java (props changed)
tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextFactory.java (props changed)
tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/io/NullWriter.java (props changed)
tiles/sandbox/trunk/tiles3/tiles-jsp/src/test/java/org/apache/tiles/jsp/context/JspTilesRequestContextFactoryTest.java (props changed)
tiles/sandbox/trunk/tiles3/tiles-portlet-wildcard/src/main/java/org/apache/tiles/portlet/context/wildcard/WildcardPortletTilesApplicationContextFactory.java (props changed)
tiles/sandbox/trunk/tiles3/tiles-portlet-wildcard/src/test/java/org/apache/tiles/portlet/wildcard/WildcardPortletTilesApplicationContextTest.java (props changed)
tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/ (props changed)
tiles/sandbox/trunk/tiles3/tiles-portlet/src/test/java/org/apache/tiles/portlet/context/ (props changed)
tiles/sandbox/trunk/tiles3/tiles-servlet-wildcard/src/main/java/org/apache/tiles/servlet/context/wildcard/WildcardServletTilesApplicationContextFactory.java (props changed)
tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ (props changed)
tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/startup/ (props changed)
tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/util/ (props changed)
tiles/sandbox/trunk/tiles3/tiles-servlet/src/test/java/org/apache/tiles/servlet/context/ (props changed)
tiles/sandbox/trunk/tiles3/tiles-servlet/src/test/java/org/apache/tiles/web/util/ (props changed)
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/ (props changed)
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/pom.xml
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tools.xml (props changed)
Propchange: tiles/sandbox/trunk/tiles3/
------------------------------------------------------------------------------
svn:mergeinfo = /tiles/framework/trunk:829356
Modified: tiles/sandbox/trunk/tiles3/assembly/pom.xml
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/assembly/pom.xml?rev=829358&r1=829357&r2=829358&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/assembly/pom.xml (original)
+++ tiles/sandbox/trunk/tiles3/assembly/pom.xml Sat Oct 24 12:52:16 2009
@@ -86,6 +86,57 @@
<tarLongFileMode>gnu</tarLongFileMode>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>deploy</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <mkdir dir="${project.build.directory}/assemblies" />
+ <echo message="Here I am!" />
+ <copy todir="${project.build.directory}/assemblies">
+ <fileset dir="${settings.localRepository}/org/apache/tiles/tiles-assembly/${pom.version}">
+ <include name="tiles-assembly-${pom.version}-*.zip*" />
+ <include name="tiles-assembly-${pom.version}-*.tar.gz*" />
+ </fileset>
+ <mapper type="glob" from="tiles-assembly-*" to="tiles-*"/>
+ </copy>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>wagon-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>deploy</phase>
+ <goals>
+ <goal>upload</goal>
+ </goals>
+ <configuration>
+ <fromDir>${project.build.directory}/assemblies</fromDir>
+ <includes>**</includes>
+ <toDir>${pom.version}</toDir>
+ <serverId>tiles.build</serverId>
+ <url>scp://people.apache.org/www/people.apache.org/builds/tiles</url>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</profile>
Propchange: tiles/sandbox/trunk/tiles3/src/site/apt/config-reference.apt
('svn:mergeinfo' removed)
Propchange: tiles/sandbox/trunk/tiles3/src/site/apt/dev/
('svn:mergeinfo' removed)
Propchange: tiles/sandbox/trunk/tiles3/src/site/apt/getting_started.apt
('svn:mergeinfo' removed)
Propchange: tiles/sandbox/trunk/tiles3/src/site/apt/migration/
('svn:mergeinfo' removed)
Propchange: tiles/sandbox/trunk/tiles3/src/site/apt/selenium.apt
('svn:mergeinfo' removed)
Propchange: tiles/sandbox/trunk/tiles3/src/site/apt/tutorial/
('svn:mergeinfo' removed)
Propchange: tiles/sandbox/trunk/tiles3/src/site/resources/images/page_to_page.png
('svn:mergeinfo' removed)
Propchange: tiles/sandbox/trunk/tiles3/src/site/resources/images/tiled_page.png
('svn:mergeinfo' removed)
Propchange: tiles/sandbox/trunk/tiles3/src/site/xdoc/dev/building.xml
('svn:mergeinfo' removed)
Propchange: tiles/sandbox/trunk/tiles3/src/site/xdoc/dev/snapshots.xml
('svn:mergeinfo' removed)
Propchange: tiles/sandbox/trunk/tiles3/src/site/xdoc/images/page_to_page.svg
('svn:mergeinfo' removed)
Propchange: tiles/sandbox/trunk/tiles3/src/site/xdoc/images/tiled_page.svg
('svn:mergeinfo' removed)
Propchange: tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/ListAttribute.java
('svn:mergeinfo' removed)
Propchange: tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/reflect/
('svn:mergeinfo' removed)
Propchange: tiles/sandbox/trunk/tiles3/tiles-compat/src/main/java/org/apache/tiles/compat/preparer/CompatibilityPreparerFactory.java
('svn:mergeinfo' removed)
Propchange: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/startup/BasicTilesInitializer.java
('svn:mergeinfo' removed)
Propchange: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/startup/TilesInitializer.java
('svn:mergeinfo' removed)
Propchange: tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/el/JspExpressionFactoryFactory.java
('svn:mergeinfo' removed)
Propchange: tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextFactory.java
('svn:mergeinfo' removed)
Propchange: tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/io/NullWriter.java
('svn:mergeinfo' removed)
Propchange: tiles/sandbox/trunk/tiles3/tiles-jsp/src/test/java/org/apache/tiles/jsp/context/JspTilesRequestContextFactoryTest.java
('svn:mergeinfo' removed)
Propchange: tiles/sandbox/trunk/tiles3/tiles-portlet-wildcard/src/main/java/org/apache/tiles/portlet/context/wildcard/WildcardPortletTilesApplicationContextFactory.java
('svn:mergeinfo' removed)
Propchange: tiles/sandbox/trunk/tiles3/tiles-portlet-wildcard/src/test/java/org/apache/tiles/portlet/wildcard/WildcardPortletTilesApplicationContextTest.java
('svn:mergeinfo' removed)
Propchange: tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/
('svn:mergeinfo' removed)
Propchange: tiles/sandbox/trunk/tiles3/tiles-portlet/src/test/java/org/apache/tiles/portlet/context/
('svn:mergeinfo' removed)
Propchange: tiles/sandbox/trunk/tiles3/tiles-servlet-wildcard/src/main/java/org/apache/tiles/servlet/context/wildcard/WildcardServletTilesApplicationContextFactory.java
('svn:mergeinfo' removed)
Propchange: tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/
('svn:mergeinfo' removed)
Propchange: tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/startup/
('svn:mergeinfo' removed)
Propchange: tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/util/
('svn:mergeinfo' removed)
Propchange: tiles/sandbox/trunk/tiles3/tiles-servlet/src/test/java/org/apache/tiles/servlet/context/
('svn:mergeinfo' removed)
Propchange: tiles/sandbox/trunk/tiles3/tiles-servlet/src/test/java/org/apache/tiles/web/util/
('svn:mergeinfo' removed)
Propchange: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 24 12:52:16 2009
@@ -1,2 +1,3 @@
+/tiles/framework/trunk/tiles-test-pom/tiles-test:829356
/tiles/sandbox/trunk/tiles-test:740289
/tiles/sandbox/trunk/tiles-test-sandbox:740290-745038,747727-751891
Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/pom.xml
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/pom.xml?rev=829358&r1=829357&r2=829358&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/pom.xml (original)
+++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/pom.xml Sat Oct 24 12:52:16 2009
@@ -425,6 +425,25 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>wagon-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>deploy</phase>
+ <goals>
+ <goal>upload</goal>
+ </goals>
+ <configuration>
+ <fromDir>${settings.localRepository}/org/apache/tiles/tiles-test/${pom.version}</fromDir>
+ <includes>tiles-test-${pom.version}.war*</includes>
+ <toDir>${pom.version}</toDir>
+ <serverId>tiles.build</serverId>
+ <url>scp://people.apache.org/www/people.apache.org/builds/tiles</url>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</profile>
Propchange: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tools.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 24 12:52:16 2009
@@ -0,0 +1 @@
+/tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tools.xml:829356