Author: hlship
Date: Tue Jun 1 14:24:26 2010
New Revision: 950086
URL: http://svn.apache.org/viewvc?rev=950086&view=rev
Log:
Create a new empty module to contain the tapestry-func library
Added:
tapestry/tapestry5/trunk/tapestry-func/
tapestry/tapestry5/trunk/tapestry-func/pom.xml (with props)
tapestry/tapestry5/trunk/tapestry-func/src/
tapestry/tapestry5/trunk/tapestry-func/src/test/
tapestry/tapestry5/trunk/tapestry-func/src/test/conf/
tapestry/tapestry5/trunk/tapestry-func/src/test/conf/testng.xml (with
props)
Modified:
tapestry/tapestry5/trunk/pom.xml
tapestry/tapestry5/trunk/src/site/site.xml
tapestry/tapestry5/trunk/tapestry-ioc/pom.xml
Modified: tapestry/tapestry5/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/pom.xml?rev=950086&r1=950085&r2=950086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/pom.xml (original)
+++ tapestry/tapestry5/trunk/pom.xml Tue Jun 1 14:24:26 2010
@@ -1,443 +1,404 @@
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns="http://maven.apache.org/POM/4.0.0";>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.tapestry</groupId>
- <artifactId>tapestry-project</artifactId>
- <packaging>pom</packaging>
- <version>5.2.0-SNAPSHOT</version>
- <name>Tapestry 5 Project</name>
- <description>Master project for the modules of Tapestry 5.</description>
- <inceptionYear>2006</inceptionYear>
- <url>http://tapestry.apache.org/tapestry5.1/</url>
-
- <parent>
- <groupId>org.apache</groupId>
- <artifactId>apache</artifactId>
- <version>6</version>
- </parent>
-
- <issueManagement>
- <system>Jira</system>
- <url>https://issues.apache.org/jira/browse/TAP5</url>
- </issueManagement>
- <licenses>
- <license>
- <name>Apache Software License 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
- <organization>
- <name>Apache Software Foundation</name>
- <url>http://www.apache.org</url>
- </organization>
- <scm>
-
<connection>scm:svn:https://svn.apache.org/repos/asf/tapestry/tapestry5/trunk/</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/tapestry/tapestry5/trunk/</developerConnection>
- <url>http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/</url>
- </scm>
- <developers>
- <developer>
- <id>hls</id>
- <name>Howard M. Lewis Ship</name>
- <email>[email protected]</email>
- <url>http://howardlewisship.com</url>
- <roles>
- <role>Menace</role>
- </roles>
- <timezone>PDT</timezone>
- </developer>
- <developer>
- <id>gredler</id>
- <name>Daniel Gredler</name>
- <email>[email protected]</email>
- <url>http://daniel.gredler.net/</url>
- <roles>
- <role>Newbie</role>
- </roles>
- <timezone>EDT</timezone>
- </developer>
- <developer>
- <id>dadams</id>
- <name>Dan Adams</name>
- <email>[email protected]</email>
- <roles>
- <role>Engineer</role>
- </roles>
- <timezone>EST</timezone>
- <organization>Interactive Factory</organization>
- <organizationUrl>http://ifactory.com</organizationUrl>
- </developer>
- <developer>
- <id>kmenard</id>
- <name>Kevin Menard</name>
- <email>[email protected]</email>
- <organization>Servprise International, Inc.</organization>
- <roles>
- <role>Developer</role>
- </roles>
- <timezone>-5</timezone>
- </developer>
- <developer>
- <id>tedst</id>
- <name>Ted Steen</name>
- <email>[email protected]</email>
- <roles>
- <role>Developer</role>
- </roles>
- <timezone>+1</timezone>
- </developer>
- <developer>
- <id>drobiazko</id>
- <name>Igor Drobiazko</name>
- <email>[email protected]</email>
- <roles>
- <role>Developer</role>
- </roles>
- <timezone>+1</timezone>
- </developer>
- <developer>
- <id>robertdzeigler</id>
- <name>Robert Zeigler</name>
- <email>[email protected]</email>
- <roles>
- <role>Developer</role>
- </roles>
- <timezone>-6</timezone>
- </developer>
- <developer>
- <id>thiagohp</id>
- <name>Thiago H. de Paula Figueiredo</name>
- <email>[email protected]</email>
- <url>http://www.arsmachina.com.br/thiago</url>
- <roles>
- <role>Developer</role>
- </roles>
- <timezone>-3</timezone>
- </developer>
- <developer>
- <id>uli</id>
- <name>Ulrich Stärk</name>
- <email>[email protected]</email>
- <roles>
- <role>Developer</role>
- </roles>
- <timezone>+1</timezone>
- </developer>
- <developer>
- <id>andyhot</id>
- <name>Andreas Andreou</name>
- <email>[email protected]</email>
- <url>http://blog.andyhot.gr</url>
- <roles>
- <role>PMC</role>
- <role>Developer</role>
- </roles>
- <timezone>+2</timezone>
- </developer>
- </developers>
-
- <ciManagement>
- <system>hudson</system>
- <url>http://hudson.zones.apache.org/hudson/view/Tapestry/</url>
- </ciManagement>
-
- <mailingLists>
- <mailingList>
- <name>Tapestry User List</name>
- <subscribe>[email protected]</subscribe>
- <unsubscribe>[email protected]</unsubscribe>
-
<archive>http://markmail.org/search/list:org.apache.tapestry.users</archive>
- </mailingList>
- <mailingList>
- <name>Tapestry Developer List</name>
- <subscribe>[email protected]</subscribe>
- <unsubscribe>[email protected]</unsubscribe>
-
<archive>http://markmail.org/search/list:org.apache.tapestry.dev</archive>
- </mailingList>
- <mailingList>
- <name>Tapestry Commits List</name>
- <subscribe>[email protected]</subscribe>
- <unsubscribe>[email protected]</unsubscribe>
-
<archive>http://markmail.org/search/list:org.apache.tapestry.commits</archive>
- </mailingList>
- </mailingLists>
-
- <modules>
- <module>tapestry-test</module>
- <module>tapestry-ioc</module>
- <module>tapestry-annotations</module>
- <module>tapestry-core</module>
-
- <!-- Integrations -->
-
- <module>tapestry-spring</module>
- <module>tapestry-hibernate-core</module>
- <module>tapestry-hibernate</module>
- <module>tapestry-upload</module>
-
-
- <!-- Now we're getting into the archetypes. -->
-
- <module>quickstart</module>
-
- <!-- And the Maven plugin. -->
- <module>tapestry-component-report</module>
-
- <!-- Tutorials -->
-
- <module>tapestry-tutorial1</module>
-
- <!-- Temporarily removed until 5.2
+<?xml version="1.0"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns="http://maven.apache.org/POM/4.0.0";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.tapestry</groupId>
+ <artifactId>tapestry-project</artifactId>
+ <packaging>pom</packaging>
+ <version>5.2.0-SNAPSHOT</version>
+ <name>Tapestry 5 Project</name>
+ <description>Master project for the modules of Tapestry 5.</description>
+ <inceptionYear>2006</inceptionYear>
+ <url>http://tapestry.apache.org/tapestry5.1/</url>
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>6</version>
+ </parent>
+ <issueManagement>
+ <system>Jira</system>
+ <url>https://issues.apache.org/jira/browse/TAP5</url>
+ </issueManagement>
+ <licenses>
+ <license>
+ <name>Apache Software License 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <organization>
+ <name>Apache Software Foundation</name>
+ <url>http://www.apache.org</url>
+ </organization>
+ <scm>
+
<connection>scm:svn:https://svn.apache.org/repos/asf/tapestry/tapestry5/trunk/</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/tapestry/tapestry5/trunk/</developerConnection>
+ <url>http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/</url>
+ </scm>
+ <developers>
+ <developer>
+ <id>hls</id>
+ <name>Howard M. Lewis Ship</name>
+ <email>[email protected]</email>
+ <url>http://howardlewisship.com</url>
+ <roles>
+ <role>Menace</role>
+ </roles>
+ <timezone>PDT</timezone>
+ </developer>
+ <developer>
+ <id>gredler</id>
+ <name>Daniel Gredler</name>
+ <email>[email protected]</email>
+ <url>http://daniel.gredler.net/</url>
+ <roles>
+ <role>Newbie</role>
+ </roles>
+ <timezone>EDT</timezone>
+ </developer>
+ <developer>
+ <id>dadams</id>
+ <name>Dan Adams</name>
+ <email>[email protected]</email>
+ <roles>
+ <role>Engineer</role>
+ </roles>
+ <timezone>EST</timezone>
+ <organization>Interactive Factory</organization>
+ <organizationUrl>http://ifactory.com</organizationUrl>
+ </developer>
+ <developer>
+ <id>kmenard</id>
+ <name>Kevin Menard</name>
+ <email>[email protected]</email>
+ <organization>Servprise International, Inc.</organization>
+ <roles>
+ <role>Developer</role>
+ </roles>
+ <timezone>-5</timezone>
+ </developer>
+ <developer>
+ <id>tedst</id>
+ <name>Ted Steen</name>
+ <email>[email protected]</email>
+ <roles>
+ <role>Developer</role>
+ </roles>
+ <timezone>+1</timezone>
+ </developer>
+ <developer>
+ <id>drobiazko</id>
+ <name>Igor Drobiazko</name>
+ <email>[email protected]</email>
+ <roles>
+ <role>Developer</role>
+ </roles>
+ <timezone>+1</timezone>
+ </developer>
+ <developer>
+ <id>robertdzeigler</id>
+ <name>Robert Zeigler</name>
+ <email>[email protected]</email>
+ <roles>
+ <role>Developer</role>
+ </roles>
+ <timezone>-6</timezone>
+ </developer>
+ <developer>
+ <id>thiagohp</id>
+ <name>Thiago H. de Paula Figueiredo</name>
+ <email>[email protected]</email>
+ <url>http://www.arsmachina.com.br/thiago</url>
+ <roles>
+ <role>Developer</role>
+ </roles>
+ <timezone>-3</timezone>
+ </developer>
+ <developer>
+ <id>uli</id>
+ <name>Ulrich Stärk</name>
+ <email>[email protected]</email>
+ <roles>
+ <role>Developer</role>
+ </roles>
+ <timezone>+1</timezone>
+ </developer>
+ <developer>
+ <id>andyhot</id>
+ <name>Andreas Andreou</name>
+ <email>[email protected]</email>
+ <url>http://blog.andyhot.gr</url>
+ <roles>
+ <role>PMC</role>
+ <role>Developer</role>
+ </roles>
+ <timezone>+2</timezone>
+ </developer>
+ </developers>
+ <ciManagement>
+ <system>hudson</system>
+ <url>http://hudson.zones.apache.org/hudson/view/Tapestry/</url>
+ </ciManagement>
+ <mailingLists>
+ <mailingList>
+ <name>Tapestry User List</name>
+ <subscribe>[email protected]</subscribe>
+ <unsubscribe>[email protected]</unsubscribe>
+
<archive>http://markmail.org/search/list:org.apache.tapestry.users</archive>
+ </mailingList>
+ <mailingList>
+ <name>Tapestry Developer List</name>
+ <subscribe>[email protected]</subscribe>
+ <unsubscribe>[email protected]</unsubscribe>
+
<archive>http://markmail.org/search/list:org.apache.tapestry.dev</archive>
+ </mailingList>
+ <mailingList>
+ <name>Tapestry Commits List</name>
+ <subscribe>[email protected]</subscribe>
+ <unsubscribe>[email protected]</unsubscribe>
+
<archive>http://markmail.org/search/list:org.apache.tapestry.commits</archive>
+ </mailingList>
+ </mailingLists>
+ <modules>
+ <module>tapestry-func</module>
+ <module>tapestry-test</module>
+ <module>tapestry-ioc</module>
+ <module>tapestry-annotations</module>
+ <module>tapestry-core</module>
+ <!-- Integrations -->
+ <module>tapestry-spring</module>
+ <module>tapestry-hibernate-core</module>
+ <module>tapestry-hibernate</module>
+ <module>tapestry-upload</module>
+ <!-- Now we're getting into the archetypes. -->
+ <module>quickstart</module>
+ <!-- And the Maven plugin. -->
+ <module>tapestry-component-report</module>
+ <!-- Tutorials -->
+ <module>tapestry-tutorial1</module>
+ <!-- Temporarily removed until 5.2
<module>tapestry-webflow</module>
-->
-
- <module>tapestry-beanvalidator</module>
-
- </modules>
-
-
- <dependencyManagement>
- <dependencies>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <version>2.5.2</version>
- <scope>test</scope>
- </dependency>
-
- <!-- Now, artifacts created by Tapestry sub-projects. -->
-
- <dependency>
- <groupId>org.apache.tapestry</groupId>
- <artifactId>tapestry-ioc</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tapestry</groupId>
- <artifactId>tapestry-core</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tapestry</groupId>
- <artifactId>tapestry-hibernate-core</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tapestry</groupId>
- <artifactId>tapestry-test</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- </dependencyManagement>
-
-
- <build>
- <pluginManagement>
-
-
- <plugins>
-
- <plugin>
- <artifactId>maven-plugin-plugin</artifactId>
- <version>2.3</version>
- </plugin>
-
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <version>2.0-beta-5</version>
- </plugin>
-
- <!-- We configure this either way, but it's only active when
the "deploy" profile is active. -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <executions>
- <execution>
- <id>sign-artifacts</id>
- <phase>verify</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptorRefs>
- <descriptorRef>bin</descriptorRef>
- <descriptorRef>src</descriptorRef>
- </descriptorRefs>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- <optimize>true</optimize>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
- <configuration>
- <suiteXmlFiles>
-
<suiteXmlFile>src/test/conf/testng.xml</suiteXmlFile>
- </suiteXmlFiles>
- <argLine>-Xmx500m</argLine>
-
<redirectTestOutputToFile>false</redirectTestOutputToFile>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <compress>true</compress>
- <index>true</index>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <!-- Will be true for profile "deploy" -->
-
<updateReleaseInfo>${update-release-info}</updateReleaseInfo>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <configuration>
- <encoding>UTF-8</encoding>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
-
<tagBase>https://svn.apache.org/repos/asf/tapestry/tapestry5/tags/releases/</tagBase>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- <profiles>
- <profile>
- <!-- Used only when cuttting a full release. Configures the
deploy plugin to mark
+ <module>tapestry-beanvalidator</module>
+ </modules>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>2.5.2</version>
+ <scope>test</scope>
+ </dependency>
+ <!-- Now, artifacts created by Tapestry sub-projects. -->
+ <dependency>
+ <groupId>org.apache.tapestry</groupId>
+ <artifactId>tapestry-ioc</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tapestry</groupId>
+ <artifactId>tapestry-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tapestry</groupId>
+ <artifactId>tapestry-hibernate-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tapestry</groupId>
+ <artifactId>tapestry-test</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <version>2.3</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>2.0-beta-5</version>
+ </plugin>
+ <!-- We configure this either way, but it's only active when the
"deploy" profile is active. -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>sign-artifacts</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptorRefs>
+ <descriptorRef>bin</descriptorRef>
+ <descriptorRef>src</descriptorRef>
+ </descriptorRefs>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ <optimize>true</optimize>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4.3</version>
+ <configuration>
+ <suiteXmlFiles>
+ <suiteXmlFile>src/test/conf/testng.xml</suiteXmlFile>
+ </suiteXmlFiles>
+ <argLine>-Xmx500m</argLine>
+ <redirectTestOutputToFile>false</redirectTestOutputToFile>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <compress>true</compress>
+ <index>true</index>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <!-- Will be true for profile "deploy" -->
+ <updateReleaseInfo>${update-release-info}</updateReleaseInfo>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+
<tagBase>https://svn.apache.org/repos/asf/tapestry/tapestry5/tags/releases/</tagBase>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ <profiles>
+ <profile>
+ <!-- Used only when cuttting a full release. Configures the deploy
plugin to mark
each artifact as a release (especially important for the archetype).
Signs each
file deployed (it actually signs way too many files and we have to
clean up a bit
once deployed). -->
- <id>deploy</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- <properties>
- <update-release-info>true</update-release-info>
- <!-- Don't re-run tests as part of the deploy build. -->
- <maven.test.skip>true</maven.test.skip>
- </properties>
- </profile>
- <!-- Only enable Javadoc as part of the output site when the javadoc
profile is active. -->
- <profile>
- <id>javadoc</id>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <!-- Version 2.3 is broken: See
http://jira.codehaus.org/browse/MJAVADOC-145 -->
- <version>2.2</version>
- <configuration>
- <linksource>true</linksource>
- <links>
-
<link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
-
<link>http://java.sun.com/j2ee/1.4/docs/api/</link>
-
<link>http://jakarta.apache.org/commons/logging/apidocs/</link>
- </links>
-
<stylesheetfile>${basedir}/src/site/resources/css/jdstyle.css</stylesheetfile>
- <aggregate>true</aggregate>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
- </profile>
-
- </profiles>
- <reporting>
+ <id>deploy</id>
+ <build>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <reportSets>
- <reportSet>
- <reports>
- <report>license</report>
- <report>scm</report>
- <report>project-team</report>
- <report>mailing-list</report>
- <report>cim</report>
- <report>issue-tracking</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ </plugin>
</plugins>
- </reporting>
-
-
- <!--
+ </build>
+ <properties>
+ <update-release-info>true</update-release-info>
+ <!-- Don't re-run tests as part of the deploy build. -->
+ <maven.test.skip>true</maven.test.skip>
+ </properties>
+ </profile>
+ <!-- Only enable Javadoc as part of the output site when the javadoc
profile is active. -->
+ <profile>
+ <id>javadoc</id>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <!-- Version 2.3 is broken: See
http://jira.codehaus.org/browse/MJAVADOC-145 -->
+ <version>2.2</version>
+ <configuration>
+ <linksource>true</linksource>
+ <links>
+ <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
+ <link>http://java.sun.com/j2ee/1.4/docs/api/</link>
+ <link>http://jakarta.apache.org/commons/logging/apidocs/</link>
+ </links>
+
<stylesheetfile>${basedir}/src/site/resources/css/jdstyle.css</stylesheetfile>
+ <aggregate>true</aggregate>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+ </profile>
+ </profiles>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>license</report>
+ <report>scm</report>
+ <report>project-team</report>
+ <report>mailing-list</report>
+ <report>cim</report>
+ <report>issue-tracking</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ </plugins>
+ </reporting>
+ <!--
Check out http://maven.apache.org/developers/committer-settings.html
to review the settings you need to have in your ~/.m2/settings.xml
-->
-
- <distributionManagement>
- <site>
- <id>tapestry</id>
-
<url>scpexe://people.apache.org/www/tapestry.apache.org/tapestry5.2-dev/</url>
- </site>
- </distributionManagement>
-
-
- <properties>
- <!-- Version 2.1 lists everything as 100% covered, weird. -->
- <cobertura-plugin-version>2.2</cobertura-plugin-version>
- <update-release-info>false</update-release-info>
- <testng-version>5.12.1</testng-version>
- </properties>
-
+ <distributionManagement>
+ <site>
+ <id>tapestry</id>
+
<url>scpexe://people.apache.org/www/tapestry.apache.org/tapestry5.2-dev/</url>
+ </site>
+ </distributionManagement>
+ <properties>
+ <!-- Version 2.1 lists everything as 100% covered, weird. -->
+ <cobertura-plugin-version>2.2</cobertura-plugin-version>
+ <update-release-info>false</update-release-info>
+ <testng-version>5.12.1</testng-version>
+ </properties>
</project>
Modified: tapestry/tapestry5/trunk/src/site/site.xml
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/src/site/site.xml?rev=950086&r1=950085&r2=950086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/src/site/site.xml (original)
+++ tapestry/tapestry5/trunk/src/site/site.xml Tue Jun 1 14:24:26 2010
@@ -62,6 +62,7 @@
<item name="tapestry5-annotations" href="tapestry5-annotations/"/>
<item name="tapestry-beanvalidator"
href="tapestry-beanvalidator/"/>
<item name="tapestry-core" href="tapestry-core/"/>
+ <item name="tapestry-func" href="tapestry-func/"/>
<item name="tapestry-hibernate" href="tapestry-hibernate/"/>
<item name="tapestry-hibernate-core"
href="tapestry-hibernate-core/"/>
<item name="tapestry-ioc" href="tapestry-ioc/"/>
Added: tapestry/tapestry5/trunk/tapestry-func/pom.xml
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-func/pom.xml?rev=950086&view=auto
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-func/pom.xml (added)
+++ tapestry/tapestry5/trunk/tapestry-func/pom.xml Tue Jun 1 14:24:26 2010
@@ -0,0 +1,78 @@
+<?xml version="1.0"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns="http://maven.apache.org/POM/4.0.0";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.tapestry</groupId>
+ <artifactId>tapestry-func</artifactId>
+ <packaging>jar</packaging>
+ <!-- This should change to tapestry-project -->
+ <parent>
+ <groupId>org.apache.tapestry</groupId>
+ <artifactId>tapestry-project</artifactId>
+ <version>5.2.0-SNAPSHOT</version>
+ </parent>
+ <name>Tapestry Functional Flows</name>
+ <description>
+ Light-weight functional programming for Flows of values.
+ </description>
+ <inceptionYear>2010</inceptionYear>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tapestry</groupId>
+ <artifactId>tapestry-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ </plugin>
+ <!-- This gets the plugin to clean up the cobertura.ser file left
+ in the root directory. -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ <version>${cobertura-plugin-version}</version>
+ <executions>
+ <execution>
+ <id>clean</id>
+ <goals>
+ <goal>clean</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>summary</report>
+ <report>dependencies</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ <!-- Version 2.1 is broken. -->
+ <version>${cobertura-plugin-version}</version>
+ </plugin>
+ </plugins>
+ </reporting>
+</project>
Propchange: tapestry/tapestry5/trunk/tapestry-func/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: tapestry/tapestry5/trunk/tapestry-func/src/test/conf/testng.xml
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-func/src/test/conf/testng.xml?rev=950086&view=auto
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-func/src/test/conf/testng.xml (added)
+++ tapestry/tapestry5/trunk/tapestry-func/src/test/conf/testng.xml Tue Jun 1
14:24:26 2010
@@ -0,0 +1,10 @@
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd";>
+<suite name="Tapestry Func">
+ <test name="Functional Programming Library">
+ <packages>
+ <!--
+ <package name="org.apache.tapestry5.func"/>
+ -->
+ </packages>
+ </test>
+</suite>
Propchange: tapestry/tapestry5/trunk/tapestry-func/src/test/conf/testng.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: tapestry/tapestry5/trunk/tapestry-ioc/pom.xml
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/pom.xml?rev=950086&r1=950085&r2=950086&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/pom.xml (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/pom.xml Tue Jun 1 14:24:26 2010
@@ -24,6 +24,12 @@
</dependency>
<dependency>
+ <groupId>org.apache.tapestry</groupId>
+ <artifactId>tapestry-func</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>javassist</groupId>
<artifactId>javassist</artifactId>
<version>3.9.0.GA</version>
