Author: craigmcc
Date: Mon Jul 24 15:03:35 2006
New Revision: 425202
URL: http://svn.apache.org/viewvc?rev=425202&view=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=425202&r1=425201&r2=425202&view=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 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>sandbox-parent</artifactId>
<groupId>org.apache.shale</groupId>
- <version>1.0.3-SNAPSHOT</version>
+ <artifactId>shale-master</artifactId>
+ <version>1-SNAPSHOT</version>
</parent>
- <groupId>org.apache.shale</groupId>
+ <groupId>org.apache.shale.extras</groupId>
<artifactId>mailreader-jpa</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0.3-SNAPSHOT</version>
<name>MailReader JPA Entity Classes</name>
<dependencies>
@@ -39,25 +41,9 @@
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
<version>1.0</version>
-<!-- Uncomment if deploying to a Java EE 5 server
<scope>provided</scope>
--->
</dependency>
- <!-- Comment out if deploying to a Java EE 5 server -->
- <dependency>
- <groupId>oracle.toplink.essentials</groupId>
- <artifactId>toplink-essentials-agent</artifactId>
- <version>1.0</version>
- </dependency>
-
- <!-- Comment out if deploying to a Java EE 5 server with a
- server provided data source -->
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>10.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=425202&r1=425201&r2=425202&view=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 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.shale</groupId>
- <artifactId>shale-tiger</artifactId>
- <version>${version}</version>
- </dependency>
<dependency>
- <groupId>org.apache.shale</groupId>
+ <groupId>org.apache.shale.extras</groupId>
<artifactId>mailreader-jpa</artifactId>
<version>${version}</version>
</dependency>
@@ -70,16 +65,6 @@
<scope>test</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>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
- <version>1.0</version>
- <scope>provided</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=425202&r1=425201&r2=425202&view=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;
-
/**
* <p>Backing bean for the <code>/mainMenu.jsp</code> view.</p>
*/
[EMAIL PROTECTED](name="mainMenu", scope=Scope.REQUEST)
-public class MainMenu extends AbstractFacesBean {
+public class MainMenu {
- /** Creates a new instance of MainMenu */
- public MainMenu() {
+
+ // ------------------------------------------------------- Public
Properties
+
+
+ /**
+ * <p>The per-user [EMAIL PROTECTED] State} instance we are associated
with. This
+ * value will be injected, based on the managed bean configuration.</p>
+ */
+ private State state = null;
+
+
+ /**
+ * <p>Return the per-user [EMAIL PROTECTED] State} instance we are
associated with.</p>
+ */
+ public State getState() {
+ return this.state;
}
-
- // ---------------------------------------------------------- Event
Handlers
+
+ /**
+ * <p>Set the per-user [EMAIL PROTECTED] State} instance we are associated
with.</p>
+ *
+ * @param state The new State instance
+ */
+ public void setState(State state) {
+ this.state = state;
+ }
+
+
+ // ------------------------------------------------------------- View
Events
/**
@@ -49,7 +68,7 @@
*/
public String logoff() {
- ((State) getBean(Constants.STATE_BEAN)).setUser(null);
+ getState().setUser(null);
return "welcome";
}
Modified:
shale/framework/trunk/shale-apps/shale-mailreader-jpa/src/main/webapp/WEB-INF/faces-config.xml
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-mailreader-jpa/src/main/webapp/WEB-INF/faces-config.xml?rev=425202&r1=425201&r2=425202&view=diff
==============================================================================
---
shale/framework/trunk/shale-apps/shale-mailreader-jpa/src/main/webapp/WEB-INF/faces-config.xml
(original)
+++
shale/framework/trunk/shale-apps/shale-mailreader-jpa/src/main/webapp/WEB-INF/faces-config.xml
Mon Jul 24 15:03:35 2006
@@ -59,6 +59,10 @@
<managed-bean-name>mainMenu</managed-bean-name>
<managed-bean-class>org.apache.shale.examples.mailreaderjpa.MainMenu</managed-bean-class>
<managed-bean-scope>request</managed-bean-scope>
+ <managed-property>
+ <property-name>state</property-name>
+ <value>#{state}</value>
+ </managed-property>
</managed-bean>
<navigation-rule>
