svn commit: r425177 [2/2] - in /shale/framework/trunk/shale-apps/shale-mailreader-jpa: ./ src/ src/main/ src/main/java/ src/main/java/org/ src/main/java/org/apache/ src/main/java/org/apache/shale/ src
Added:
shale/framework/trunk/shale-apps/shale-mailreader-jpa/src/main/resources/org/apache/shale/examples/mailreaderjpa/Bundle.properties
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-mailreader-jpa/src/main/resources/org/apache/shale/examples/mailreaderjpa/Bundle.properties?rev=425177view=auto
==
---
shale/framework/trunk/shale-apps/shale-mailreader-jpa/src/main/resources/org/apache/shale/examples/mailreaderjpa/Bundle.properties
(added)
+++
shale/framework/trunk/shale-apps/shale-mailreader-jpa/src/main/resources/org/apache/shale/examples/mailreaderjpa/Bundle.properties
Mon Jul 24 13:29:52 2006
@@ -0,0 +1,101 @@
+# Localized messages for this application
+
+button.add=Add New
+button.back=Back
+button.cancel=Cancel
+button.confirm=Confirm
+button.create=Create
+button.delete=Delete
+button.display=Display
+button.edit=Edit
+button.logon=Log On
+button.reset=Reset
+button.save=Save
+button.update=Update
+change.message=Your password has expired. Please ask the system administrator
to change it.
+change.try=Try Again
+change.title=Password Has Expired
+database.load=Cannot load database from {0}
+error.database.missing=liUser database is missing, cannot validate logon
credentials/li
+error.fromAddress.format=liInvalid format for From Address/li
+error.fromAddress.required=liFrom Address is required/li
+error.fullName.required=liFull Name is required/li
+error.host.required=liMail Server is required/li
+error.noSubscription=liNo Subscription bean in user session/li
+error.password.expired=Your password has expired for username {0}
+error.password.required=liPassword is required/li
+error.password2.required=liConfirmation password is required/li
+error.password.match=liPassword and confirmation password must match/li
+error.password.mismatch=liInvalid username and/or password, please try
again/li
+error.replyToAddress.format=liInvalid format for Reply To Address/li
+error.transaction.token=liCannot submit this form out of order/li
+error.type.invalid=liServer Type must be 'imap' or 'pop3'/li
+error.type.required=liServer Type is required/li
+error.username.required=liUsername is required/li
+error.username.unique=liThat username is already in use - please select
another/li
+errors.footer=/ulhr
+errors.header=h3font color=redValidation Error/font/h3You must
correct the following error(s) before proceeding:ul
+errors.ioException=I/O exception rendering error messages: {0}
+expired.password=User Password has expired for {0}
+heading.autoConnect=Auto
+heading.subscriptions=Current Subscriptions
+heading.host=Host Name
+heading.user=User Name
+heading.type=Server Type
+heading.action=Action
+welcome.heading=MailReader Demonstration Application Options
+welcome.logon=Log on to the MailReader Demonstration Application
+welcome.registration=Register with the MailReader Demonstration Application
+welcome.title=MailReader Demonstration Application
+index.tour=A Walking Tour of the Example Application
+linkSubscription.io=I/O Error: {0}
+linkSubscription.noSubscription=No subscription under attribute {0}
+linkUser.io=I/O Error: {0}
+linkUser.noUser=No user under attribute {0}
+logon.footer=Enter your username and password, and press the Log On button
+logon.header=Logon Form
+logon.title=MailReader Demonstration Application - Logon
+mainMenu.heading=Main Menu Options for
+mainMenu.logoff=Log off MailReader Demonstration Application
+mainMenu.registration=Edit your user registration profile
+mainMenu.title=MailReader Demonstration Application - Main Menu
+option.imap=IMAP Protocol
+option.pop3=POP3 Protocol
+prompt.autoConnect=Auto Connect:
+prompt.fromAddress=From Address:
+prompt.fullName=Full Name:
+prompt.mailHostname=Mail Server:
+prompt.mailPassword=Mail Password:
+prompt.mailServerType=Server Type:
+prompt.mailUsername=Mail Username:
+prompt.password=Password:
+prompt.password2=(Repeat) Password:
+prompt.replyToAddress=Reply To Address:
+prompt.username=Username:
+registration.addSubscription=Add
+registration.deleteSubscription=Delete
+registration.editSubscription=Edit
+registration.header.create=Enter Registration Information
+registration.header.edit=Edit Your Registration Information
+registration.title.create=Register for the MailReader Demonstration Application
+registration.title.edit=Edit Registration for the MailReader Demonstration
Application
+subscription.title.create=Create New Mail Subscription
+subscription.title.delete=Delete Existing Mail Subscription
+subscription.title.display=Display Existing Mail Subscription
+subscription.title.edit=Edit Existing Mail Subscription
+
+# Standard error messages for validator framework checks
+errors.required={0} is required.
+errors.minlength={0} cannot be less than {1} characters.
+errors.maxlength={0} cannot be greater than {1} characters.
+errors.invalid={0} is invalid.
+errors.byte={0} must be an byte.
+errors.short={0} must be an short.
svn commit: r425192 - in /shale/framework/trunk/shale-apps/mailreader-jpa: ./ src/main/java/org/apache/mailreaderjpa/ src/main/resources/META-INF/
Author: craigmcc Date: Mon Jul 24 14:41:58 2006 New Revision: 425192 URL: http://svn.apache.org/viewvc?rev=425192view=rev Log: Migrate mailreader-jpa from sandbox to framework/shale-apps so that it will be part of the normal build and release process. Added: shale/framework/trunk/shale-apps/mailreader-jpa/ - copied from r424874, shale/sandbox/mailreader-jpa/ shale/framework/trunk/shale-apps/mailreader-jpa/src/main/java/org/apache/mailreaderjpa/Protocol.java - copied unchanged from r425175, shale/sandbox/mailreader-jpa/src/main/java/org/apache/mailreaderjpa/Protocol.java shale/framework/trunk/shale-apps/mailreader-jpa/src/main/java/org/apache/mailreaderjpa/Subscription.java - copied unchanged from r425175, shale/sandbox/mailreader-jpa/src/main/java/org/apache/mailreaderjpa/Subscription.java shale/framework/trunk/shale-apps/mailreader-jpa/src/main/java/org/apache/mailreaderjpa/User.java - copied unchanged from r425175, shale/sandbox/mailreader-jpa/src/main/java/org/apache/mailreaderjpa/User.java shale/framework/trunk/shale-apps/mailreader-jpa/src/main/resources/META-INF/persistence.xml - copied unchanged from r425175, shale/sandbox/mailreader-jpa/src/main/resources/META-INF/persistence.xml
[Shale Wiki] Update of FrontPage by schof
Dear Wiki user, You have subscribed to a wiki page or wiki category on Shale Wiki for change notification. The following page has been changed by schof: http://wiki.apache.org/shale/FrontPage -- * MavenConfig * SubversionRepo * SubversionConfig + * Continuum Setup
[Shale Wiki] Update of FrontPage by schof
Dear Wiki user, You have subscribed to a wiki page or wiki category on Shale Wiki for change notification. The following page has been changed by schof: http://wiki.apache.org/shale/FrontPage -- * MavenConfig * SubversionRepo * SubversionConfig - * Continuum Setup + * ContinuumSetup
svn commit: r425202 - in /shale/framework/trunk/shale-apps: mailreader-jpa/ shale-mailreader-jpa/ shale-mailreader-jpa/src/main/java/org/apache/shale/examples/mailreaderjpa/ shale-mailreader-jpa/src/m
Author: craigmcc
Date: Mon Jul 24 15:03:35 2006
New Revision: 425202
URL: http://svn.apache.org/viewvc?rev=425202view=rev
Log:
Simplify dependencies to those actually required. Make MainMenu.java conform
to the pattern used in the other beans (inject the state property) and
remove dependence on shale-tiger. Update application POM to reflect new
artifactId/groupId for the entity classes library.
SHALE-225
Modified:
shale/framework/trunk/shale-apps/mailreader-jpa/pom.xml
shale/framework/trunk/shale-apps/shale-mailreader-jpa/pom.xml
shale/framework/trunk/shale-apps/shale-mailreader-jpa/src/main/java/org/apache/shale/examples/mailreaderjpa/MainMenu.java
shale/framework/trunk/shale-apps/shale-mailreader-jpa/src/main/webapp/WEB-INF/faces-config.xml
Modified: shale/framework/trunk/shale-apps/mailreader-jpa/pom.xml
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/mailreader-jpa/pom.xml?rev=425202r1=425201r2=425202view=diff
==
--- shale/framework/trunk/shale-apps/mailreader-jpa/pom.xml (original)
+++ shale/framework/trunk/shale-apps/mailreader-jpa/pom.xml Mon Jul 24 15:03:35
2006
@@ -24,13 +24,15 @@
modelVersion4.0.0/modelVersion
parent
-artifactIdsandbox-parent/artifactId
groupIdorg.apache.shale/groupId
-version1.0.3-SNAPSHOT/version
+artifactIdshale-master/artifactId
+version1-SNAPSHOT/version
/parent
- groupIdorg.apache.shale/groupId
+ groupIdorg.apache.shale.extras/groupId
artifactIdmailreader-jpa/artifactId
+ packagingjar/packaging
+ version1.0.3-SNAPSHOT/version
nameMailReader JPA Entity Classes/name
dependencies
@@ -39,25 +41,9 @@
groupIdjavax.persistence/groupId
artifactIdpersistence-api/artifactId
version1.0/version
-!-- Uncomment if deploying to a Java EE 5 server
scopeprovided/scope
---
/dependency
-!-- Comment out if deploying to a Java EE 5 server --
-dependency
- groupIdoracle.toplink.essentials/groupId
- artifactIdtoplink-essentials-agent/artifactId
- version1.0/version
-/dependency
-
-!-- Comment out if deploying to a Java EE 5 server with a
- server provided data source --
-dependency
- groupIdorg.apache.derby/groupId
- artifactIdderby/artifactId
- version10.1.2.1/version
-/dependency
/dependencies
Modified: shale/framework/trunk/shale-apps/shale-mailreader-jpa/pom.xml
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-mailreader-jpa/pom.xml?rev=425202r1=425201r2=425202view=diff
==
--- shale/framework/trunk/shale-apps/shale-mailreader-jpa/pom.xml (original)
+++ shale/framework/trunk/shale-apps/shale-mailreader-jpa/pom.xml Mon Jul 24
15:03:35 2006
@@ -46,14 +46,9 @@
scopetest/scope
/dependency
-dependency
-groupIdorg.apache.shale/groupId
-artifactIdshale-tiger/artifactId
-version${version}/version
-/dependency
dependency
-groupIdorg.apache.shale/groupId
+groupIdorg.apache.shale.extras/groupId
artifactIdmailreader-jpa/artifactId
version${version}/version
/dependency
@@ -70,16 +65,6 @@
scopetest/scope
/dependency
-!-- Use this when it, and corresponding javax.annotation APIs,
- are available in Maven repositories.
- In the mean time, install the Glassfish dependency below.
-dependency
-groupIdjavax.persistence/groupId
-artifactIdpersistence-api/artifactId
-version1.0/version
-scopeprovided/scope
-/dependency
---
!-- FIXME - replace by individual dependencies on the required APIs
when they are available. Also, consider how to build a profile
Modified:
shale/framework/trunk/shale-apps/shale-mailreader-jpa/src/main/java/org/apache/shale/examples/mailreaderjpa/MainMenu.java
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-mailreader-jpa/src/main/java/org/apache/shale/examples/mailreaderjpa/MainMenu.java?rev=425202r1=425201r2=425202view=diff
==
---
shale/framework/trunk/shale-apps/shale-mailreader-jpa/src/main/java/org/apache/shale/examples/mailreaderjpa/MainMenu.java
(original)
+++
shale/framework/trunk/shale-apps/shale-mailreader-jpa/src/main/java/org/apache/shale/examples/mailreaderjpa/MainMenu.java
Mon Jul 24 15:03:35 2006
@@ -16,22 +16,41 @@
package org.apache.shale.examples.mailreaderjpa;
-import org.apache.shale.tiger.managed.Bean;
-import org.apache.shale.tiger.managed.Scope;
-import org.apache.shale.view.AbstractFacesBean;
-
/**
* pBacking bean for the code/mainMenu.jsp/code view./p
*/
[EMAIL PROTECTED](name=mainMenu, scope=Scope.REQUEST)
-public class
svn commit: r425271 - in /shale/framework/trunk/shale-clay/src/main/java/org/apache/shale/clay: component/Clay.java config/ClayTemplateParser.java config/beans/ComponentConfigBean.java config/beans/Te
Author: gvanmatre
Date: Mon Jul 24 21:34:13 2006
New Revision: 425271
URL: http://svn.apache.org/viewvc?rev=425271view=rev
Log:
A few more checkstyle fixes
Modified:
shale/framework/trunk/shale-clay/src/main/java/org/apache/shale/clay/component/Clay.java
shale/framework/trunk/shale-clay/src/main/java/org/apache/shale/clay/config/ClayTemplateParser.java
shale/framework/trunk/shale-clay/src/main/java/org/apache/shale/clay/config/beans/ComponentConfigBean.java
shale/framework/trunk/shale-clay/src/main/java/org/apache/shale/clay/config/beans/TemplateConfigBean.java
shale/framework/trunk/shale-clay/src/main/java/org/apache/shale/clay/config/beans/ValidatorBean.java
Modified:
shale/framework/trunk/shale-clay/src/main/java/org/apache/shale/clay/component/Clay.java
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-clay/src/main/java/org/apache/shale/clay/component/Clay.java?rev=425271r1=425270r2=425271view=diff
==
---
shale/framework/trunk/shale-clay/src/main/java/org/apache/shale/clay/component/Clay.java
(original)
+++
shale/framework/trunk/shale-clay/src/main/java/org/apache/shale/clay/component/Clay.java
Mon Jul 24 21:34:13 2006
@@ -496,13 +496,19 @@
*/
public void restoreState(FacesContext context, Object obj) {
+final int superState = 0;
+final int jsfidState = 1;
+final int shapeValidatorState = 2;
+final int displayElementState = 3;
+final int symbolsState = 4;
+
Object[] aobj = (Object[]) obj;
-super.restoreState(context, aobj[0]);
+super.restoreState(context, aobj[superState]);
-jsfid = ((String) aobj[1]);
-shapeValidator = ((String) aobj[2]);
-displayElementRoot = ((ComponentBean) aobj[3]);
-symbols = ((Map) aobj[4]);
+jsfid = ((String) aobj[jsfidState]);
+shapeValidator = ((String) aobj[shapeValidatorState]);
+displayElementRoot = ((ComponentBean) aobj[displayElementState]);
+symbols = ((Map) aobj[symbolsState]);
}
@@ -516,12 +522,19 @@
* @return subtree state
*/
public Object saveState(FacesContext context) {
-Object[] aobj = new Object[5];
-aobj[0] = super.saveState(context);
-aobj[1] = jsfid;
-aobj[2] = shapeValidator;
-aobj[3] = displayElementRoot;
-aobj[4] = symbols;
+final int superState = 0;
+final int jsfidState = 1;
+final int shapeValidatorState = 2;
+final int displayElementState = 3;
+final int symbolsState = 4;
+final int size = 5;
+
+Object[] aobj = new Object[size];
+aobj[superState] = super.saveState(context);
+aobj[jsfidState] = jsfid;
+aobj[shapeValidatorState] = shapeValidator;
+aobj[displayElementState] = displayElementRoot;
+aobj[symbolsState] = symbols;
return aobj;
}
Modified:
shale/framework/trunk/shale-clay/src/main/java/org/apache/shale/clay/config/ClayTemplateParser.java
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-clay/src/main/java/org/apache/shale/clay/config/ClayTemplateParser.java?rev=425271r1=425270r2=425271view=diff
==
---
shale/framework/trunk/shale-clay/src/main/java/org/apache/shale/clay/config/ClayTemplateParser.java
(original)
+++
shale/framework/trunk/shale-clay/src/main/java/org/apache/shale/clay/config/ClayTemplateParser.java
Mon Jul 24 21:34:13 2006
@@ -110,7 +110,7 @@
*jsfid
* @exception SAXException
*XML parse error
- * @exception IOException
+ * @exception IOException
*XML parse error
*/
public void loadConfigFile(URL templateURL, String templateName)
Modified:
shale/framework/trunk/shale-clay/src/main/java/org/apache/shale/clay/config/beans/ComponentConfigBean.java
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-clay/src/main/java/org/apache/shale/clay/config/beans/ComponentConfigBean.java?rev=425271r1=425270r2=425271view=diff
==
---
shale/framework/trunk/shale-clay/src/main/java/org/apache/shale/clay/config/beans/ComponentConfigBean.java
(original)
+++
shale/framework/trunk/shale-clay/src/main/java/org/apache/shale/clay/config/beans/ComponentConfigBean.java
Mon Jul 24 21:34:13 2006
@@ -264,7 +264,9 @@
try {
if (i -1) {
for (Enumeration ui =
classloader.getResources(configFile.toString());
- ui.hasMoreElements(); urls.add(ui.nextElement()));
+ ui.hasMoreElements();) {
+ urls.add(ui.nextElement());
+ }
} else {
URL url =
svn commit: r425275 - /shale/maven/trunk/etc/buildShaleNightlyMaven.sh
Author: craigmcc Date: Mon Jul 24 21:42:22 2006 New Revision: 425275 URL: http://svn.apache.org/viewvc?rev=425275view=rev Log: Update to the version that is running on the myfaces.zones.apache.org server. Modified: shale/maven/trunk/etc/buildShaleNightlyMaven.sh Modified: shale/maven/trunk/etc/buildShaleNightlyMaven.sh URL: http://svn.apache.org/viewvc/shale/maven/trunk/etc/buildShaleNightlyMaven.sh?rev=425275r1=425274r2=425275view=diff == --- shale/maven/trunk/etc/buildShaleNightlyMaven.sh (original) +++ shale/maven/trunk/etc/buildShaleNightlyMaven.sh Mon Jul 24 21:42:22 2006 @@ -1,41 +1,48 @@ -#!/bin/sh -# == -# buildShaleNightlyMaven -- Shale Nightly Builds (with Maven) -# == +#!/usr/bin/bash +# = +# buildShaleNightly -- Shale Nightly Builds +# = -# == +# = # Setup -# == +# = -export BUILD_HOME=/home/craigmcc/Build +export BUILD_HOME=/export/home/craigmcc/Build/shale/current export CLASSPATH=. export TSTAMP=`date +%Y%m%d` echo \html\ echo \head\ -echo \title\Shale Nightly Build \(with Maven\) For $TSTAMP\/title\ +echo \title\Shale Nightly Build For $TSTAMP\/title\ echo \/head\ echo \body\ -echo \h1\Shale Nightly Build \(with Maven\) For $TSTAMP\/h1\ +echo \h1\Shale Nightly Build For $TSTAMP\/h1\ -# == + +# = # Update From Subversion Repository -# == +# = echo \h2\Update From Subversion Repository\/h2\ -cd $BUILD_HOME/struts/current/shale +cd $BUILD_HOME echo \pre\ svn update echo \/pre\ -# == -# Build and Deploy Framework Artifaces -# == +# = +# Build and Deploy Framework Artifacts +# = + +echo \h2\Install and Deploy Master POM\/h2\ +cd $BUILD_HOME/maven/master-pom +echo \pre\ +mvn install deploy +echo \/pre\ echo \h2\Build and Deploy Framework Artifacts\/h2\ -cd $BUILD_HOME/struts/current/shale +cd $BUILD_HOME/framework echo \pre\ -mvn clean site install deploy +mvn clean install site deploy cd shale-apps mvn deploy -N @@ -44,43 +51,48 @@ cd shale-dist mvn assembly:assembly scp target/assembly/out/shale-framework-*.tar.gz \ - [EMAIL PROTECTED]:/www/cvs.apache.org/builds/struts/shale/shale-framework-$TSTAMP.tar.gz + [EMAIL PROTECTED]:/www/people.apache.org/builds/shale/nightly/shale-framework-$TSTAMP.tar.gz scp target/assembly/out/shale-framework-*.zip \ - [EMAIL PROTECTED]:/www/cvs.apache.org/builds/struts/shale/shale-framework-$TSTAMP.zip + [EMAIL PROTECTED]:/www/people.apache.org/builds/shale/nightly/shale-framework-$TSTAMP.zip cd .. echo \/pre\ -# == +# = # Build and Deploy Sample Application Artifacts -# == +# = echo \h2\Build and Deploy Sample Application Artifacts\/h2\ -cd $BUILD_HOME/struts/current/shale/shale-apps +cd $BUILD_HOME/framework/shale-apps export APPS=shale-blank shale-clay-usecases shale-mailreader export APPS=$APPS shale-sql-browser shale-usecases +export APPS=$APPS mailreader-jpa shale-mailreader-jpa for APP in $APPS; do cd $APP - echo \h3\Processing sample application $APP\/h3\ + echo \h3\Processing Sample Applicaton $APP\/h3\ echo \pre\ mvn clean install deploy assembly:assembly scp target/$APP-*.tar.gz \ - [EMAIL PROTECTED]:/www/cvs.apache.org/builds/struts/shale/$APP-$TSTAMP.tar.gz + [EMAIL PROTECTED]:/www/people.apache.org/builds/shale/nightly/$APP-$TSTAMP.tar.gz scp target/$APP-*.zip \ - [EMAIL PROTECTED]:/www/cvs.apache.org/builds/struts/shale/$APP-$TSTAMP.zip + [EMAIL
