geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From viol...@apache.org
Subject svn commit: r1078686 [2/6] - in /geronimo/samples/trunk: ./ geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ear/src/main/resources/META-INF/ geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ejb/src/main/...
Date Mon, 07 Mar 2011 05:17:15 GMT
Modified: geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/core/DataCDInfoLocal.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/core/DataCDInfoLocal.java?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/core/DataCDInfoLocal.java (original)
+++ geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/core/DataCDInfoLocal.java Mon Mar  7 05:17:11 2011
@@ -28,15 +28,15 @@ import org.apache.geronimo.samples.datac
 
 @Local
 public interface DataCDInfoLocal {
-	public OwnerBean login(String username, String passwd) throws InvalidOwnerException, IncorrectPasswordException;
-	public void logout(String username);
-	public OwnerBean register(String username, String passwd) throws InvalidOwnerException, InvalidPasswordException;
-	public boolean unregister(String username);
-	
-	public Collection<DataCDBean> listCDs(String ownername);
-	public DataCDBean addCD(String ownername, String cdlabel, Integer cdsize, String cddesc, Date cdarchivedate) throws DuplicatedDataCDException, InvalidOwnerException;
-	public DataCDBean updateCD(Integer cdid, Integer cdsize, String cddesc, Date cdarchivedate);
-	public boolean removeCD(Integer cdid);
-	public OwnerBean refreshCDInfo(String ownername);
+    public OwnerBean login(String username, String passwd) throws InvalidOwnerException, IncorrectPasswordException;
+    public void logout(String username);
+    public OwnerBean register(String username, String passwd) throws InvalidOwnerException, InvalidPasswordException;
+    public boolean unregister(String username);
+    
+    public Collection<DataCDBean> listCDs(String ownername);
+    public DataCDBean addCD(String ownername, String cdlabel, Integer cdsize, String cddesc, Date cdarchivedate) throws DuplicatedDataCDException, InvalidOwnerException;
+    public DataCDBean updateCD(Integer cdid, Integer cdsize, String cddesc, Date cdarchivedate);
+    public boolean removeCD(Integer cdid);
+    public OwnerBean refreshCDInfo(String ownername);
 
 }

Modified: geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/core/DataCDInfoRemote.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/core/DataCDInfoRemote.java?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/core/DataCDInfoRemote.java (original)
+++ geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/core/DataCDInfoRemote.java Mon Mar  7 05:17:11 2011
@@ -28,15 +28,15 @@ import org.apache.geronimo.samples.datac
 
 @Remote
 public interface DataCDInfoRemote {
-	public OwnerBean login(String username, String passwd) throws InvalidOwnerException, IncorrectPasswordException;
-	public void logout(String username);
-	public OwnerBean register(String username, String passwd) throws InvalidOwnerException, InvalidPasswordException;
-	public boolean unregister(String username);
-	
-	public Collection<DataCDBean> listCDs(String ownername);
-	public DataCDBean addCD(String ownername, String cdlabel, Integer cdsize, String cddesc, Date cdarchivedate) throws DuplicatedDataCDException, InvalidOwnerException;
-	public DataCDBean updateCD(Integer cdid, Integer cdsize, String cddesc, Date cdarchivedate);
-	public boolean removeCD(Integer cdid);
-	public OwnerBean refreshCDInfo(String ownername);
+    public OwnerBean login(String username, String passwd) throws InvalidOwnerException, IncorrectPasswordException;
+    public void logout(String username);
+    public OwnerBean register(String username, String passwd) throws InvalidOwnerException, InvalidPasswordException;
+    public boolean unregister(String username);
+    
+    public Collection<DataCDBean> listCDs(String ownername);
+    public DataCDBean addCD(String ownername, String cdlabel, Integer cdsize, String cddesc, Date cdarchivedate) throws DuplicatedDataCDException, InvalidOwnerException;
+    public DataCDBean updateCD(Integer cdid, Integer cdsize, String cddesc, Date cdarchivedate);
+    public boolean removeCD(Integer cdid);
+    public OwnerBean refreshCDInfo(String ownername);
 
 }

Modified: geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/exceptions/DuplicatedDataCDException.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/exceptions/DuplicatedDataCDException.java?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/exceptions/DuplicatedDataCDException.java (original)
+++ geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/exceptions/DuplicatedDataCDException.java Mon Mar  7 05:17:11 2011
@@ -20,28 +20,28 @@ package org.apache.geronimo.samples.data
 
 public class DuplicatedDataCDException extends Exception {
 
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	public DuplicatedDataCDException() {
-		// TODO Auto-generated constructor stub
-	}
-
-	public DuplicatedDataCDException(String message) {
-		super(message);
-		// TODO Auto-generated constructor stub
-	}
-
-	public DuplicatedDataCDException(Throwable cause) {
-		super(cause);
-		// TODO Auto-generated constructor stub
-	}
-
-	public DuplicatedDataCDException(String message, Throwable cause) {
-		super(message, cause);
-		// TODO Auto-generated constructor stub
-	}
+    /**
+     * 
+     */
+    private static final long serialVersionUID = 1L;
+
+    public DuplicatedDataCDException() {
+        // TODO Auto-generated constructor stub
+    }
+
+    public DuplicatedDataCDException(String message) {
+        super(message);
+        // TODO Auto-generated constructor stub
+    }
+
+    public DuplicatedDataCDException(Throwable cause) {
+        super(cause);
+        // TODO Auto-generated constructor stub
+    }
+
+    public DuplicatedDataCDException(String message, Throwable cause) {
+        super(message, cause);
+        // TODO Auto-generated constructor stub
+    }
 
 }

Modified: geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/exceptions/IncorrectPasswordException.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/exceptions/IncorrectPasswordException.java?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/exceptions/IncorrectPasswordException.java (original)
+++ geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/exceptions/IncorrectPasswordException.java Mon Mar  7 05:17:11 2011
@@ -19,13 +19,13 @@
 package org.apache.geronimo.samples.datacdinfo.exceptions;
 
 public class IncorrectPasswordException extends Exception {
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 2346094168148835037L;
+    /**
+     * 
+     */
+    private static final long serialVersionUID = 2346094168148835037L;
 
-	public IncorrectPasswordException(String error){
-		super(error);
-	}
+    public IncorrectPasswordException(String error){
+        super(error);
+    }
 
 }

Modified: geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/exceptions/InvalidOwnerException.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/exceptions/InvalidOwnerException.java?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/exceptions/InvalidOwnerException.java (original)
+++ geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/exceptions/InvalidOwnerException.java Mon Mar  7 05:17:11 2011
@@ -19,14 +19,14 @@
 package org.apache.geronimo.samples.datacdinfo.exceptions;
 
 public class InvalidOwnerException extends Exception {
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -630847510922102546L;
+    /**
+     * 
+     */
+    private static final long serialVersionUID = -630847510922102546L;
 
-	public InvalidOwnerException(String error){
-		super(error);
-		
-	}
+    public InvalidOwnerException(String error){
+        super(error);
+        
+    }
 
 }

Modified: geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/exceptions/InvalidPasswordException.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/exceptions/InvalidPasswordException.java?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/exceptions/InvalidPasswordException.java (original)
+++ geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/exceptions/InvalidPasswordException.java Mon Mar  7 05:17:11 2011
@@ -20,28 +20,28 @@ package org.apache.geronimo.samples.data
 
 public class InvalidPasswordException extends Exception {
 
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1878613214876245045L;
-
-	public InvalidPasswordException() {
-		// TODO Auto-generated constructor stub
-	}
-
-	public InvalidPasswordException(String message) {
-		super(message);
-		// TODO Auto-generated constructor stub
-	}
-
-	public InvalidPasswordException(Throwable cause) {
-		super(cause);
-		// TODO Auto-generated constructor stub
-	}
-
-	public InvalidPasswordException(String message, Throwable cause) {
-		super(message, cause);
-		// TODO Auto-generated constructor stub
-	}
+    /**
+     * 
+     */
+    private static final long serialVersionUID = 1878613214876245045L;
+
+    public InvalidPasswordException() {
+        // TODO Auto-generated constructor stub
+    }
+
+    public InvalidPasswordException(String message) {
+        super(message);
+        // TODO Auto-generated constructor stub
+    }
+
+    public InvalidPasswordException(Throwable cause) {
+        super(cause);
+        // TODO Auto-generated constructor stub
+    }
+
+    public InvalidPasswordException(String message, Throwable cause) {
+        super(message, cause);
+        // TODO Auto-generated constructor stub
+    }
 
 }

Modified: geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/resources/META-INF/ejb-jar.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/resources/META-INF/ejb-jar.xml?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/resources/META-INF/ejb-jar.xml (original)
+++ geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/resources/META-INF/ejb-jar.xml Mon Mar  7 05:17:11 2011
@@ -22,50 +22,50 @@
     <display-name>DataCDInfo Enterprise Bean Definitions</display-name>
     
     <enterprise-beans>
-		<session>
-			<ejb-name>ejb/DataCDInfoJTAImpl</ejb-name>
-			<business-local>org.apache.geronimo.samples.datacdinfo.core.DataCDInfoLocal</business-local>
-			<business-remote>org.apache.geronimo.samples.datacdinfo.core.DataCDInfoRemote</business-remote>
-			<ejb-class>org.apache.geronimo.samples.datacdinfo.core.DataCDInfoJTAImpl</ejb-class>
-<!--			 Stateful|Stateless -->
-			<session-type>Stateless</session-type>
-<!--			 Who manages transanction? Bean|Container -->
-			<transaction-type>Container</transaction-type>
-		</session>
+        <session>
+            <ejb-name>ejb/DataCDInfoJTAImpl</ejb-name>
+            <business-local>org.apache.geronimo.samples.datacdinfo.core.DataCDInfoLocal</business-local>
+            <business-remote>org.apache.geronimo.samples.datacdinfo.core.DataCDInfoRemote</business-remote>
+            <ejb-class>org.apache.geronimo.samples.datacdinfo.core.DataCDInfoJTAImpl</ejb-class>
+<!--             Stateful|Stateless -->
+            <session-type>Stateless</session-type>
+<!--             Who manages transanction? Bean|Container -->
+            <transaction-type>Container</transaction-type>
+        </session>
 
-		<!-- In code, the stateful session bean "DataCDinfoAdmin" is annotated without name, 
-		so the geronimo server will assign a default name to it, it's the bean simple name. 
-		However, the interesting is following definition will add an additional entry to JNDI
-		and register a stateful session bean with name "ejb/DataCDInfoAdmin". Seems it does
-		not override the annotated one. Why?  -->
-		<session>
-			<ejb-name>ejb/DataCDInfoAdmin</ejb-name>
-			<business-local>org.apache.geronimo.samples.datacdinfo.core.DataCDInfoAdminLocal</business-local>
-			<ejb-class>org.apache.geronimo.samples.datacdinfo.core.DataCDInfoAdmin</ejb-class>
-<!--			 Stateful|Stateless -->
-			<session-type>Stateful</session-type>
-<!--			 Who manages transanction? Bean|Container -->
-			<transaction-type>Container</transaction-type>
-		</session>		
-	</enterprise-beans>
-	
-	<assembly-descriptor>
-			<method-permission>
-				<role-name>superadmin</role-name>
-				<method>
-					<ejb-name>ejb/DataCDInfoAdmin</ejb-name>
-					<method-name>*</method-name>
-				</method>
-			</method-permission>
-			<!-- In code, role "admin" only has right to access listOwners method
-				but via this xml definition, the role could also access listAllDataCDs method -->
-			<method-permission>
-				<role-name>admin</role-name>
-				<method>
-					<ejb-name>ejb/DataCDInfoAdmin</ejb-name>
-					<method-name>listAllDataCDs</method-name>					
-				</method>
-			</method-permission>
-	</assembly-descriptor>     
+        <!-- In code, the stateful session bean "DataCDinfoAdmin" is annotated without name, 
+        so the geronimo server will assign a default name to it, it's the bean simple name. 
+        However, the interesting is following definition will add an additional entry to JNDI
+        and register a stateful session bean with name "ejb/DataCDInfoAdmin". Seems it does
+        not override the annotated one. Why?  -->
+        <session>
+            <ejb-name>ejb/DataCDInfoAdmin</ejb-name>
+            <business-local>org.apache.geronimo.samples.datacdinfo.core.DataCDInfoAdminLocal</business-local>
+            <ejb-class>org.apache.geronimo.samples.datacdinfo.core.DataCDInfoAdmin</ejb-class>
+<!--             Stateful|Stateless -->
+            <session-type>Stateful</session-type>
+<!--             Who manages transanction? Bean|Container -->
+            <transaction-type>Container</transaction-type>
+        </session>        
+    </enterprise-beans>
+    
+    <assembly-descriptor>
+            <method-permission>
+                <role-name>superadmin</role-name>
+                <method>
+                    <ejb-name>ejb/DataCDInfoAdmin</ejb-name>
+                    <method-name>*</method-name>
+                </method>
+            </method-permission>
+            <!-- In code, role "admin" only has right to access listOwners method
+                but via this xml definition, the role could also access listAllDataCDs method -->
+            <method-permission>
+                <role-name>admin</role-name>
+                <method>
+                    <ejb-name>ejb/DataCDInfoAdmin</ejb-name>
+                    <method-name>listAllDataCDs</method-name>                    
+                </method>
+            </method-permission>
+    </assembly-descriptor>     
 </ejb-jar>
 

Modified: geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/resources/META-INF/openejb-jar.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/resources/META-INF/openejb-jar.xml?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/resources/META-INF/openejb-jar.xml (original)
+++ geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/resources/META-INF/openejb-jar.xml Mon Mar  7 05:17:11 2011
@@ -16,18 +16,18 @@
     limitations under the License.
 -->
 <openejb-jar xmlns:app="http://geronimo.apache.org/xml/ns/j2ee/application-2.0"
-	xmlns:client="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0"
-	xmlns:conn="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2"
-	xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns="http://openejb.apache.org/xml/ns/openejb-jar-2.2"
-	xmlns:name="http://geronimo.apache.org/xml/ns/naming-1.2" xmlns:pers="http://java.sun.com/xml/ns/persistence"
-	xmlns:pkgen="http://openejb.apache.org/xml/ns/pkgen-2.1" xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0"
-	xmlns:web="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
-	<dep:environment>
-		<dep:moduleId>
-			<dep:groupId>org.apache.geronimo.samples</dep:groupId>
-			<dep:artifactId>DataCDInfo-JTA-ejb</dep:artifactId>
-			<dep:version>1.0</dep:version>
-			<dep:type>car</dep:type>
-		</dep:moduleId>
-	</dep:environment>
+    xmlns:client="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0"
+    xmlns:conn="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2"
+    xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns="http://openejb.apache.org/xml/ns/openejb-jar-2.2"
+    xmlns:name="http://geronimo.apache.org/xml/ns/naming-1.2" xmlns:pers="http://java.sun.com/xml/ns/persistence"
+    xmlns:pkgen="http://openejb.apache.org/xml/ns/pkgen-2.1" xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0"
+    xmlns:web="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
+    <dep:environment>
+        <dep:moduleId>
+            <dep:groupId>org.apache.geronimo.samples</dep:groupId>
+            <dep:artifactId>DataCDInfo-JTA-ejb</dep:artifactId>
+            <dep:version>1.0</dep:version>
+            <dep:type>car</dep:type>
+        </dep:moduleId>
+    </dep:environment>
 </openejb-jar>

Modified: geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/resources/META-INF/persistence.xml?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/resources/META-INF/persistence.xml (original)
+++ geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/resources/META-INF/persistence.xml Mon Mar  7 05:17:11 2011
@@ -19,7 +19,7 @@
   <persistence-unit name="DataCDInfoUnit" transaction-type="JTA">
     <description>DataCDInfo Persistence Unit Definition</description>
     <jta-data-source>jdbc/DataCDInfoDS</jta-data-source>
-    <non-jta-data-source>jdbc/NoTxDataCDInfoDS</non-jta-data-source>	
+    <non-jta-data-source>jdbc/NoTxDataCDInfoDS</non-jta-data-source>    
     <class>org.apache.geronimo.samples.datacdinfo.beans.OwnerBean</class>
     <class>org.apache.geronimo.samples.datacdinfo.beans.DataCDBean</class>
     <exclude-unlisted-classes>true</exclude-unlisted-classes>

Modified: geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/treeListing.txt
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/treeListing.txt?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/treeListing.txt (original)
+++ geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/treeListing.txt Mon Mar  7 05:17:11 2011
@@ -1,7 +1,7 @@
 local:active project artifact:
-	artifact = active project artifact:
-	artifact = active project artifact:
-	artifact = org.apache.geronimo.samples:DataCDInfo-JTA-ear:ear:2.2:compile;
-	project: MavenProject: org.apache.geronimo.samples:DataCDInfo-JTA-ear:2.2 @ /home/forrestxm/localbuild/rsaws/gsamplestrunk/samples/DataCDInfo/DataCDInfo-JTA-ear/pom.xml;
-	project: MavenProject: org.apache.geronimo.samples:DataCDInfo-JTA-ear:2.2 @ /home/forrestxm/localbuild/rsaws/gsamplestrunk/samples/DataCDInfo/DataCDInfo-JTA-ear/pom.xml;
-	project: MavenProject: org.apache.geronimo.samples:DataCDInfo-JTA-ear:2.2 @ /home/forrestxm/localbuild/rsaws/gsamplestrunk/samples/DataCDInfo/DataCDInfo-JTA-ear/pom.xml
+    artifact = active project artifact:
+    artifact = active project artifact:
+    artifact = org.apache.geronimo.samples:DataCDInfo-JTA-ear:ear:2.2:compile;
+    project: MavenProject: org.apache.geronimo.samples:DataCDInfo-JTA-ear:2.2 @ /home/forrestxm/localbuild/rsaws/gsamplestrunk/samples/DataCDInfo/DataCDInfo-JTA-ear/pom.xml;
+    project: MavenProject: org.apache.geronimo.samples:DataCDInfo-JTA-ear:2.2 @ /home/forrestxm/localbuild/rsaws/gsamplestrunk/samples/DataCDInfo/DataCDInfo-JTA-ear/pom.xml;
+    project: MavenProject: org.apache.geronimo.samples:DataCDInfo-JTA-ear:2.2 @ /home/forrestxm/localbuild/rsaws/gsamplestrunk/samples/DataCDInfo/DataCDInfo-JTA-ear/pom.xml

Modified: geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-jetty/src/main/plan/plan.xml?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-jetty/src/main/plan/plan.xml (original)
+++ geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-jetty/src/main/plan/plan.xml Mon Mar  7 05:17:11 2011
@@ -16,30 +16,30 @@
     limitations under the License.
 -->
 <application application-name="DataCDInfo-JTA"
-	xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-2.0">
-	<dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">		
-		<dep:dependencies>
-			<dep:dependency>
-				<dep:groupId>org.apache.geronimo.samples</dep:groupId>
-                		<dep:artifactId>sample-datasource</dep:artifactId>
-                		<dep:type>car</dep:type>
-			</dep:dependency>
-		</dep:dependencies>
-	</dep:environment>
+    xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-2.0">
+    <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">        
+        <dep:dependencies>
+            <dep:dependency>
+                <dep:groupId>org.apache.geronimo.samples</dep:groupId>
+                        <dep:artifactId>sample-datasource</dep:artifactId>
+                        <dep:type>car</dep:type>
+            </dep:dependency>
+        </dep:dependencies>
+    </dep:environment>
 
-	<module>
-		<ejb>DataCDInfo-JTA-ejb.jar</ejb>
-		<openejb-jar xmlns="http://openejb.apache.org/xml/ns/openejb-jar-2.2">
-			<persistence xmlns="http://java.sun.com/xml/ns/persistence"
-				version="1.0">
-				<persistence-unit name="DataCDInfoUnit">
-					<properties>
-						<property name="openjpa.jdbc.DBDictionary" value="derby" />
-					</properties>
-				</persistence-unit>
-			</persistence>
-		</openejb-jar>
-	</module>	
+    <module>
+        <ejb>DataCDInfo-JTA-ejb.jar</ejb>
+        <openejb-jar xmlns="http://openejb.apache.org/xml/ns/openejb-jar-2.2">
+            <persistence xmlns="http://java.sun.com/xml/ns/persistence"
+                version="1.0">
+                <persistence-unit name="DataCDInfoUnit">
+                    <properties>
+                        <property name="openjpa.jdbc.DBDictionary" value="derby" />
+                    </properties>
+                </persistence-unit>
+            </persistence>
+        </openejb-jar>
+    </module>    
 
   <security xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0">
     <sec:default-principal>
@@ -56,8 +56,8 @@
       </sec:role>
     </sec:role-mappings>
   </security>
-	
-	<gbean name="DBInitialization" class="org.apache.geronimo.connector.DatabaseInitializationGBean">
+    
+    <gbean name="DBInitialization" class="org.apache.geronimo.connector.DatabaseInitializationGBean">
         <attribute name="path">DataCDInfo_tables_derby.sql</attribute>
         <reference name="DataSource">
             <name>SampleNoTxDatasource</name>

Modified: geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-tomcat/src/main/plan/plan.xml?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-tomcat/src/main/plan/plan.xml Mon Mar  7 05:17:11 2011
@@ -16,30 +16,30 @@
     limitations under the License.
 -->
 <application application-name="DataCDInfo-JTA"
-	xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-2.0">
-	<dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">		
-		<dep:dependencies>
-			<dep:dependency>
-				<dep:groupId>org.apache.geronimo.samples</dep:groupId>
-                		<dep:artifactId>sample-datasource</dep:artifactId>
-                		<dep:type>car</dep:type>
-			</dep:dependency>
-		</dep:dependencies>
-	</dep:environment>
+    xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-2.0">
+    <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">        
+        <dep:dependencies>
+            <dep:dependency>
+                <dep:groupId>org.apache.geronimo.samples</dep:groupId>
+                        <dep:artifactId>sample-datasource</dep:artifactId>
+                        <dep:type>car</dep:type>
+            </dep:dependency>
+        </dep:dependencies>
+    </dep:environment>
 
-	<module>
-		<ejb>DataCDInfo-JTA-ejb.jar</ejb>
-		<openejb-jar xmlns="http://openejb.apache.org/xml/ns/openejb-jar-2.2">
-			<persistence xmlns="http://java.sun.com/xml/ns/persistence"
-				version="1.0">
-				<persistence-unit name="DataCDInfoUnit">
-					<properties>
-						<property name="openjpa.jdbc.DBDictionary" value="derby" />
-					</properties>
-				</persistence-unit>
-			</persistence>
-		</openejb-jar>
-	</module>	
+    <module>
+        <ejb>DataCDInfo-JTA-ejb.jar</ejb>
+        <openejb-jar xmlns="http://openejb.apache.org/xml/ns/openejb-jar-2.2">
+            <persistence xmlns="http://java.sun.com/xml/ns/persistence"
+                version="1.0">
+                <persistence-unit name="DataCDInfoUnit">
+                    <properties>
+                        <property name="openjpa.jdbc.DBDictionary" value="derby" />
+                    </properties>
+                </persistence-unit>
+            </persistence>
+        </openejb-jar>
+    </module>    
 
   <security xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0">
     <sec:default-principal>
@@ -56,8 +56,8 @@
       </sec:role>
     </sec:role-mappings>
   </security>
-	
-	<gbean name="DBInitialization" class="org.apache.geronimo.connector.wrapper.DatabaseInitializationGBean">
+    
+    <gbean name="DBInitialization" class="org.apache.geronimo.connector.wrapper.DatabaseInitializationGBean">
         <attribute name="path">DataCDInfo_tables_derby.sql</attribute>
         <reference name="DataSource">
             <name>SampleNoTxDatasource</name>

Modified: geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/pom.xml?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/pom.xml Mon Mar  7 05:17:11 2011
@@ -1,359 +1,359 @@
 <?xml version="1.0" encoding="UTF-8"?>
-	<!--
-		Licensed to the Apache Software Foundation (ASF) under one or more
-		contributor license agreements. See the NOTICE file distributed with
-		this work for additional information regarding copyright ownership.
-		The ASF licenses this file to you under the Apache License, Version
-		2.0 (the "License"); you may not use this file except in compliance
-		with the License. You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0 Unless required by
-		applicable law or agreed to in writing, software distributed under the
-		License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-		CONDITIONS OF ANY KIND, either express or implied. See the License for
-		the specific language governing permissions and limitations under the
-		License.
-	-->
+    <!--
+        Licensed to the Apache Software Foundation (ASF) under one or more
+        contributor license agreements. See the NOTICE file distributed with
+        this work for additional information regarding copyright ownership.
+        The ASF licenses this file to you under the Apache License, Version
+        2.0 (the "License"); you may not use this file except in compliance
+        with the License. You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+        applicable law or agreed to in writing, software distributed under the
+        License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+        CONDITIONS OF ANY KIND, either express or implied. See the License for
+        the specific language governing permissions and limitations under the
+        License.
+    -->
 <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">
+    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.geronimo.samples</groupId>
-		<artifactId>DataCDInfo</artifactId>
-		<version>3.0-SNAPSHOT</version>
-	</parent>
-
-	<artifactId>DataCDInfo-JTA-war</artifactId>
-	<name>Geronimo Samples :: DataCDInfo JTA + Struts1 :: WAR</name>
-	<packaging>war</packaging>
-
-	<description>Geronimo Samples - DataCD Information Management Tool</description>
-
-	<dependencies>
-
-        <dependency>
-			<groupId>org.apache.geronimo.samples</groupId>
-			<artifactId>DataCDInfo-JTA-ejb</artifactId>
-			<version>${version}</version>
-		</dependency>
-		
-		<dependency>
-			<groupId>antlr</groupId>
-			<artifactId>antlr</artifactId>
-			<version>2.7.2</version>
-		</dependency>
-
-		<dependency>
-			<groupId>commons-beanutils</groupId>
-			<artifactId>commons-beanutils</artifactId>
-			<version>1.6</version> 
-		</dependency>
-		<dependency>
-			<groupId>commons-chain</groupId>
-			<artifactId>commons-chain</artifactId>
-			<version>1.1</version>
-			<exclusions>
+    <parent>
+        <groupId>org.apache.geronimo.samples</groupId>
+        <artifactId>DataCDInfo</artifactId>
+        <version>3.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>DataCDInfo-JTA-war</artifactId>
+    <name>Geronimo Samples :: DataCDInfo JTA + Struts1 :: WAR</name>
+    <packaging>war</packaging>
+
+    <description>Geronimo Samples - DataCD Information Management Tool</description>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.apache.geronimo.samples</groupId>
+            <artifactId>DataCDInfo-JTA-ejb</artifactId>
+            <version>${version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>antlr</groupId>
+            <artifactId>antlr</artifactId>
+            <version>2.7.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-beanutils</groupId>
+            <artifactId>commons-beanutils</artifactId>
+            <version>1.6</version> 
+        </dependency>
+        <dependency>
+            <groupId>commons-chain</groupId>
+            <artifactId>commons-chain</artifactId>
+            <version>1.1</version>
+            <exclusions>
                 <exclusion>
-                   	<groupId>myfaces</groupId>
-				    <artifactId>myfaces-api</artifactId>
+                       <groupId>myfaces</groupId>
+                    <artifactId>myfaces-api</artifactId>
                 </exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>commons-digester</groupId>
-			<artifactId>commons-digester</artifactId>
-			<version>1.8</version> 
-		</dependency>
-		<dependency>
-			<groupId>commons-fileupload</groupId>
-			<artifactId>commons-fileupload</artifactId>
-			<version>1.2.1</version>			
-		</dependency>
-		<dependency>
-			<groupId>commons-io</groupId>
-			<artifactId>commons-io</artifactId>
-			<version>1.4</version>			
-		</dependency>
-		<dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging</artifactId>
-			<version>1.0.4</version>			
-		</dependency>
-		<dependency>
-			<groupId>commons-validator</groupId>
-			<artifactId>commons-validator</artifactId>
-			<version>1.3.1</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.geronimo.bundles</groupId>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>commons-digester</groupId>
+            <artifactId>commons-digester</artifactId>
+            <version>1.8</version> 
+        </dependency>
+        <dependency>
+            <groupId>commons-fileupload</groupId>
+            <artifactId>commons-fileupload</artifactId>
+            <version>1.2.1</version>            
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>1.4</version>            
+        </dependency>
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.0.4</version>            
+        </dependency>
+        <dependency>
+            <groupId>commons-validator</groupId>
+            <artifactId>commons-validator</artifactId>
+            <version>1.3.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.bundles</groupId>
             <artifactId>jstl</artifactId>
-			<scope>provided</scope>	
-		</dependency>		
-		<dependency>
-			<groupId>oro</groupId>
-			<artifactId>oro</artifactId>
-			<version>2.0.8</version>
-		</dependency>		
-		<dependency>
-			<groupId>org.apache.struts</groupId>
-			<artifactId>struts-core</artifactId>
-			<version>1.3.8</version>
-			<exclusions>
-                    	    <exclusion>
-                        	<groupId>myfaces</groupId>
-				<artifactId>myfaces-api</artifactId>
-                    	    </exclusion>
-                    	    <exclusion>
-                        	<groupId>portlet-api</groupId>
-				<artifactId>portlet-api</artifactId>
-                    	    </exclusion>
-                    	    <exclusion>
-                        	<groupId>javax.servlet</groupId>
-				<artifactId>servlet-api</artifactId>
-                    	    </exclusion>
-                    	    <exclusion>
-                        	<groupId>taglibs</groupId>
-				<artifactId>standard</artifactId>
-                    	    </exclusion>
-			    <exclusion>
-                        	<groupId>javax.servlet</groupId>
-				<artifactId>jstl</artifactId>
-                    	    </exclusion>
-                	</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.struts</groupId>
-			<artifactId>struts-el</artifactId>
-			<version>1.3.8</version>
-			<exclusions>
-                    	    <exclusion>
-                        	<groupId>myfaces</groupId>
-				<artifactId>myfaces-api</artifactId>
-                    	    </exclusion>
-                    	    <exclusion>
-                        	<groupId>portlet-api</groupId>
-				<artifactId>portlet-api</artifactId>
-                    	    </exclusion>
-                    	    <exclusion>
-                        	<groupId>javax.servlet</groupId>
-				<artifactId>servlet-api</artifactId>
-                    	    </exclusion>
-                    	    <exclusion>
-                        	<groupId>taglibs</groupId>
-				<artifactId>standard</artifactId>
-                    	    </exclusion>
-			    <exclusion>
-                        	<groupId>javax.servlet</groupId>
-				<artifactId>jstl</artifactId>
-                    	    </exclusion>
-                	</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.struts</groupId>
-			<artifactId>struts-extras</artifactId>
-			<version>1.3.8</version>
-			<exclusions>
-                    	    <exclusion>
-                        	<groupId>myfaces</groupId>
-				<artifactId>myfaces-api</artifactId>
-                    	    </exclusion>
-                    	    <exclusion>
-                        	<groupId>portlet-api</groupId>
-				<artifactId>portlet-api</artifactId>
-                    	    </exclusion>
-                    	    <exclusion>
-                        	<groupId>javax.servlet</groupId>
-				<artifactId>servlet-api</artifactId>
-                    	    </exclusion>
-                    	    <exclusion>
-                        	<groupId>taglibs</groupId>
-				<artifactId>standard</artifactId>
-                    	    </exclusion>
-			    <exclusion>
-                        	<groupId>javax.servlet</groupId>
-				<artifactId>jstl</artifactId>
-                    	    </exclusion>
-                	</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.struts</groupId>
-			<artifactId>struts-faces</artifactId>
-			<version>1.3.8</version>
-			<exclusions>
-                    	    <exclusion>
-                        	<groupId>myfaces</groupId>
-				<artifactId>myfaces-api</artifactId>
-                    	    </exclusion>
-                    	    <exclusion>
-                        	<groupId>portlet-api</groupId>
-				<artifactId>portlet-api</artifactId>
-                    	    </exclusion>
-                    	    <exclusion>
-                        	<groupId>javax.servlet</groupId>
-				<artifactId>servlet-api</artifactId>
-                    	    </exclusion>
-                    	    <exclusion>
-                        	<groupId>taglibs</groupId>
-				<artifactId>standard</artifactId>
-                    	    </exclusion>
-			    <exclusion>
-                        	<groupId>javax.servlet</groupId>
-				<artifactId>jstl</artifactId>
-                    	    </exclusion>
-                	</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.struts</groupId>
-			<artifactId>struts-mailreader-dao</artifactId>
-			<version>1.3.8</version>
-			<exclusions>
-                    	    <exclusion>
-                        	<groupId>myfaces</groupId>
-				<artifactId>myfaces-api</artifactId>
-                    	    </exclusion>
-                    	    <exclusion>
-                        	<groupId>portlet-api</groupId>
-				<artifactId>portlet-api</artifactId>
-                    	    </exclusion>
-                    	    <exclusion>
-                        	<groupId>javax.servlet</groupId>
-				<artifactId>servlet-api</artifactId>
-                    	    </exclusion>
-                    	    <exclusion>
-                        	<groupId>taglibs</groupId>
-				<artifactId>standard</artifactId>
-                    	    </exclusion>
-			    <exclusion>
-                        	<groupId>javax.servlet</groupId>
-				<artifactId>jstl</artifactId>
-                    	    </exclusion>
-                	</exclusions>
-		</dependency>
-		<!--		<dependency>-->
-		<!--			<groupId>org.apache.struts</groupId>-->
-		<!--			<artifactId>struts-scripting</artifactId>-->
-		<!--			<version>1.3.10</version>-->
-		<!--		</dependency>-->
-		<dependency>
-			<groupId>org.apache.struts</groupId>
-			<artifactId>struts-taglib</artifactId>
-			<version>1.3.8</version>
-			<exclusions>
-                    	    <exclusion>
-                        	<groupId>myfaces</groupId>
-				<artifactId>myfaces-api</artifactId>
-                    	    </exclusion>
-                    	    <exclusion>
-                        	<groupId>portlet-api</groupId>
-				<artifactId>portlet-api</artifactId>
-                    	    </exclusion>
-                    	    <exclusion>
-                        	<groupId>javax.servlet</groupId>
-				<artifactId>servlet-api</artifactId>
-                    	    </exclusion>
-                    	    <exclusion>
-                        	<groupId>taglibs</groupId>
-				<artifactId>standard</artifactId>
-                    	    </exclusion>
-			    <exclusion>
-                        	<groupId>javax.servlet</groupId>
-				<artifactId>jstl</artifactId>
-                    	    </exclusion>
-                	</exclusions>
-		</dependency>
-		<!--<dependency>
-			<groupId>org.apache.struts</groupId>
-			<artifactId>struts-tiles</artifactId>
-			<version>1.3.8</version>
-		</dependency>-->
-		<!--<dependency>
-			<groupId>org.apache.velocity</groupId>
-			<artifactId>velocity-tools</artifactId>
-			<version>1.3</version>
-		</dependency>-->
-		<dependency>
-	        <groupId>org.apache.myfaces.core</groupId>
-			<artifactId>myfaces-bundle</artifactId>
-			<scope>provided</scope>		
-		</dependency>
-		<dependency>
+            <scope>provided</scope>    
+        </dependency>        
+        <dependency>
+            <groupId>oro</groupId>
+            <artifactId>oro</artifactId>
+            <version>2.0.8</version>
+        </dependency>        
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts-core</artifactId>
+            <version>1.3.8</version>
+            <exclusions>
+                            <exclusion>
+                            <groupId>myfaces</groupId>
+                <artifactId>myfaces-api</artifactId>
+                            </exclusion>
+                            <exclusion>
+                            <groupId>portlet-api</groupId>
+                <artifactId>portlet-api</artifactId>
+                            </exclusion>
+                            <exclusion>
+                            <groupId>javax.servlet</groupId>
+                <artifactId>servlet-api</artifactId>
+                            </exclusion>
+                            <exclusion>
+                            <groupId>taglibs</groupId>
+                <artifactId>standard</artifactId>
+                            </exclusion>
+                <exclusion>
+                            <groupId>javax.servlet</groupId>
+                <artifactId>jstl</artifactId>
+                            </exclusion>
+                    </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts-el</artifactId>
+            <version>1.3.8</version>
+            <exclusions>
+                            <exclusion>
+                            <groupId>myfaces</groupId>
+                <artifactId>myfaces-api</artifactId>
+                            </exclusion>
+                            <exclusion>
+                            <groupId>portlet-api</groupId>
+                <artifactId>portlet-api</artifactId>
+                            </exclusion>
+                            <exclusion>
+                            <groupId>javax.servlet</groupId>
+                <artifactId>servlet-api</artifactId>
+                            </exclusion>
+                            <exclusion>
+                            <groupId>taglibs</groupId>
+                <artifactId>standard</artifactId>
+                            </exclusion>
+                <exclusion>
+                            <groupId>javax.servlet</groupId>
+                <artifactId>jstl</artifactId>
+                            </exclusion>
+                    </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts-extras</artifactId>
+            <version>1.3.8</version>
+            <exclusions>
+                            <exclusion>
+                            <groupId>myfaces</groupId>
+                <artifactId>myfaces-api</artifactId>
+                            </exclusion>
+                            <exclusion>
+                            <groupId>portlet-api</groupId>
+                <artifactId>portlet-api</artifactId>
+                            </exclusion>
+                            <exclusion>
+                            <groupId>javax.servlet</groupId>
+                <artifactId>servlet-api</artifactId>
+                            </exclusion>
+                            <exclusion>
+                            <groupId>taglibs</groupId>
+                <artifactId>standard</artifactId>
+                            </exclusion>
+                <exclusion>
+                            <groupId>javax.servlet</groupId>
+                <artifactId>jstl</artifactId>
+                            </exclusion>
+                    </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts-faces</artifactId>
+            <version>1.3.8</version>
+            <exclusions>
+                            <exclusion>
+                            <groupId>myfaces</groupId>
+                <artifactId>myfaces-api</artifactId>
+                            </exclusion>
+                            <exclusion>
+                            <groupId>portlet-api</groupId>
+                <artifactId>portlet-api</artifactId>
+                            </exclusion>
+                            <exclusion>
+                            <groupId>javax.servlet</groupId>
+                <artifactId>servlet-api</artifactId>
+                            </exclusion>
+                            <exclusion>
+                            <groupId>taglibs</groupId>
+                <artifactId>standard</artifactId>
+                            </exclusion>
+                <exclusion>
+                            <groupId>javax.servlet</groupId>
+                <artifactId>jstl</artifactId>
+                            </exclusion>
+                    </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts-mailreader-dao</artifactId>
+            <version>1.3.8</version>
+            <exclusions>
+                            <exclusion>
+                            <groupId>myfaces</groupId>
+                <artifactId>myfaces-api</artifactId>
+                            </exclusion>
+                            <exclusion>
+                            <groupId>portlet-api</groupId>
+                <artifactId>portlet-api</artifactId>
+                            </exclusion>
+                            <exclusion>
+                            <groupId>javax.servlet</groupId>
+                <artifactId>servlet-api</artifactId>
+                            </exclusion>
+                            <exclusion>
+                            <groupId>taglibs</groupId>
+                <artifactId>standard</artifactId>
+                            </exclusion>
+                <exclusion>
+                            <groupId>javax.servlet</groupId>
+                <artifactId>jstl</artifactId>
+                            </exclusion>
+                    </exclusions>
+        </dependency>
+        <!--        <dependency>-->
+        <!--            <groupId>org.apache.struts</groupId>-->
+        <!--            <artifactId>struts-scripting</artifactId>-->
+        <!--            <version>1.3.10</version>-->
+        <!--        </dependency>-->
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts-taglib</artifactId>
+            <version>1.3.8</version>
+            <exclusions>
+                            <exclusion>
+                            <groupId>myfaces</groupId>
+                <artifactId>myfaces-api</artifactId>
+                            </exclusion>
+                            <exclusion>
+                            <groupId>portlet-api</groupId>
+                <artifactId>portlet-api</artifactId>
+                            </exclusion>
+                            <exclusion>
+                            <groupId>javax.servlet</groupId>
+                <artifactId>servlet-api</artifactId>
+                            </exclusion>
+                            <exclusion>
+                            <groupId>taglibs</groupId>
+                <artifactId>standard</artifactId>
+                            </exclusion>
+                <exclusion>
+                            <groupId>javax.servlet</groupId>
+                <artifactId>jstl</artifactId>
+                            </exclusion>
+                    </exclusions>
+        </dependency>
+        <!--<dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts-tiles</artifactId>
+            <version>1.3.8</version>
+        </dependency>-->
+        <!--<dependency>
+            <groupId>org.apache.velocity</groupId>
+            <artifactId>velocity-tools</artifactId>
+            <version>1.3</version>
+        </dependency>-->
+        <dependency>
+            <groupId>org.apache.myfaces.core</groupId>
+            <artifactId>myfaces-bundle</artifactId>
+            <scope>provided</scope>        
+        </dependency>
+        <dependency>
             <groupId>org.apache.portals</groupId>
             <artifactId>portlet-api_2.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
-		
-		<dependency>
-			<groupId>org.apache.geronimo.specs</groupId>
-			<artifactId>geronimo-annotation_1.1_spec</artifactId>
-			<scope>provided</scope>
-		</dependency>		
-
-		<dependency>
-			<groupId>org.apache.geronimo.specs</groupId>
-			<artifactId>geronimo-jpa_2.0_spec</artifactId>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.geronimo.specs</groupId>
-			<artifactId>geronimo-jta_1.1_spec</artifactId>
-			<scope>provided</scope>
-		</dependency>
-	</dependencies>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<executions>
-					<execution>
-						<phase>process-resources</phase>
-						<id>copy-parent-site</id>
-						<goals>
-							<goal>run</goal>
-						</goals>
-						<configuration>
-							<tasks>
-								<echo>Copying site directory from parent</echo>
-								<copy todir="${project.build.directory}/${pom.artifactId}-2.2"
-									failonerror="false" overwrite="true">
-									<fileset dir="${pom.basedir}/../docs" />
-								</copy>
-							</tasks>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-war-plugin</artifactId>
-				<configuration>
-					<archiveClasses>false</archiveClasses>
-					<webResources>
-						<resource>
-							<directory>${pom.basedir}/src/main/resources</directory>
-							<!-- override the destination directory for this resource -->
-							<targetPath>WEB-INF/classes</targetPath>
-							<!-- enable filtering -->
-							<filtering>true</filtering>
-							<excludes> 
-							    <exclude>*.template</exclude>
-							</excludes>
-						</resource>
-						<resource>
-							<directory>${project.build.outputDirectory}</directory>
-							<includes>
-								<include>META-INF/LICENSE*</include>
-								<include>META-INF/NOTICE*</include>
-								<include>META-INF/DISCLAIMER*</include>
-							</includes>
-						</resource>
-					</webResources>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-annotation_1.1_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>        
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jpa_2.0_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jta_1.1_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>process-resources</phase>
+                        <id>copy-parent-site</id>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <echo>Copying site directory from parent</echo>
+                                <copy todir="${project.build.directory}/${pom.artifactId}-2.2"
+                                    failonerror="false" overwrite="true">
+                                    <fileset dir="${pom.basedir}/../docs" />
+                                </copy>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+                    <archiveClasses>false</archiveClasses>
+                    <webResources>
+                        <resource>
+                            <directory>${pom.basedir}/src/main/resources</directory>
+                            <!-- override the destination directory for this resource -->
+                            <targetPath>WEB-INF/classes</targetPath>
+                            <!-- enable filtering -->
+                            <filtering>true</filtering>
+                            <excludes> 
+                                <exclude>*.template</exclude>
+                            </excludes>
+                        </resource>
+                        <resource>
+                            <directory>${project.build.outputDirectory}</directory>
+                            <includes>
+                                <include>META-INF/LICENSE*</include>
+                                <include>META-INF/NOTICE*</include>
+                                <include>META-INF/DISCLAIMER*</include>
+                            </includes>
+                        </resource>
+                    </webResources>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

Modified: geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/DataCDInfoAdminServlet.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/DataCDInfoAdminServlet.java?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/DataCDInfoAdminServlet.java (original)
+++ geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/DataCDInfoAdminServlet.java Mon Mar  7 05:17:11 2011
@@ -35,82 +35,82 @@ import org.apache.geronimo.samples.datac
  * This servlet is used to demo security annotation usage on EJB.
  */
 public class DataCDInfoAdminServlet extends HttpServlet {
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	@EJB
-	private DataCDInfoAdminLocal admin = null;
+    @EJB
+    private DataCDInfoAdminLocal admin = null;
 
-	/**
-	 * @see HttpServlet#HttpServlet()
-	 */
-	public DataCDInfoAdminServlet() {
-		super();
-		// TODO Auto-generated constructor stub
-	}
-
-	/**
-	 * @see Servlet#init(ServletConfig)
-	 */
-	public void init(ServletConfig config) throws ServletException {
-		super.init(config);
-	}
-
-	/**
-	 * @see Servlet#destroy()
-	 */
-	public void destroy() {
-		// TODO Auto-generated method stub
-	}
-
-	/**
-	 * @see HttpServlet#service(HttpServletRequest request, HttpServletResponse
-	 *      response)
-	 */
-	protected void service(HttpServletRequest request,
-			HttpServletResponse response) throws ServletException, IOException {
-		String action = request.getParameter("action");
-
-		if (action.equals("listOwners")) {
-			String[] owners = admin.listOwners();
-			request.setAttribute("owners", owners);
-
-			this.getServletConfig().getServletContext().getRequestDispatcher("/admin/showOwners.jsp").include(request, response);
-		}
-
-		if (action.equals("listCDs")) {
-			String[] cds = admin.listAllDataCDs();
-			request.setAttribute("cds", cds);
-
-			this.getServletConfig().getServletContext().getRequestDispatcher("/admin/showCDs.jsp").include(request, response);
-
-		}
-
-		if (action.equals("findpasswd")) {
-			String ownername = request.getParameter("ownername");
-			String passwd = admin.findpasswd(ownername);
-			request.setAttribute("passwd", passwd);
-			request.setAttribute("ownername", ownername);
-
-			this.getServletConfig().getServletContext().getRequestDispatcher("/admin/showPasswd.jsp").include(request, response);
-		}
-	}
-
-	/**
-	 * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse
-	 *      response)
-	 */
-	protected void doGet(HttpServletRequest request,
-			HttpServletResponse response) throws ServletException, IOException {
-		service(request, response);
-	}
-
-	/**
-	 * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse
-	 *      response)
-	 */
-	protected void doPost(HttpServletRequest request,
-			HttpServletResponse response) throws ServletException, IOException {
-		service(request, response);
-	}
+    /**
+     * @see HttpServlet#HttpServlet()
+     */
+    public DataCDInfoAdminServlet() {
+        super();
+        // TODO Auto-generated constructor stub
+    }
+
+    /**
+     * @see Servlet#init(ServletConfig)
+     */
+    public void init(ServletConfig config) throws ServletException {
+        super.init(config);
+    }
+
+    /**
+     * @see Servlet#destroy()
+     */
+    public void destroy() {
+        // TODO Auto-generated method stub
+    }
+
+    /**
+     * @see HttpServlet#service(HttpServletRequest request, HttpServletResponse
+     *      response)
+     */
+    protected void service(HttpServletRequest request,
+            HttpServletResponse response) throws ServletException, IOException {
+        String action = request.getParameter("action");
+
+        if (action.equals("listOwners")) {
+            String[] owners = admin.listOwners();
+            request.setAttribute("owners", owners);
+
+            this.getServletConfig().getServletContext().getRequestDispatcher("/admin/showOwners.jsp").include(request, response);
+        }
+
+        if (action.equals("listCDs")) {
+            String[] cds = admin.listAllDataCDs();
+            request.setAttribute("cds", cds);
+
+            this.getServletConfig().getServletContext().getRequestDispatcher("/admin/showCDs.jsp").include(request, response);
+
+        }
+
+        if (action.equals("findpasswd")) {
+            String ownername = request.getParameter("ownername");
+            String passwd = admin.findpasswd(ownername);
+            request.setAttribute("passwd", passwd);
+            request.setAttribute("ownername", ownername);
+
+            this.getServletConfig().getServletContext().getRequestDispatcher("/admin/showPasswd.jsp").include(request, response);
+        }
+    }
+
+    /**
+     * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse
+     *      response)
+     */
+    protected void doGet(HttpServletRequest request,
+            HttpServletResponse response) throws ServletException, IOException {
+        service(request, response);
+    }
+
+    /**
+     * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse
+     *      response)
+     */
+    protected void doPost(HttpServletRequest request,
+            HttpServletResponse response) throws ServletException, IOException {
+        service(request, response);
+    }
 
 }

Modified: geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/ListOwnerServlet.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/ListOwnerServlet.java?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/ListOwnerServlet.java (original)
+++ geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/ListOwnerServlet.java Mon Mar  7 05:17:11 2011
@@ -42,12 +42,12 @@ import javax.transaction.UserTransaction
  * to manually manage transaction before using EntityManager to query database.
  */
 public class ListOwnerServlet extends HttpServlet {
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
     
-	@PersistenceUnit(unitName="DataCDInfoUnit") 
-	private EntityManagerFactory emf;
-	@Resource 
-	private UserTransaction utx;
+    @PersistenceUnit(unitName="DataCDInfoUnit") 
+    private EntityManagerFactory emf;
+    @Resource 
+    private UserTransaction utx;
 
     /**
      * @see HttpServlet#HttpServlet()
@@ -57,52 +57,52 @@ public class ListOwnerServlet extends Ht
         // TODO Auto-generated constructor stub
     }
 
-	/**
-	 * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response)
-	 */
-	protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-		// TODO Auto-generated method stub
-		service(request,response);
-	}
-
-	/**
-	 * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response)
-	 */
-	protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-		// TODO Auto-generated method stub
-		service(request,response);
-	}
-	
-	protected void service(HttpServletRequest req, HttpServletResponse res)
-	  throws ServletException, IOException {		
-		
-		List<Object[]> owners = new ArrayList<Object[]>();
-		
-		EntityManager em = emf.createEntityManager();
-		try {
-			utx.begin();
-			Query query = em.createNativeQuery("select * from OWNER_TABLE");
-			owners = query.getResultList();
-			utx.commit();			
-		} catch (Exception e){
-			e.printStackTrace();
-		}
-
-		res.setContentType("text/html");
-		PrintWriter out = res.getWriter();
-	    
-	    out.print("<html>");
-	    out.print("<head><title>Registered Owners</title></head>");
-	    out.print("<body>");	    
-
-	    for (Object[] owner : owners)
-	    {
-	      out.print(owner[0].toString() + "/" + owner[1].toString() + "<br>");
-	    }
-	    
-	    //out.print(System.getProperties());
-	    out.print("</body>");
-	    out.print("</html>");
-	  }
+    /**
+     * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response)
+     */
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        // TODO Auto-generated method stub
+        service(request,response);
+    }
+
+    /**
+     * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response)
+     */
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        // TODO Auto-generated method stub
+        service(request,response);
+    }
+    
+    protected void service(HttpServletRequest req, HttpServletResponse res)
+      throws ServletException, IOException {        
+        
+        List<Object[]> owners = new ArrayList<Object[]>();
+        
+        EntityManager em = emf.createEntityManager();
+        try {
+            utx.begin();
+            Query query = em.createNativeQuery("select * from OWNER_TABLE");
+            owners = query.getResultList();
+            utx.commit();            
+        } catch (Exception e){
+            e.printStackTrace();
+        }
+
+        res.setContentType("text/html");
+        PrintWriter out = res.getWriter();
+        
+        out.print("<html>");
+        out.print("<head><title>Registered Owners</title></head>");
+        out.print("<body>");        
+
+        for (Object[] owner : owners)
+        {
+          out.print(owner[0].toString() + "/" + owner[1].toString() + "<br>");
+        }
+        
+        //out.print(System.getProperties());
+        out.print("</body>");
+        out.print("</html>");
+      }
 
 }

Modified: geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/DataCDActions.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/DataCDActions.java?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/DataCDActions.java (original)
+++ geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/DataCDActions.java Mon Mar  7 05:17:11 2011
@@ -36,81 +36,81 @@ import org.apache.struts.actions.Mapping
 
 public class DataCDActions extends MappingDispatchAction {
 
-	public static final String DATACD = "datacd";
-	public static final String OWNER = "owner";
+    public static final String DATACD = "datacd";
+    public static final String OWNER = "owner";
 
-	public DataCDActions() {
-		// TODO Auto-generated constructor stub
-	}
-
-	public ActionForward update(ActionMapping mapping, ActionForm form,
-			HttpServletRequest request, HttpServletResponse response)
-			throws Exception {
-		HttpSession session = request.getSession();
-		ServletContext ctx = session.getServletContext();
-		DataCDInfoRemote logic = (DataCDInfoRemote) ctx.getAttribute("logic");
-
-		DataCDForm form1 = (DataCDForm) form;
-		logic.updateCD(form1.getCdID(), form1
-				.getCdSize(), form1.getCdDescription(), form1
-				.getCdArchiveDate());		
-
-		refreshOwnerForm(session, logic);
-
-		return mapping.findForward("success");
-
-	}
-
-	public ActionForward add(ActionMapping mapping, ActionForm form,
-			HttpServletRequest request, HttpServletResponse response)
-			throws Exception {
-		HttpSession session = request.getSession();
-		ServletContext ctx = session.getServletContext();
-		DataCDInfoRemote logic = (DataCDInfoRemote) ctx.getAttribute("logic");
-
-		DataCDForm form1 = (DataCDForm) form;		
-		// add a new CD
-		DataCDBean newcd = logic.addCD(form1.getOwner().getUsername(), form1.getCdLabel(), form1
-				.getCdSize(), form1.getCdDescription(), form1
-				.getCdArchiveDate());
-		if (newcd == null){
-			ActionMessages errors = new ActionMessages();
-			errors.add(ActionMessages.GLOBAL_MESSAGE,
-					new ActionMessage("errors.duplicated.cdlabel"));
-			this.saveErrors(request, errors);
-			return mapping.getInputForward();
-		}
-
-		refreshOwnerForm(session, logic);
-
-		return mapping.findForward("success");
-
-	}
-
-	public ActionForward remove(ActionMapping mapping, ActionForm form,
-			HttpServletRequest request, HttpServletResponse response)
-			throws Exception {
-		HttpSession session = request.getSession();
-		ServletContext ctx = session.getServletContext();
-		DataCDInfoRemote logic = (DataCDInfoRemote) ctx.getAttribute("logic");
-
-		DataCDForm form1 = (DataCDForm) form;
-		if (logic.removeCD(form1.getCdID())) {
-			refreshOwnerForm(session, logic);
-		}
-
-		return mapping.findForward("success");
-
-	}
-
-	private void refreshOwnerForm(HttpSession session, DataCDInfoRemote logic)
-			throws Exception {
-		// refresh owner object
-		OwnerForm ownerform = (OwnerForm) session.getAttribute(OWNER);
-		String ownername = ownerform.getUsername();
-		OwnerBean ownerbean = logic.refreshCDInfo(ownername);
-		PropertyUtils.copyProperties(ownerform, ownerbean);
-		session.setAttribute(OWNER, ownerform);
-	}
+    public DataCDActions() {
+        // TODO Auto-generated constructor stub
+    }
+
+    public ActionForward update(ActionMapping mapping, ActionForm form,
+            HttpServletRequest request, HttpServletResponse response)
+            throws Exception {
+        HttpSession session = request.getSession();
+        ServletContext ctx = session.getServletContext();
+        DataCDInfoRemote logic = (DataCDInfoRemote) ctx.getAttribute("logic");
+
+        DataCDForm form1 = (DataCDForm) form;
+        logic.updateCD(form1.getCdID(), form1
+                .getCdSize(), form1.getCdDescription(), form1
+                .getCdArchiveDate());        
+
+        refreshOwnerForm(session, logic);
+
+        return mapping.findForward("success");
+
+    }
+
+    public ActionForward add(ActionMapping mapping, ActionForm form,
+            HttpServletRequest request, HttpServletResponse response)
+            throws Exception {
+        HttpSession session = request.getSession();
+        ServletContext ctx = session.getServletContext();
+        DataCDInfoRemote logic = (DataCDInfoRemote) ctx.getAttribute("logic");
+
+        DataCDForm form1 = (DataCDForm) form;        
+        // add a new CD
+        DataCDBean newcd = logic.addCD(form1.getOwner().getUsername(), form1.getCdLabel(), form1
+                .getCdSize(), form1.getCdDescription(), form1
+                .getCdArchiveDate());
+        if (newcd == null){
+            ActionMessages errors = new ActionMessages();
+            errors.add(ActionMessages.GLOBAL_MESSAGE,
+                    new ActionMessage("errors.duplicated.cdlabel"));
+            this.saveErrors(request, errors);
+            return mapping.getInputForward();
+        }
+
+        refreshOwnerForm(session, logic);
+
+        return mapping.findForward("success");
+
+    }
+
+    public ActionForward remove(ActionMapping mapping, ActionForm form,
+            HttpServletRequest request, HttpServletResponse response)
+            throws Exception {
+        HttpSession session = request.getSession();
+        ServletContext ctx = session.getServletContext();
+        DataCDInfoRemote logic = (DataCDInfoRemote) ctx.getAttribute("logic");
+
+        DataCDForm form1 = (DataCDForm) form;
+        if (logic.removeCD(form1.getCdID())) {
+            refreshOwnerForm(session, logic);
+        }
+
+        return mapping.findForward("success");
+
+    }
+
+    private void refreshOwnerForm(HttpSession session, DataCDInfoRemote logic)
+            throws Exception {
+        // refresh owner object
+        OwnerForm ownerform = (OwnerForm) session.getAttribute(OWNER);
+        String ownername = ownerform.getUsername();
+        OwnerBean ownerbean = logic.refreshCDInfo(ownername);
+        PropertyUtils.copyProperties(ownerform, ownerbean);
+        session.setAttribute(OWNER, ownerform);
+    }
 
 }

Modified: geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/DataCDForm.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/DataCDForm.java?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/DataCDForm.java (original)
+++ geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/DataCDForm.java Mon Mar  7 05:17:11 2011
@@ -25,62 +25,62 @@ import java.sql.Date;
 import javax.servlet.http.HttpServletRequest;
 
 public class DataCDForm extends ValidatorActionForm {
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -2878208025571945031L;
-	
-	private Integer cdID = null;	
-	private String cdLabel = null;
-	private String cdDescription = null;
-	private Integer cdSize = null;
-	private Date cdArchiveDate = null;
-	private OwnerForm owner = new OwnerForm();
-	
-	public Integer getCdID() {
-		return cdID;
-	}
-	public void setCdID(Integer cdID) {
-		this.cdID = cdID;
-	}
-	public String getCdLabel() {
-		return cdLabel;
-	}
-	public void setCdLabel(String cdLabel) {
-		this.cdLabel = cdLabel;
-	}
-	public String getCdDescription() {
-		return cdDescription;
-	}
-	public void setCdDescription(String cdDescription) {
-		this.cdDescription = cdDescription;
-	}
-	public Integer getCdSize() {
-		return cdSize;
-	}
-	public void setCdSize(Integer cdSize) {
-		this.cdSize = cdSize;
-	}
-	public Date getCdArchiveDate() {
-		return cdArchiveDate;
-	}
-	public void setCdArchiveDate(Date cdArchiveDate) {
-		this.cdArchiveDate = cdArchiveDate;
-	}
-	public OwnerForm getOwner() {
-		return owner;
-	}
-	public void setOwner(OwnerForm owner) {
-		this.owner = owner;
-	}
-	
-	public void reset(ActionMapping mapping, HttpServletRequest request) {
-	       cdID = null;
-	       cdLabel = null;
-	       cdDescription = null;
-	       cdSize = null;
-	       cdArchiveDate = null;
-	       owner = new OwnerForm();	       
-	    }
+    /**
+     * 
+     */
+    private static final long serialVersionUID = -2878208025571945031L;
+    
+    private Integer cdID = null;    
+    private String cdLabel = null;
+    private String cdDescription = null;
+    private Integer cdSize = null;
+    private Date cdArchiveDate = null;
+    private OwnerForm owner = new OwnerForm();
+    
+    public Integer getCdID() {
+        return cdID;
+    }
+    public void setCdID(Integer cdID) {
+        this.cdID = cdID;
+    }
+    public String getCdLabel() {
+        return cdLabel;
+    }
+    public void setCdLabel(String cdLabel) {
+        this.cdLabel = cdLabel;
+    }
+    public String getCdDescription() {
+        return cdDescription;
+    }
+    public void setCdDescription(String cdDescription) {
+        this.cdDescription = cdDescription;
+    }
+    public Integer getCdSize() {
+        return cdSize;
+    }
+    public void setCdSize(Integer cdSize) {
+        this.cdSize = cdSize;
+    }
+    public Date getCdArchiveDate() {
+        return cdArchiveDate;
+    }
+    public void setCdArchiveDate(Date cdArchiveDate) {
+        this.cdArchiveDate = cdArchiveDate;
+    }
+    public OwnerForm getOwner() {
+        return owner;
+    }
+    public void setOwner(OwnerForm owner) {
+        this.owner = owner;
+    }
+    
+    public void reset(ActionMapping mapping, HttpServletRequest request) {
+           cdID = null;
+           cdLabel = null;
+           cdDescription = null;
+           cdSize = null;
+           cdArchiveDate = null;
+           owner = new OwnerForm();           
+        }
 
 }

Modified: geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/DataCDInfoContextListener.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/DataCDInfoContextListener.java?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/DataCDInfoContextListener.java (original)
+++ geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/DataCDInfoContextListener.java Mon Mar  7 05:17:11 2011
@@ -28,26 +28,26 @@ import javax.ejb.EJB;
 import org.apache.geronimo.samples.datacdinfo.core.DataCDInfoRemote;
 
 public class DataCDInfoContextListener implements ServletContextListener {
-	private ServletContext ctx = null;
-	@EJB
-	private DataCDInfoRemote logic = null;	
+    private ServletContext ctx = null;
+    @EJB
+    private DataCDInfoRemote logic = null;    
 
-	
-	public void contextDestroyed(ServletContextEvent event) {
-		ctx = event.getServletContext();		
-		ctx.removeAttribute("logic");		
-	}
+    
+    public void contextDestroyed(ServletContextEvent event) {
+        ctx = event.getServletContext();        
+        ctx.removeAttribute("logic");        
+    }
 
-	
-	public void contextInitialized(ServletContextEvent event) {
-		ctx = event.getServletContext();
-		
-		if (logic instanceof DataCDInfoRemote) {
-			ctx.setAttribute("logic", logic);
-			System.out.println(">>>>>>>>>>>>>>>>>>>>> Injected ejb DataCDInfoJTAImpl!");
-		} else {
-			System.out.println(">>>>>>>>>>>>>>>>>>>>> Cannot inject ejb DataCDInfoJTAImpl!");
-		}
-	}
+    
+    public void contextInitialized(ServletContextEvent event) {
+        ctx = event.getServletContext();
+        
+        if (logic instanceof DataCDInfoRemote) {
+            ctx.setAttribute("logic", logic);
+            System.out.println(">>>>>>>>>>>>>>>>>>>>> Injected ejb DataCDInfoJTAImpl!");
+        } else {
+            System.out.println(">>>>>>>>>>>>>>>>>>>>> Cannot inject ejb DataCDInfoJTAImpl!");
+        }
+    }
 
 }

Modified: geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/OwnerActions.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/OwnerActions.java?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/OwnerActions.java (original)
+++ geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/OwnerActions.java Mon Mar  7 05:17:11 2011
@@ -37,78 +37,78 @@ import org.apache.struts.action.ActionMe
 import org.apache.struts.actions.MappingDispatchAction;
 
 public class OwnerActions extends MappingDispatchAction {
-	public static final String OWNER = "owner";
+    public static final String OWNER = "owner";
 
-	public ActionForward logon(ActionMapping mapping, ActionForm form,
-			HttpServletRequest request, HttpServletResponse response)
-			throws Exception {
-		HttpSession session = request.getSession();
-		OwnerForm ownerform = (OwnerForm) session.getAttribute(OWNER);
-		if (ownerform == null) {
-			ServletContext ctx = session.getServletContext();
-			DataCDInfoRemote logic = (DataCDInfoRemote) ctx
-					.getAttribute("logic");
-			OwnerBean owner = new OwnerBean();
-			PropertyUtils.copyProperties(owner, form);
-
-			try {
-				OwnerBean loginuser = logic.login(owner.getUsername(), owner
-						.getPassword());
-				PropertyUtils.copyProperties(form, loginuser);
-			} catch (Exception e) {
-				e.printStackTrace();
-				ActionMessages errors = new ActionMessages();
-				if (e instanceof InvalidOwnerException) {
-					errors.add(ActionMessages.GLOBAL_MESSAGE,
-							new ActionMessage("errors.invalid.owner"));
-
-				}
-				if (e instanceof IncorrectPasswordException) {
-					errors.add(ActionMessages.GLOBAL_MESSAGE,
-							new ActionMessage("errors.incorrect.password"));
-				}
-				this.saveErrors(request, errors);
-				return mapping.getInputForward();
-			}
-			session.setAttribute(OWNER, form);
-
-		}
-
-		return mapping.findForward("success");
-	}
-
-	public ActionForward register(ActionMapping mapping, ActionForm form,
-			HttpServletRequest request, HttpServletResponse response)
-			throws Exception {
-		HttpSession session = request.getSession();
-
-		ServletContext ctx = session.getServletContext();
-		DataCDInfoRemote logic = (DataCDInfoRemote) ctx.getAttribute("logic");
-		OwnerBean owner = new OwnerBean();
-		PropertyUtils.copyProperties(owner, form);
-
-		try {
-			OwnerBean loginuser = logic.register(owner.getUsername(), owner
-					.getPassword());
-			PropertyUtils.copyProperties(form, loginuser);
-		} catch (Exception e) {
-			System.out.println(e.getMessage());
-			ActionMessages errors = new ActionMessages();
-			if (e instanceof InvalidOwnerException) {
-				errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(
-						"errors.existing.owner"));
-
-			}
-			if (e instanceof InvalidPasswordException) {
-				errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(
-						"errors.invalid.password"));
-			}
-			this.saveErrors(request, errors);
-			return mapping.getInputForward();
-		}
-		session.setAttribute(OWNER, form);
+    public ActionForward logon(ActionMapping mapping, ActionForm form,
+            HttpServletRequest request, HttpServletResponse response)
+            throws Exception {
+        HttpSession session = request.getSession();
+        OwnerForm ownerform = (OwnerForm) session.getAttribute(OWNER);
+        if (ownerform == null) {
+            ServletContext ctx = session.getServletContext();
+            DataCDInfoRemote logic = (DataCDInfoRemote) ctx
+                    .getAttribute("logic");
+            OwnerBean owner = new OwnerBean();
+            PropertyUtils.copyProperties(owner, form);
+
+            try {
+                OwnerBean loginuser = logic.login(owner.getUsername(), owner
+                        .getPassword());
+                PropertyUtils.copyProperties(form, loginuser);
+            } catch (Exception e) {
+                e.printStackTrace();
+                ActionMessages errors = new ActionMessages();
+                if (e instanceof InvalidOwnerException) {
+                    errors.add(ActionMessages.GLOBAL_MESSAGE,
+                            new ActionMessage("errors.invalid.owner"));
+
+                }
+                if (e instanceof IncorrectPasswordException) {
+                    errors.add(ActionMessages.GLOBAL_MESSAGE,
+                            new ActionMessage("errors.incorrect.password"));
+                }
+                this.saveErrors(request, errors);
+                return mapping.getInputForward();
+            }
+            session.setAttribute(OWNER, form);
+
+        }
+
+        return mapping.findForward("success");
+    }
+
+    public ActionForward register(ActionMapping mapping, ActionForm form,
+            HttpServletRequest request, HttpServletResponse response)
+            throws Exception {
+        HttpSession session = request.getSession();
+
+        ServletContext ctx = session.getServletContext();
+        DataCDInfoRemote logic = (DataCDInfoRemote) ctx.getAttribute("logic");
+        OwnerBean owner = new OwnerBean();
+        PropertyUtils.copyProperties(owner, form);
+
+        try {
+            OwnerBean loginuser = logic.register(owner.getUsername(), owner
+                    .getPassword());
+            PropertyUtils.copyProperties(form, loginuser);
+        } catch (Exception e) {
+            System.out.println(e.getMessage());
+            ActionMessages errors = new ActionMessages();
+            if (e instanceof InvalidOwnerException) {
+                errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(
+                        "errors.existing.owner"));
+
+            }
+            if (e instanceof InvalidPasswordException) {
+                errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(
+                        "errors.invalid.password"));
+            }
+            this.saveErrors(request, errors);
+            return mapping.getInputForward();
+        }
+        session.setAttribute(OWNER, form);
 
-		return mapping.findForward("success");
-	}
+        return mapping.findForward("success");
+    }
 
 }

Modified: geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/OwnerForm.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/OwnerForm.java?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/OwnerForm.java (original)
+++ geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/OwnerForm.java Mon Mar  7 05:17:11 2011
@@ -23,48 +23,48 @@ import java.util.Collection;
 import org.apache.struts.validator.ValidatorForm;
 
 public class OwnerForm extends ValidatorForm {
-	
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 8367551067568662573L;
-	private String username;
-	private String password;
-	private String password2;
-	
-
-	private Collection<DataCDForm> DataCDs;
-	
-	public Collection<DataCDForm> getDataCDs() {
-		return DataCDs;
-	}
-
-	public void setDataCDs(Collection<DataCDForm> dataCDs) {
-		DataCDs = dataCDs;
-	}
-
-	public void setUsername(String username) {
-		this.username = username;
-	}
-
-	public String getUsername() {
-		return username;
-	}
-
-	public void setPassword(String password) {
-		this.password = password;
-	}
-
-	public String getPassword() {
-		return password;
-	}
-	
-	public String getPassword2() {
-		return password2;
-	}
-
-	public void setPassword2(String password2) {
-		this.password2 = password2;
-	}
+    
+    /**
+     * 
+     */
+    private static final long serialVersionUID = 8367551067568662573L;
+    private String username;
+    private String password;
+    private String password2;
+    
+
+    private Collection<DataCDForm> DataCDs;
+    
+    public Collection<DataCDForm> getDataCDs() {
+        return DataCDs;
+    }
+
+    public void setDataCDs(Collection<DataCDForm> dataCDs) {
+        DataCDs = dataCDs;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+    
+    public String getPassword2() {
+        return password2;
+    }
+
+    public void setPassword2(String password2) {
+        this.password2 = password2;
+    }
 
 }



Mime
View raw message