Author: jkuhnert
Date: Sun Dec 17 15:46:54 2006
New Revision: 488079
URL: http://svn.apache.org/viewvc?view=rev&rev=488079
Log:
Created better assembly descriptors, fixed another unit test.
Added:
tapestry/tapestry4/trunk/src/main/assembly/project.xml (with props)
Modified:
tapestry/tapestry4/trunk/pom.xml
tapestry/tapestry4/trunk/src/main/assembly/dep.xml
tapestry/tapestry4/trunk/tapestry-annotations/pom.xml
tapestry/tapestry4/trunk/tapestry-contrib/pom.xml
tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/pom.xml
tapestry/tapestry4/trunk/tapestry-examples/Vlib/pom.xml
tapestry/tapestry4/trunk/tapestry-examples/VlibBeans/pom.xml
tapestry/tapestry4/trunk/tapestry-examples/Workbench/pom.xml
tapestry/tapestry4/trunk/tapestry-examples/pom.xml
tapestry/tapestry4/trunk/tapestry-framework/pom.xml
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/TestAssetService.java
tapestry/tapestry4/trunk/tapestry-portlet/pom.xml
Modified: tapestry/tapestry4/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/pom.xml?view=diff&rev=488079&r1=488078&r2=488079
==============================================================================
--- tapestry/tapestry4/trunk/pom.xml (original)
+++ tapestry/tapestry4/trunk/pom.xml Sun Dec 17 15:46:54 2006
@@ -4,7 +4,7 @@
<groupId>org.apache.tapestry</groupId>
<artifactId>tapestry-project</artifactId>
<packaging>pom</packaging>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
<description>Java Web Application Framework</description>
<name>Tapestry</name>
<inceptionYear>2006</inceptionYear>
@@ -349,6 +349,7 @@
<configuration>
<descriptors>
<descriptor>src/main/assembly/dep.xml</descriptor>
+
<descriptor>src/main/assembly/project.xml</descriptor>
</descriptors>
</configuration>
</plugin>
Modified: tapestry/tapestry4/trunk/src/main/assembly/dep.xml
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/src/main/assembly/dep.xml?view=diff&rev=488079&r1=488078&r2=488079
==============================================================================
--- tapestry/tapestry4/trunk/src/main/assembly/dep.xml (original)
+++ tapestry/tapestry4/trunk/src/main/assembly/dep.xml Sun Dec 17 15:46:54 2006
@@ -36,9 +36,6 @@
<includeDependencies>true</includeDependencies>
<unpack>false</unpack>
</binaries>
- <sources>
- <outputDirectory>sources/${artifactId}</outputDirectory>
- </sources>
</moduleSet>
</moduleSets>
</assembly>
Added: tapestry/tapestry4/trunk/src/main/assembly/project.xml
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/src/main/assembly/project.xml?view=auto&rev=488079
==============================================================================
--- tapestry/tapestry4/trunk/src/main/assembly/project.xml (added)
+++ tapestry/tapestry4/trunk/src/main/assembly/project.xml Sun Dec 17 15:46:54
2006
@@ -0,0 +1,30 @@
+<assembly>
+ <id>project</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>tar.bz2</format>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>.</directory>
+ <outputDirectory></outputDirectory>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <excludes>
+ <exclude>**/target/**</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
+ <moduleSets>
+ <moduleSet>
+ <includes>
+ <include>org.apache.tapestry:tapestry-annotations</include>
+ <include>org.apache.tapestry:tapestry-contrib</include>
+ <include>org.apache.tapestry:tapestry-examples</include>
+ <include>org.apache.tapestry:tapestry-framework</include>
+ <include>org.apache.tapestry:tapestry-portlet</include>
+ </includes>
+ </moduleSet>
+ </moduleSets>
+</assembly>
Propchange: tapestry/tapestry4/trunk/src/main/assembly/project.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: tapestry/tapestry4/trunk/tapestry-annotations/pom.xml
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-annotations/pom.xml?view=diff&rev=488079&r1=488078&r2=488079
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-annotations/pom.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-annotations/pom.xml Sun Dec 17 15:46:54
2006
@@ -4,12 +4,12 @@
<groupId>org.apache.tapestry</groupId>
<artifactId>tapestry-annotations</artifactId>
<packaging>jar</packaging>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
<!-- This should change to tapestry-project -->
<parent>
<groupId>org.apache.tapestry</groupId>
<artifactId>tapestry-project</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</parent>
<name>Annotations</name>
<inceptionYear>2006</inceptionYear>
@@ -18,7 +18,7 @@
<dependency>
<groupId>org.apache.tapestry</groupId>
<artifactId>tapestry-framework</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</dependency>
<dependency>
<groupId>hivemind</groupId>
Modified: tapestry/tapestry4/trunk/tapestry-contrib/pom.xml
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-contrib/pom.xml?view=diff&rev=488079&r1=488078&r2=488079
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-contrib/pom.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-contrib/pom.xml Sun Dec 17 15:46:54 2006
@@ -5,12 +5,12 @@
<groupId>org.apache.tapestry</groupId>
<artifactId>tapestry-contrib</artifactId>
<packaging>jar</packaging>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
<!-- This should change to tapestry-project -->
<parent>
<groupId>org.apache.tapestry</groupId>
<artifactId>tapestry-project</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</parent>
<name>Contrib</name>
<inceptionYear>2006</inceptionYear>
@@ -19,7 +19,7 @@
<dependency>
<groupId>org.apache.tapestry</groupId>
<artifactId>tapestry-framework</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</dependency>
<dependency>
<groupId>jboss</groupId>
Modified: tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/pom.xml
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/pom.xml?view=diff&rev=488079&r1=488078&r2=488079
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/pom.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/pom.xml Sun Dec 17
15:46:54 2006
@@ -4,12 +4,12 @@
<groupId>org.apache.tapestry</groupId>
<artifactId>tapestry-TimeTracker</artifactId>
<packaging>war</packaging>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
<!-- This should change to tapestry-project -->
<parent>
<groupId>org.apache.tapestry</groupId>
<artifactId>tapestry-examples</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</parent>
<name>Tapestry Time Tracker</name>
<inceptionYear>2006</inceptionYear>
Modified: tapestry/tapestry4/trunk/tapestry-examples/Vlib/pom.xml
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-examples/Vlib/pom.xml?view=diff&rev=488079&r1=488078&r2=488079
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-examples/Vlib/pom.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-examples/Vlib/pom.xml Sun Dec 17 15:46:54
2006
@@ -5,12 +5,12 @@
<groupId>org.apache.tapestry</groupId>
<artifactId>tapestry-Vlib</artifactId>
<packaging>jar</packaging>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
<!-- This should change to tapestry-project -->
<parent>
<groupId>org.apache.tapestry</groupId>
<artifactId>tapestry-examples</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</parent>
<name>Tapestry Virtual Library</name>
<inceptionYear>2006</inceptionYear>
@@ -32,7 +32,7 @@
<dependency>
<groupId>org.apache.tapestry</groupId>
<artifactId>tapestry-VlibBeans</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</dependency>
<dependency>
<groupId>hivemind</groupId>
Modified: tapestry/tapestry4/trunk/tapestry-examples/VlibBeans/pom.xml
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-examples/VlibBeans/pom.xml?view=diff&rev=488079&r1=488078&r2=488079
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-examples/VlibBeans/pom.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-examples/VlibBeans/pom.xml Sun Dec 17
15:46:54 2006
@@ -5,12 +5,12 @@
<groupId>org.apache.tapestry</groupId>
<artifactId>tapestry-VlibBeans</artifactId>
<packaging>jar</packaging>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
<!-- This should change to tapestry-project -->
<parent>
<groupId>org.apache.tapestry</groupId>
<artifactId>tapestry-examples</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</parent>
<name>Tapestry Virtual Library (Beans)</name>
<inceptionYear>2006</inceptionYear>
Modified: tapestry/tapestry4/trunk/tapestry-examples/Workbench/pom.xml
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-examples/Workbench/pom.xml?view=diff&rev=488079&r1=488078&r2=488079
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-examples/Workbench/pom.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-examples/Workbench/pom.xml Sun Dec 17
15:46:54 2006
@@ -4,13 +4,13 @@
<groupId>org.apache.tapestry</groupId>
<artifactId>tapestry-Workbench</artifactId>
<packaging>war</packaging>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
<!-- This should change to tapestry-project -->
<parent>
<groupId>org.apache.tapestry</groupId>
<artifactId>tapestry-examples</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</parent>
<name>Tapestry Workbench</name>
Modified: tapestry/tapestry4/trunk/tapestry-examples/pom.xml
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-examples/pom.xml?view=diff&rev=488079&r1=488078&r2=488079
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-examples/pom.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-examples/pom.xml Sun Dec 17 15:46:54 2006
@@ -4,12 +4,12 @@
<groupId>org.apache.tapestry</groupId>
<artifactId>tapestry-examples</artifactId>
<packaging>pom</packaging>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
<!-- This should change to tapestry-project -->
<parent>
<groupId>org.apache.tapestry</groupId>
<artifactId>tapestry-project</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</parent>
<name>Examples</name>
<inceptionYear>2006</inceptionYear>
@@ -26,17 +26,17 @@
<dependency>
<groupId>org.apache.tapestry</groupId>
<artifactId>tapestry-framework</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</dependency>
<dependency>
<groupId>org.apache.tapestry</groupId>
<artifactId>tapestry-annotations</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</dependency>
<dependency>
<groupId>org.apache.tapestry</groupId>
<artifactId>tapestry-contrib</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</dependency>
</dependencies>
</dependencyManagement>
Modified: tapestry/tapestry4/trunk/tapestry-framework/pom.xml
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/pom.xml?view=diff&rev=488079&r1=488078&r2=488079
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/pom.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/pom.xml Sun Dec 17 15:46:54 2006
@@ -4,12 +4,12 @@
<groupId>org.apache.tapestry</groupId>
<artifactId>tapestry-framework</artifactId>
<packaging>jar</packaging>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
<!-- This should change to tapestry-project -->
<parent>
<groupId>org.apache.tapestry</groupId>
<artifactId>tapestry-project</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</parent>
<name>Tapestry Core Library - ${version}</name>
<inceptionYear>2006</inceptionYear>
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/TestAssetService.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/TestAssetService.java?view=diff&rev=488079&r1=488078&r2=488079
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/TestAssetService.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/TestAssetService.java
Sun Dec 17 15:46:54 2006
@@ -31,7 +31,7 @@
*
* @author jkuhnert
*/
[EMAIL PROTECTED]
[EMAIL PROTECTED](sequential=true)
public class TestAssetService extends TestBase
{
Modified: tapestry/tapestry4/trunk/tapestry-portlet/pom.xml
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-portlet/pom.xml?view=diff&rev=488079&r1=488078&r2=488079
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-portlet/pom.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-portlet/pom.xml Sun Dec 17 15:46:54 2006
@@ -3,21 +3,21 @@
<parent>
<groupId>org.apache.tapestry</groupId>
<artifactId>tapestry-project</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.tapestry</groupId>
<artifactId>tapestry-portlet</artifactId>
<name>Portlet</name>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
<inceptionYear>2006</inceptionYear>
<dependencies>
<dependency>
<groupId>org.apache.tapestry</groupId>
<artifactId>tapestry-framework</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.1</version>
</dependency>
<dependency>
<groupId>hivemind</groupId>
@@ -39,6 +39,12 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.portlet</groupId>
+ <artifactId>portlet-api</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
