Author: gvanmatre
Date: Fri Sep 1 22:32:42 2006
New Revision: 439538
URL: http://svn.apache.org/viewvc?rev=439538&view=rev
Log:
Few small tweaks to the clay mail reader.
Modified:
shale/sandbox/shale-clay-mailreader/pom.xml
shale/sandbox/shale-clay-mailreader/src/main/webapp/pages/mainMenu_nsjsp.html
shale/sandbox/shale-clay-mailreader/src/main/webapp/pages/registration_nsjsp.html
shale/sandbox/shale-clay-mailreader/src/main/webapp/pages/subscription_nsjsp.html
Modified: shale/sandbox/shale-clay-mailreader/pom.xml
URL:
http://svn.apache.org/viewvc/shale/sandbox/shale-clay-mailreader/pom.xml?rev=439538&r1=439537&r2=439538&view=diff
==============================================================================
--- shale/sandbox/shale-clay-mailreader/pom.xml (original)
+++ shale/sandbox/shale-clay-mailreader/pom.xml Fri Sep 1 22:32:42 2006
@@ -20,13 +20,14 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.shale</groupId>
+ <artifactId>shale-parent</artifactId>
+ <version>1.0.4-SNAPSHOT</version>
+ </parent>
- <parent>
- <groupId>org.apache.shale</groupId>
- <artifactId>shale-apps-parent</artifactId>
- <version>1.0.3-SNAPSHOT</version>
- </parent>
<artifactId>shale-clay-mailreader</artifactId>
<packaging>war</packaging>
@@ -44,19 +45,19 @@
<dependency>
<groupId>org.apache.shale</groupId>
<artifactId>shale-clay</artifactId>
- <version>${version}</version>
+ <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.shale</groupId>
<artifactId>shale-core</artifactId>
- <version>${version}</version>
+ <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.shale</groupId>
<artifactId>shale-test</artifactId>
- <version>${version}</version>
+ <version>${pom.version}</version>
<scope>test</scope>
</dependency>
@@ -128,6 +129,7 @@
</dependencies>
<build>
+ <finalName>${artifactId}</finalName>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
@@ -147,6 +149,25 @@
</excludes>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-maven2-plugin</artifactId>
+ <configuration>
+ <container>
+ <containerId>tomcat5x</containerId>
+ <home>${cargo.tomcat5x.home}</home>
+ <log>${project.build.directory}/tomcat5x.log</log>
+
<output>${project.build.directory}/tomcat5x.out</output>
+ </container>
+ <configuration>
+ <home>${project.build.directory}/tomcat5x</home>
+ <properties>
+ <cargo.jvmargs> -Xdebug
-Xrunjdwp:server=y,transport=dt_socket,address=8000,suspend=n </cargo.jvmargs>
+ </properties>
+ </configuration>
+ </configuration>
+ </plugin>
+
</plugins>
</build>
Modified:
shale/sandbox/shale-clay-mailreader/src/main/webapp/pages/mainMenu_nsjsp.html
URL:
http://svn.apache.org/viewvc/shale/sandbox/shale-clay-mailreader/src/main/webapp/pages/mainMenu_nsjsp.html?rev=439538&r1=439537&r2=439538&view=diff
==============================================================================
---
shale/sandbox/shale-clay-mailreader/src/main/webapp/pages/mainMenu_nsjsp.html
(original)
+++
shale/sandbox/shale-clay-mailreader/src/main/webapp/pages/mainMenu_nsjsp.html
Fri Sep 1 22:32:42 2006
@@ -9,12 +9,12 @@
<t:panelGrid columns="1">
<f:facet name="header">
- <span>
+ <t:panelGroup>
<t:outputText
value="#{messages['mainMenu.heading']}"/>
<t:outputText
value="#{state.user.username}"/>
- </span>
+ </t:panelGroup>
</f:facet>
<t:commandLink id="edit"
Modified:
shale/sandbox/shale-clay-mailreader/src/main/webapp/pages/registration_nsjsp.html
URL:
http://svn.apache.org/viewvc/shale/sandbox/shale-clay-mailreader/src/main/webapp/pages/registration_nsjsp.html?rev=439538&r1=439537&r2=439538&view=diff
==============================================================================
---
shale/sandbox/shale-clay-mailreader/src/main/webapp/pages/registration_nsjsp.html
(original)
+++
shale/sandbox/shale-clay-mailreader/src/main/webapp/pages/registration_nsjsp.html
Fri Sep 1 22:32:42 2006
@@ -10,14 +10,14 @@
<t:panelGrid columns="3">
<f:facet name="header">
- <span>
+ <t:panelGroup>
<t:outputText
value="#{messages['registration.header.create']}"
rendered="#{state.mode == 'CREATE'}"/>
<t:outputText
value="#{messages['registration.header.edit']}"
rendered="#{state.mode == 'EDIT'}"/>
- </span>
+ </t:panelGroup>
</f:facet>
<t:outputLabel for="username"
Modified:
shale/sandbox/shale-clay-mailreader/src/main/webapp/pages/subscription_nsjsp.html
URL:
http://svn.apache.org/viewvc/shale/sandbox/shale-clay-mailreader/src/main/webapp/pages/subscription_nsjsp.html?rev=439538&r1=439537&r2=439538&view=diff
==============================================================================
---
shale/sandbox/shale-clay-mailreader/src/main/webapp/pages/subscription_nsjsp.html
(original)
+++
shale/sandbox/shale-clay-mailreader/src/main/webapp/pages/subscription_nsjsp.html
Fri Sep 1 22:32:42 2006
@@ -9,7 +9,7 @@
<t:panelGrid columns="3">
<f:facet name="header">
- <span>
+ <t:panelGroup>
<t:outputText
value="#{messages['subscription.title.create']}"
rendered="#{state.mode == 'CREATE'}"/>
@@ -19,7 +19,7 @@
<t:outputText
value="#{messages['subscription.title.edit']}"
rendered="#{state.mode == 'EDIT'}"/>
- </span>
+ </t:panelGroup>
</f:facet>
<t:outputLabel for="user">
