Author: craigmcc
Date: Mon Jul 24 15:26:49 2006
New Revision: 425207

URL: http://svn.apache.org/viewvc?rev=425207&view=rev
Log:
With the simplified dependencies, we no longer need a manuall installed
JAR file from Glassfish in the local Maven repository.  Therefore, enable
building mailreader-jpa and shale-mailreader-jpa as part of the standard
build (assuming that JDK 1.5 is available, of course).

SHALE-225

Modified:
    shale/framework/trunk/shale-apps/mailreader-jpa/pom.xml
    shale/framework/trunk/shale-apps/pom.xml
    shale/framework/trunk/shale-apps/shale-mailreader-jpa/README.txt
    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

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=425207&r1=425206&r2=425207&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:26:49 
2006
@@ -43,7 +43,6 @@
       <version>1.0</version>
       <scope>provided</scope>
     </dependency>
-
         
   </dependencies>
 

Modified: shale/framework/trunk/shale-apps/pom.xml
URL: 
http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/pom.xml?rev=425207&r1=425206&r2=425207&view=diff
==============================================================================
--- shale/framework/trunk/shale-apps/pom.xml (original)
+++ shale/framework/trunk/shale-apps/pom.xml Mon Jul 24 15:26:49 2006
@@ -58,6 +58,8 @@
                 <jdk>1.5</jdk>
             </activation>
             <modules>
+                <module>mailreader-jpa</module>
+                <module>shale-mailreader-jpa</module>
                 <module>shale-sql-browser</module>
             </modules>
         </profile>

Modified: shale/framework/trunk/shale-apps/shale-mailreader-jpa/README.txt
URL: 
http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-mailreader-jpa/README.txt?rev=425207&r1=425206&r2=425207&view=diff
==============================================================================
--- shale/framework/trunk/shale-apps/shale-mailreader-jpa/README.txt (original)
+++ shale/framework/trunk/shale-apps/shale-mailreader-jpa/README.txt Mon Jul 24 
15:26:49 2006
@@ -10,34 +10,17 @@
 
 As currently implemented, this application will deploy *only* to a Java EE 5 
container (such as
 Glassfish at java.net), which you will have needed to deploy on your system 
already.  In addition,
-there are some manual steps required to configure a build environment, as well 
as to configure a
-runtime environment for the database to be used.
+there are some manual steps required to configure the runtime environment for 
the database to be used.
 
-(2) CONFIGURING A BUILD ENVIRONMENT
+(2) INSTALLING GLASSFISH
 
-As with all other Shale examples, Maven 2 is used to build this application.  
Maven will take care of
-automatically downloading most dependencies, but there is one dependency you 
must deploy to your
-local Maven 2 repository first, in order to rebuild it.
+In order to run the resulting application, download and install a copy of 
Glassfish from
+<https://glassfish.dev.java.net>, following the setup directions found there.  
Use a
+recent build from either the "v1" or "v2" series.  In the instructions below,
+$GLASSFISH_HOME stands for the directory into which you installed Glassfish.
 
-* Download and install a copy of Glassfish from 
<https://glassfish.dev.java.net/>.
-  In the instructions below, $GLASSFISH_HOME stands for the directory into 
which you
-  installed Glassfish.  (Use the latest build in either the v1 or v2 series.)
 
-* Add the specified library to your local Maven repository, by executing the 
following
-  command from the command line (all as one command ... the "\" at the end of 
each line
-  is the standard Unix shell syntax for a line continuation):
-
-              mvn install:install-file -DgroupId=javaee \
-                -DartifactId=javaee \
-                -Dversion=5.0 \
-                -Dpackaging=jar \
-                -Dfile=$GLASSFISH_HOME/lib/javaee.jar \
-                -DgeneratePom=true
-
-Now, you will be able to build or rebuild this application, in the usual way, 
by executing
-"mvn clean install" from the top level directory.
-
-(3) CONFIGURING A RUNTIME ENVIRONMENT
+(3) CONFIGURING THE RUNTIME ENVIRONMENT
 
 The sample application utilizes a JPA persistence unit that uses a JDBC data 
source named
 "jdbc/mailreader".  Before you can successfully deploy the application for the 
first time,

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=425207&r1=425206&r2=425207&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:26:49 2006
@@ -65,40 +65,10 @@
             <scope>test</scope>
         </dependency>
 
-
-<!-- FIXME - replace by individual dependencies on the required APIs
-     when they are available.  Also, consider how to build a profile
-     where the dependencies are "provided" (i.e. you are deploying to
-     a Java EE 5 container like Glassfish) versus where you have to
-     include them all for deployment to something like Tomcat 5.x. -->
-
-        <!-- Dependencies from Glassfish (Build 48 or later) -->
-
-        <!--
-          You will need to download this version from:
-
-            https://glassfish.dev.java.net/
-
-          and perform local installations into your Maven2 repository,
-          as described in the comments below for each dependency.  In
-          those comments, replace $GLASSFISH_HOME with the directory into
-          which you installed Glassfish.
-        -->
-
         <dependency>
-            <!-- Install this dependency by executing:
-
-              mvn install:install-file -DgroupId=javaee \
-                -DartifactId=javaee \
-                -Dversion=5.0 \
-                -Dpackaging=jar \
-                -Dfile=$GLASSFISH_HOME/lib/javaee.jar \
-                -DgeneratePom=true
-
-            -->
-            <groupId>javaee</groupId>
-            <artifactId>javaee</artifactId>
-            <version>5.0</version>
+            <groupId>javax.persistence</groupId>
+            <artifactId>persistence-api</artifactId>
+            <version>1.0</version>
             <scope>provided</scope>
         </dependency>
 

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=425207&r1=425206&r2=425207&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:26:49 2006
@@ -20,7 +20,7 @@
  * <p>Backing bean for the <code>/mainMenu.jsp</code> view.</p>
  */
 public class MainMenu {
-    
+
 
     // ------------------------------------------------------- Public 
Properties
 


Reply via email to