geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From viol...@apache.org
Subject svn commit: r1078686 [1/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
Author: violalu
Date: Mon Mar  7 05:17:11 2011
New Revision: 1078686

URL: http://svn.apache.org/viewvc?rev=1078686&view=rev
Log:
remove daytrader plugins from sample pom.xml and replace all tabs with spaces

Modified:
    geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ear/src/main/resources/META-INF/application.xml
    geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ear/src/main/resources/META-INF/geronimo-application.xml
    geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ejb/src/main/resources/META-INF/ejb-jar.xml
    geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ejb/src/main/resources/META-INF/openejb-jar.xml
    geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ejb/src/main/resources/META-INF/persistence.xml
    geronimo/samples/trunk/pom.xml
    geronimo/samples/trunk/samples/all-samples/all-samples-jetty/pom.xml
    geronimo/samples/trunk/samples/all-samples/all-samples-tomcat/pom.xml
    geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ear/pom.xml
    geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/DataCDInfo_tables_derby.sql
    geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/DataCDInfo_tables_mysql.sql
    geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/geronimo-application-mysql.xml
    geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/geronimo-application.xml
    geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/pom.xml
    geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/beans/DataCDBean.java
    geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/beans/OwnerBean.java
    geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/core/DataCDInfoAdmin.java
    geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/core/DataCDInfoAdminLocal.java
    geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/core/DataCDInfoJTAImpl.java
    geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/core/DataCDInfoLocal.java
    geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/core/DataCDInfoRemote.java
    geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/exceptions/DuplicatedDataCDException.java
    geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/exceptions/IncorrectPasswordException.java
    geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/exceptions/InvalidOwnerException.java
    geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/exceptions/InvalidPasswordException.java
    geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/resources/META-INF/ejb-jar.xml
    geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/resources/META-INF/openejb-jar.xml
    geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/resources/META-INF/persistence.xml
    geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/treeListing.txt
    geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-jetty/src/main/plan/plan.xml
    geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-tomcat/src/main/plan/plan.xml
    geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/pom.xml
    geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/DataCDInfoAdminServlet.java
    geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/ListOwnerServlet.java
    geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/DataCDActions.java
    geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/DataCDForm.java
    geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/DataCDInfoContextListener.java
    geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/OwnerActions.java
    geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/OwnerForm.java
    geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/geronimo-web.xml
    geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/struts-config.xml
    geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/validation.xml
    geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/web.xml
    geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/showCDs.jsp
    geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/showOwners.jsp
    geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/showPasswd.jsp
    geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/auth/logon.html
    geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/auth/logonError.html
    geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/AddCD.jsp
    geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/ListCDs.jsp
    geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/Logon.jsp
    geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/Logout.jsp
    geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/RemoveCD.jsp
    geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/UpdateCD.jsp
    geronimo/samples/trunk/samples/javaee5/DataCDInfo/pom.xml
    geronimo/samples/trunk/samples/javaee5/bank/bank-ear/src/main/resources/BankDB.sql
    geronimo/samples/trunk/samples/javaee5/csa-activemq/csa-activemq-jetty/pom.xml
    geronimo/samples/trunk/samples/javaee5/csa-activemq/csa-activemq-tomcat/pom.xml
    geronimo/samples/trunk/samples/javaee5/inventory/inventory-jetty/src/main/plan/plan.xml
    geronimo/samples/trunk/samples/javaee5/inventory/inventory-war/src/main/resources/InventoryDB.sql
    geronimo/samples/trunk/samples/javaee5/inventory/inventory-war/src/main/webapp/WEB-INF/web.xml
    geronimo/samples/trunk/samples/javaee5/jms-mdb/jms-mdb-ejb/src/main/resources/META-INF/openejb-jar.xml
    geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/classes/cal/Entries.java
    geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/classes/cal/JspCalendar.java
    geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/classes/cal/TableBean.java
    geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/classes/checkbox/CheckTest.java
    geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/classes/colors/ColorGameBean.java
    geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/classes/dates/JspCalendar.java
    geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/classes/error/Smart.java
    geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/classes/examples/FooTag.java
    geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/classes/examples/ShowSource.java
    geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/classes/filters/ExampleFilter.java
    geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/classes/filters/RequestDumperFilter.java
    geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/classes/filters/SetCharacterEncodingFilter.java
    geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/classes/jsp2/examples/el/Functions.java
    geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/classes/jsp2/examples/simpletag/EchoAttributesTag.java
    geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/classes/jsp2/examples/simpletag/FindBookSimpleTag.java
    geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/classes/jsp2/examples/simpletag/HelloWorldSimpleTag.java
    geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/classes/jsp2/examples/simpletag/RepeatSimpleTag.java
    geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/classes/jsp2/examples/simpletag/TileSimpleTag.java
    geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/classes/listeners/ContextListener.java
    geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/classes/listeners/SessionListener.java
    geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/classes/servletToJsp.java
    geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/classes/sessions/DummyCart.java
    geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-war/src/main/webapp/images/code.gif
    geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-war/src/main/webapp/images/execute.gif
    geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-war/src/main/webapp/images/read.gif
    geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-war/src/main/webapp/images/return.gif
    geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/jspattribute/jspattribute.jsp
    geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/jspx/textRotate.jpg
    geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/tagfiles/products.jsp
    geronimo/samples/trunk/samples/javaee5/pom.xml
    geronimo/samples/trunk/samples/javaee5/servlet-examples/servlet-examples-war/src/main/webapp/WEB-INF/classes/CookieExample.java
    geronimo/samples/trunk/samples/javaee5/servlet-examples/servlet-examples-war/src/main/webapp/WEB-INF/classes/HelloWorldExample.java
    geronimo/samples/trunk/samples/javaee5/servlet-examples/servlet-examples-war/src/main/webapp/WEB-INF/classes/RequestHeaderExample.java
    geronimo/samples/trunk/samples/javaee5/servlet-examples/servlet-examples-war/src/main/webapp/WEB-INF/classes/RequestInfoExample.java
    geronimo/samples/trunk/samples/javaee5/servlet-examples/servlet-examples-war/src/main/webapp/WEB-INF/classes/RequestParamExample.java
    geronimo/samples/trunk/samples/javaee5/servlet-examples/servlet-examples-war/src/main/webapp/WEB-INF/classes/SessionExample.java
    geronimo/samples/trunk/samples/javaee5/servlet-examples/servlet-examples-war/src/main/webapp/WEB-INF/classes/filters/ExampleFilter.java
    geronimo/samples/trunk/samples/javaee5/servlet-examples/servlet-examples-war/src/main/webapp/WEB-INF/classes/filters/RequestDumperFilter.java
    geronimo/samples/trunk/samples/javaee5/servlet-examples/servlet-examples-war/src/main/webapp/WEB-INF/classes/filters/SetCharacterEncodingFilter.java
    geronimo/samples/trunk/samples/javaee5/servlet-examples/servlet-examples-war/src/main/webapp/WEB-INF/classes/listeners/ContextListener.java
    geronimo/samples/trunk/samples/javaee5/servlet-examples/servlet-examples-war/src/main/webapp/WEB-INF/classes/listeners/SessionListener.java
    geronimo/samples/trunk/samples/javaee5/servlet-examples/servlet-examples-war/src/main/webapp/images/code.gif
    geronimo/samples/trunk/samples/javaee5/servlet-examples/servlet-examples-war/src/main/webapp/images/execute.gif
    geronimo/samples/trunk/samples/javaee5/servlet-examples/servlet-examples-war/src/main/webapp/images/return.gif
    geronimo/samples/trunk/samples/javaee5/timereport/timereport-war/src/main/resources/TimeReportDB.sql
    geronimo/samples/trunk/samples/javaee5/timereport/timereport-war/src/main/webapp/WEB-INF/web.xml
    geronimo/samples/trunk/samples/javaee6/converter-javaee6/converter-javaee6-war/pom.xml
    geronimo/samples/trunk/samples/javaee6/converter-javaee6/converter-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/converter/ConvertedValue.java
    geronimo/samples/trunk/samples/javaee6/converter-javaee6/converter-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/converter/ConverterBean.java
    geronimo/samples/trunk/samples/javaee6/converter-javaee6/converter-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/converter/Currency.java
    geronimo/samples/trunk/samples/javaee6/converter-javaee6/converter-javaee6-war/src/main/webapp/index.xhtml
    geronimo/samples/trunk/samples/javaee6/cviewer-javaee6/cviewer-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/cviewer/CviewerServletListener.java
    geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-war/pom.xml
    geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/ejbtimer/entity/Log.java
    geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/ejbtimer/servlets/showLog.java
    geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/ejbtimer/sessionBean/logFacade.java
    geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/ejbtimer/sessionBean/scheduleTask.java
    geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-war/src/main/webapp/WEB-INF/geronimo-web.xml
    geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-war/src/main/webapp/WEB-INF/web.xml
    geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-war/src/main/webapp/header.html
    geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-war/src/main/webapp/intro.html
    geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/pom.xml
    geronimo/samples/trunk/samples/javaee6/fileupload-javaee6/fileupload-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/fileupload/MessageFilter.java
    geronimo/samples/trunk/samples/javaee6/fileupload-javaee6/fileupload-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/fileupload/showServlet.java
    geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-war/pom.xml
    geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-jetty/pom.xml
    geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/pom.xml
    geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/jpa20demo/ejb/MessageFacade.java
    geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/jpa20demo/entity/Message.java
    geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/jpa20demo/managedbean/MessageView.java
    geronimo/samples/trunk/samples/javaee6/pom.xml
    geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/pom.xml
    geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-jetty/pom.xml
    geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-tomcat/pom.xml
    geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-war/pom.xml
    geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/pom.xml
    geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/pom.xml
    geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/webapp/SubtractCal.xhtml
    geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/webapp/index.html
    geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/webapp/index.xhtml
    geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-war/src/main/webapp/sample-docu.jsp
    geronimo/samples/trunk/samples/javaee6/webfragment-javaee6/pom.xml
    geronimo/samples/trunk/samples/osgi/showmethemoney/showmethemoney-api/pom.xml
    geronimo/samples/trunk/samples/osgi/showmethemoney/showmethemoney-server/pom.xml
    geronimo/samples/trunk/samples/osgi/showmethemoney/showmethemoney-server/src/main/java/org/apache/geronimo/samples/osgi/showmethemoney/server/ShowMoney.java
    geronimo/samples/trunk/samples/osgi/showmethemoney/showmethemoney-web/src/main/java/org/apache/geronimo/samples/osgi/showmethemoney/web/ShowMoneyServlet.java
    geronimo/samples/trunk/samples/osgi/showmethemoney/sql/MoneyDB.sql

Modified: geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ear/src/main/resources/META-INF/application.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ear/src/main/resources/META-INF/application.xml?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ear/src/main/resources/META-INF/application.xml (original)
+++ geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ear/src/main/resources/META-INF/application.xml Mon Mar  7 05:17:11 2011
@@ -18,7 +18,7 @@
 <application xmlns="http://java.sun.com/xml/ns/javaee"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://java.sun.com/xml/ns/javaee 
-      	http://java.sun.com/xml/ns/javaee/application_6.xsd"
+          http://java.sun.com/xml/ns/javaee/application_6.xsd"
       version="6" id="${pom.artifactId}">
 
   <display-name>${pom.name}</display-name>

Modified: geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ear/src/main/resources/META-INF/geronimo-application.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ear/src/main/resources/META-INF/geronimo-application.xml?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ear/src/main/resources/META-INF/geronimo-application.xml (original)
+++ geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ear/src/main/resources/META-INF/geronimo-application.xml Mon Mar  7 05:17:11 2011
@@ -16,36 +16,36 @@
     limitations under the License.
 -->
 <application application-name="${artifactId}"
-	xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-2.0">
-	<environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-		<moduleId>
-			<groupId>org.apache.geronimo.samples</groupId>
-			<artifactId>${artifactId}</artifactId>
-			<version>${version}</version>
-			<type>car</type>
-		</moduleId>
-		<dependencies>
-			<!--<dependency>
-				<groupId>org.apache.geronimo.configs</groupId>
+    xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-2.0">
+    <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+        <moduleId>
+            <groupId>org.apache.geronimo.samples</groupId>
+            <artifactId>${artifactId}</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </moduleId>
+        <dependencies>
+            <!--<dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
                 <artifactId>system-database</artifactId>
                 <type>car</type>
-			</dependency>-->
-		</dependencies>
-	</environment>
+            </dependency>-->
+        </dependencies>
+    </environment>
 
-	<module>
-		<ejb>${artifactId}-ejb-${version}.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="UnitName">
-					<properties>
-						<property name="openjpa.jdbc.DBDictionary" value="derby" />
-					</properties>
-				</persistence-unit>
-			</persistence>-->
-		</openejb-jar>
-	</module>
+    <module>
+        <ejb>${artifactId}-ejb-${version}.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="UnitName">
+                    <properties>
+                        <property name="openjpa.jdbc.DBDictionary" value="derby" />
+                    </properties>
+                </persistence-unit>
+            </persistence>-->
+        </openejb-jar>
+    </module>
 
     <module>
         <web>${artifactId}-war-${version}.war</web>
@@ -63,38 +63,38 @@
         </web-app>
     </module>
 
-	<!--<ext-module>
-		<connector>ConnectorName</connector>
-		<external-path xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
-			<dep:groupId>org.tranql</dep:groupId>
-			<dep:artifactId>tranql-connector-derby-embed-xa</dep:artifactId>
-			<dep:type>rar</dep:type>
-		</external-path>
-		<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
-			<resourceadapter>
-				<outbound-resourceadapter>
-					<connection-definition>
-						<connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
-						<connectiondefinition-instance>
-							<name>jdbc/YourSampleDS</name>
-							<config-property-setting name="UserName"></config-property-setting>
+    <!--<ext-module>
+        <connector>ConnectorName</connector>
+        <external-path xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
+            <dep:groupId>org.tranql</dep:groupId>
+            <dep:artifactId>tranql-connector-derby-embed-xa</dep:artifactId>
+            <dep:type>rar</dep:type>
+        </external-path>
+        <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
+            <resourceadapter>
+                <outbound-resourceadapter>
+                    <connection-definition>
+                        <connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
+                        <connectiondefinition-instance>
+                            <name>jdbc/YourSampleDS</name>
+                            <config-property-setting name="UserName"></config-property-setting>
                             <config-property-setting name="Password"></config-property-setting>
                             <config-property-setting name="DatabaseName">derbydb</config-property-setting>
                             <config-property-setting name="CreateDatabase">true</config-property-setting>
-							<connectionmanager>
-								<xa-transaction>
-									<transaction-caching />
-								</xa-transaction>
-								<single-pool>
-									<max-size>100</max-size>
-									<min-size>0</min-size>
-									<blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
-									<idle-timeout-minutes>30</idle-timeout-minutes>
-									<match-one />
-								</single-pool>
-							</connectionmanager>
-						</connectiondefinition-instance>						
-						<connectiondefinition-instance>
+                            <connectionmanager>
+                                <xa-transaction>
+                                    <transaction-caching />
+                                </xa-transaction>
+                                <single-pool>
+                                    <max-size>100</max-size>
+                                    <min-size>0</min-size>
+                                    <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+                                    <idle-timeout-minutes>30</idle-timeout-minutes>
+                                    <match-one />
+                                </single-pool>
+                            </connectionmanager>
+                        </connectiondefinition-instance>                        
+                        <connectiondefinition-instance>
                             <name>jdbc/NoTxYourSampleDS</name>
                             <config-property-setting name="UserName"></config-property-setting>
                             <config-property-setting name="Password"></config-property-setting>
@@ -111,13 +111,13 @@
                                 </single-pool>
                             </connectionmanager>
                         </connectiondefinition-instance>
-					</connection-definition>
-				</outbound-resourceadapter>
-			</resourceadapter>
-		</connector>
-	</ext-module>-->
-	
-	
+                    </connection-definition>
+                </outbound-resourceadapter>
+            </resourceadapter>
+        </connector>
+    </ext-module>-->
+    
+    
 
   <!--<security xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0">
     <sec:default-principal>
@@ -134,8 +134,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">sample.sql</attribute>
         <reference name="DataSource">
             <name>jdbc/NoTxYourSampleDS</name>

Modified: geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ejb/src/main/resources/META-INF/ejb-jar.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ejb/src/main/resources/META-INF/ejb-jar.xml?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ejb/src/main/resources/META-INF/ejb-jar.xml (original)
+++ geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ejb/src/main/resources/META-INF/ejb-jar.xml Mon Mar  7 05:17:11 2011
@@ -18,37 +18,37 @@
 <ejb-jar xmlns="http://java.sun.com/xml/ns/javaee"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
-      	  http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd"
+            http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd"
       version="3.1">
 
     <display-name>${artifactId} Bean Definitions</display-name>
     
     <enterprise-beans>
-		<!--<session>
-			<ejb-name>ejb/YourBeanName</ejb-name>
-			<business-local>org.apache.geronimo.samples.${artifactId}.YourBeanLocal</business-local>
-			<business-remote>org.apache.geronimo.samples.${artifactId}.YourBeanRemote</business-remote>
-			<ejb-class>org.apache.geronimo.samples.${artifactId}.YourBeanImpl</ejb-class>
-			<session-type>Stateless</session-type>
-			<transaction-type>Container</transaction-type>
-		</session>	-->
-	</enterprise-beans>
-	
-	<!--<assembly-descriptor>
-			<method-permission>
-				<role-name>superadmin</role-name>
-				<method>
-					<ejb-name>ejb/YourBeanName</ejb-name>
-					<method-name>*</method-name>
-				</method>
-			</method-permission>			
-			<method-permission>
-				<role-name>admin</role-name>
-				<method>
-					<ejb-name>ejb/YourBeanName</ejb-name>
-					<method-name>YourBeanMethodName</method-name>					
-				</method>
-			</method-permission>
-	</assembly-descriptor>  -->   
+        <!--<session>
+            <ejb-name>ejb/YourBeanName</ejb-name>
+            <business-local>org.apache.geronimo.samples.${artifactId}.YourBeanLocal</business-local>
+            <business-remote>org.apache.geronimo.samples.${artifactId}.YourBeanRemote</business-remote>
+            <ejb-class>org.apache.geronimo.samples.${artifactId}.YourBeanImpl</ejb-class>
+            <session-type>Stateless</session-type>
+            <transaction-type>Container</transaction-type>
+        </session>    -->
+    </enterprise-beans>
+    
+    <!--<assembly-descriptor>
+            <method-permission>
+                <role-name>superadmin</role-name>
+                <method>
+                    <ejb-name>ejb/YourBeanName</ejb-name>
+                    <method-name>*</method-name>
+                </method>
+            </method-permission>            
+            <method-permission>
+                <role-name>admin</role-name>
+                <method>
+                    <ejb-name>ejb/YourBeanName</ejb-name>
+                    <method-name>YourBeanMethodName</method-name>                    
+                </method>
+            </method-permission>
+    </assembly-descriptor>  -->   
 </ejb-jar>
 

Modified: geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ejb/src/main/resources/META-INF/openejb-jar.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ejb/src/main/resources/META-INF/openejb-jar.xml?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ejb/src/main/resources/META-INF/openejb-jar.xml (original)
+++ geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-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>${artifactId}-ejb</dep:artifactId>
-			<dep:version>${version}</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>${artifactId}-ejb</dep:artifactId>
+            <dep:version>${version}</dep:version>
+            <dep:type>car</dep:type>
+        </dep:moduleId>
+    </dep:environment>
 </openejb-jar>

Modified: geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ejb/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ejb/src/main/resources/META-INF/persistence.xml?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ejb/src/main/resources/META-INF/persistence.xml (original)
+++ geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ejb/src/main/resources/META-INF/persistence.xml Mon Mar  7 05:17:11 2011
@@ -24,7 +24,7 @@
   <persistence-unit name="UnitName" transaction-type="JTA">
     <description>${artifactId} Unit Definition</description>
     <!--<jta-data-source>jdbc/YourSampleDS</jta-data-source>
-    <non-jta-data-source>jdbc/NoTxYourSampleDS</non-jta-data-source>	
+    <non-jta-data-source>jdbc/NoTxYourSampleDS</non-jta-data-source>    
     <class>org.apache.geronimo.samples.${artifactId}.beans.YourJPABean</class>    
     <exclude-unlisted-classes>true</exclude-unlisted-classes>
     <properties>      

Modified: geronimo/samples/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/pom.xml?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/pom.xml (original)
+++ geronimo/samples/trunk/pom.xml Mon Mar  7 05:17:11 2011
@@ -51,6 +51,7 @@
         <projectName>Apache Geronimo Samples</projectName>
         <jetty>jetty8</jetty>
         <tomcat>tomcat7</tomcat>
+        <myfacesVersion>2.0.3</myfacesVersion>
     </properties>
 
     <url>http://geronimo.apache.org/maven/${siteId}/${version}</url>
@@ -133,6 +134,18 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            
+            <dependency>
+            <groupId>org.apache.myfaces.core</groupId>
+            <artifactId>myfaces-api</artifactId>
+            <version>${myfacesVersion}</version>
+        </dependency>
+        
+         <dependency>
+            <groupId>org.apache.myfaces.core</groupId>
+            <artifactId>myfaces-bundle</artifactId>
+            <version>${myfacesVersion}</version>
+        </dependency>
         </dependencies>
     </dependencyManagement>
 

Modified: geronimo/samples/trunk/samples/all-samples/all-samples-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/all-samples/all-samples-jetty/pom.xml?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/all-samples/all-samples-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/all-samples/all-samples-jetty/pom.xml Mon Mar  7 05:17:11 2011
@@ -142,7 +142,7 @@
             <version>${project.version}</version>
             <type>car</type>
         </dependency>
-	    <!--<dependency>
+        <!--<dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>DataCDInfo-JTA-jetty</artifactId>
             <version>${project.version}</version>
@@ -205,7 +205,7 @@
             <type>car</type>
         </dependency>-->        
 
-        <!--Daytrader-->
+        <!--Daytrader
         <dependency>
             <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
             <artifactId>daytrader-derby-datasource</artifactId>
@@ -225,7 +225,7 @@
             <artifactId>daytrader-web-jpa-jetty</artifactId>            
             <version>${project.version}</version>
             <type>car</type>
-        </dependency>
+        </dependency>-->
 
         <!--<dependency>
             <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>

Modified: geronimo/samples/trunk/samples/all-samples/all-samples-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/all-samples/all-samples-tomcat/pom.xml?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/all-samples/all-samples-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/all-samples/all-samples-tomcat/pom.xml Mon Mar  7 05:17:11 2011
@@ -150,7 +150,7 @@
             <version>${project.version}</version>
             <type>car</type>
         </dependency>
-	    <!--<dependency>
+        <!--<dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>DataCDInfo-JTA-tomcat</artifactId>
             <version>${project.version}</version>
@@ -212,7 +212,7 @@
             <type>car</type>
         </dependency>-->      
 
-        <!--Daytrader-->
+        <!--Daytrader
         <dependency>
             <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
             <artifactId>daytrader-derby-datasource</artifactId>
@@ -232,7 +232,7 @@
             <artifactId>daytrader-web-jpa-tomcat</artifactId>            
             <version>${project.version}</version>
             <type>car</type>
-        </dependency>
+        </dependency>-->
 
         <!--<dependency>
             <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>

Modified: geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ear/pom.xml?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ear/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ear/pom.xml Mon Mar  7 05:17:11 2011
@@ -1,39 +1,39 @@
 <?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>
+    <parent>
+        <groupId>org.apache.geronimo.samples</groupId>
+        <artifactId>DataCDInfo</artifactId>
+        <version>3.0-SNAPSHOT</version>
+    </parent>
 
-	<artifactId>DataCDInfo-JTA-ear</artifactId>
-	<name>Geronimo Samples :: DataCDInfo JTA + Struts1 :: EAR</name>
-	<packaging>ear</packaging>
+    <artifactId>DataCDInfo-JTA-ear</artifactId>
+    <name>Geronimo Samples :: DataCDInfo JTA + Struts1 :: EAR</name>
+    <packaging>ear</packaging>
 
-	<description>Geronimo Samples - DataCD Information Management Tool</description>
+    <description>Geronimo Samples - DataCD Information Management Tool</description>
 
-	<dependencies>
-		
-	<dependency>
+    <dependencies>
+        
+    <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>DataCDInfo-JTA-war</artifactId>
             <version>${version}</version>
@@ -46,10 +46,10 @@
             <version>${version}</version>
             <type>ejb</type>
         </dependency>
-	</dependencies>
+    </dependencies>
 
-	<build>
-	<plugins>
+    <build>
+    <plugins>
             <plugin>
                 <artifactId>maven-ear-plugin</artifactId>
                 <configuration>
@@ -78,5 +78,5 @@
             </plugin>
 
         </plugins>
-	</build>
+    </build>
 </project>

Modified: geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/DataCDInfo_tables_derby.sql
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/DataCDInfo_tables_derby.sql?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/DataCDInfo_tables_derby.sql (original)
+++ geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/DataCDInfo_tables_derby.sql Mon Mar  7 05:17:11 2011
@@ -16,22 +16,22 @@
 # Each SQL statement in this file should terminate with a semicolon (;)
 # Lines starting with the pound character (#) are considered as comments
 CREATE TABLE OWNER_TABLE (
-		USERNAME VARCHAR(20) NOT NULL,
-		PASSWORD VARCHAR(20) NOT NULL
-	);
+        USERNAME VARCHAR(20) NOT NULL,
+        PASSWORD VARCHAR(20) NOT NULL
+    );
 
 CREATE UNIQUE INDEX SQL090923232106080 ON OWNER_TABLE (null);
 
 ALTER TABLE OWNER_TABLE ADD CONSTRAINT SQL090923232106080 PRIMARY KEY (USERNAME);
 
 CREATE TABLE DATACD_TABLE (
-		CDID INTEGER NOT NULL,
-		CDARCHIVEDATE TIMESTAMP,
-		CDDESC VARCHAR(255),
-		CDLABEL VARCHAR(255) NOT NULL,
-		CDSIZE INTEGER,
-		OWNER_USERNAME VARCHAR(255)
-	);
+        CDID INTEGER NOT NULL,
+        CDARCHIVEDATE TIMESTAMP,
+        CDDESC VARCHAR(255),
+        CDLABEL VARCHAR(255) NOT NULL,
+        CDSIZE INTEGER,
+        OWNER_USERNAME VARCHAR(255)
+    );
 
 CREATE INDEX I_DTCDTBL_OWNER ON DATACD_TABLE (null);
 
@@ -40,9 +40,9 @@ CREATE UNIQUE INDEX SQL090923232105870 O
 ALTER TABLE DATACD_TABLE ADD CONSTRAINT SQL090923232105870 PRIMARY KEY (CDID);
 
 CREATE TABLE OPENJPASEQ (
-		ID SMALLINT NOT NULL,
-		SEQUENCE_VALUE BIGINT
-	);
+        ID SMALLINT NOT NULL,
+        SEQUENCE_VALUE BIGINT
+    );
 
 CREATE UNIQUE INDEX SQL090923232106010 ON OPENJPASEQ (null);
 

Modified: geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/DataCDInfo_tables_mysql.sql
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/DataCDInfo_tables_mysql.sql?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/DataCDInfo_tables_mysql.sql (original)
+++ geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/DataCDInfo_tables_mysql.sql Mon Mar  7 05:17:11 2011
@@ -20,27 +20,27 @@
 -- DROP TABLE OPENJPASEQ;
 
 CREATE TABLE OWNER_TABLE (
-	USERNAME VARCHAR(20) NOT NULL,
-	PASSWORD VARCHAR(20) NOT NULL,
-	PRIMARY KEY (USERNAME)
+    USERNAME VARCHAR(20) NOT NULL,
+    PASSWORD VARCHAR(20) NOT NULL,
+    PRIMARY KEY (USERNAME)
 ) ENGINE=InnoDB;
 
 CREATE TABLE DATACD_TABLE (
-	CDID INT NOT NULL,
-	CDARCHIVEDATE DATETIME,
-	CDDESC VARCHAR(255),
-	CDLABEL VARCHAR(255) NOT NULL,
-	CDSIZE INT,
-	OWNER_USERNAME VARCHAR(255),
-	PRIMARY KEY (CDID)
+    CDID INT NOT NULL,
+    CDARCHIVEDATE DATETIME,
+    CDDESC VARCHAR(255),
+    CDLABEL VARCHAR(255) NOT NULL,
+    CDSIZE INT,
+    OWNER_USERNAME VARCHAR(255),
+    PRIMARY KEY (CDID)
 ) ENGINE=InnoDB;
 
 CREATE INDEX I_DTCDTBL_OWNER ON DATACD_TABLE (OWNER_USERNAME ASC);
 
 CREATE TABLE OPENJPASEQ (
-	ID TINYINT NOT NULL,
-	SEQUENCE_VALUE BIGINT,
-	PRIMARY KEY (ID)
+    ID TINYINT NOT NULL,
+    SEQUENCE_VALUE BIGINT,
+    PRIMARY KEY (ID)
 ) ENGINE=InnoDB;
 
 

Modified: geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/geronimo-application-mysql.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/geronimo-application-mysql.xml?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/geronimo-application-mysql.xml (original)
+++ geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/geronimo-application-mysql.xml Mon Mar  7 05:17:11 2011
@@ -16,80 +16,80 @@
     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:moduleId>
-			<dep:groupId>org.apache.geronimo.samples</dep:groupId>
-			<dep:artifactId>DataCDInfoJTA</dep:artifactId>
-			<dep:version>${version}</dep:version>
-			<dep:type>car</dep:type>
-		</dep:moduleId>
-		<dep:dependencies>
-			<dep:dependency>
-				<dep:groupId>mysql</dep:groupId>
-				<dep:artifactId>mysql-connector-java</dep:artifactId>
-				<dep:version>5.1.7</dep:version>
-				<dep:type>jar</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:moduleId>
+            <dep:groupId>org.apache.geronimo.samples</dep:groupId>
+            <dep:artifactId>DataCDInfoJTA</dep:artifactId>
+            <dep:version>${version}</dep:version>
+            <dep:type>car</dep:type>
+        </dep:moduleId>
+        <dep:dependencies>
+            <dep:dependency>
+                <dep:groupId>mysql</dep:groupId>
+                <dep:artifactId>mysql-connector-java</dep:artifactId>
+                <dep:version>5.1.7</dep:version>
+                <dep:type>jar</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="mysql" />
-					</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="mysql" />
+                    </properties>
+                </persistence-unit>
+            </persistence>
+        </openejb-jar>
+    </module>
 
-	<ext-module>
-		<connector>DataCDInfoDataSource</connector>
-		<external-path xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
-			<dep:groupId>org.tranql</dep:groupId>
-			<dep:artifactId>tranql-connector-mysql-xa</dep:artifactId>
-			<dep:type>rar</dep:type>
-		</external-path>
-		<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
-			<resourceadapter>
-				<outbound-resourceadapter>
-					<connection-definition>
-						<connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
-						<connectiondefinition-instance>
-							<name>jdbc/DataCDInfoDS</name>
-							<config-property-setting name="UserName">cdadmin</config-property-setting>
-							<config-property-setting name="Password">passme</config-property-setting>
-							<config-property-setting name="PortNumber">3306</config-property-setting>
-							<config-property-setting name="ServerName">localhost</config-property-setting>
-							<config-property-setting name="DatabaseName">cdinfodb</config-property-setting>
-							<connectionmanager>
-								<xa-transaction>
-									<transaction-caching />
-								</xa-transaction>
-								<single-pool>
-									<max-size>100</max-size>
-									<min-size>0</min-size>
-									<blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
-									<idle-timeout-minutes>30</idle-timeout-minutes>
-									<match-one />
-								</single-pool>
-							</connectionmanager>
-						</connectiondefinition-instance>
-						<!-- This non-transaction data source is for sequence generation use. Without it,
-						the geronimo will throw exception when persisting entities which require sequence
-						generation. -->
-						<connectiondefinition-instance>
+    <ext-module>
+        <connector>DataCDInfoDataSource</connector>
+        <external-path xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
+            <dep:groupId>org.tranql</dep:groupId>
+            <dep:artifactId>tranql-connector-mysql-xa</dep:artifactId>
+            <dep:type>rar</dep:type>
+        </external-path>
+        <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
+            <resourceadapter>
+                <outbound-resourceadapter>
+                    <connection-definition>
+                        <connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
+                        <connectiondefinition-instance>
+                            <name>jdbc/DataCDInfoDS</name>
+                            <config-property-setting name="UserName">cdadmin</config-property-setting>
+                            <config-property-setting name="Password">passme</config-property-setting>
+                            <config-property-setting name="PortNumber">3306</config-property-setting>
+                            <config-property-setting name="ServerName">localhost</config-property-setting>
+                            <config-property-setting name="DatabaseName">cdinfodb</config-property-setting>
+                            <connectionmanager>
+                                <xa-transaction>
+                                    <transaction-caching />
+                                </xa-transaction>
+                                <single-pool>
+                                    <max-size>100</max-size>
+                                    <min-size>0</min-size>
+                                    <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+                                    <idle-timeout-minutes>30</idle-timeout-minutes>
+                                    <match-one />
+                                </single-pool>
+                            </connectionmanager>
+                        </connectiondefinition-instance>
+                        <!-- This non-transaction data source is for sequence generation use. Without it,
+                        the geronimo will throw exception when persisting entities which require sequence
+                        generation. -->
+                        <connectiondefinition-instance>
                             <name>jdbc/NoTxDataCDInfoDS</name>
                             <config-property-setting name="UserName">cdadmin</config-property-setting>
-							<config-property-setting name="Password">passme</config-property-setting>
-							<config-property-setting name="PortNumber">3306</config-property-setting>
-							<config-property-setting name="ServerName">localhost</config-property-setting>
-							<config-property-setting name="DatabaseName">cdinfodb</config-property-setting>
+                            <config-property-setting name="Password">passme</config-property-setting>
+                            <config-property-setting name="PortNumber">3306</config-property-setting>
+                            <config-property-setting name="ServerName">localhost</config-property-setting>
+                            <config-property-setting name="DatabaseName">cdinfodb</config-property-setting>
                             <connectionmanager>
                                 <no-transaction/>
                                 <single-pool>
@@ -101,13 +101,13 @@
                                 </single-pool>
                             </connectionmanager>
                         </connectiondefinition-instance>
-					</connection-definition>
-				</outbound-resourceadapter>
-			</resourceadapter>
-		</connector>
-	</ext-module>
-	
-	
+                    </connection-definition>
+                </outbound-resourceadapter>
+            </resourceadapter>
+        </connector>
+    </ext-module>
+    
+    
 
   <security xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0">
     <sec:default-principal>
@@ -124,8 +124,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_mysql.sql</attribute>
         <reference name="DataSource">
             <name>jdbc/NoTxDataCDInfoDS</name>

Modified: geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/geronimo-application.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/geronimo-application.xml?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/geronimo-application.xml (original)
+++ geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/geronimo-application.xml Mon Mar  7 05:17:11 2011
@@ -16,36 +16,36 @@
     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:moduleId>
-			<dep:groupId>${project.groupId}</dep:groupId>
-			<dep:artifactId>${project.artifactId}</dep:artifactId>
-			<dep:version>${project.version}</dep:version>
-			<dep:type>car</dep:type>
-		</dep:moduleId>
-		<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:moduleId>
+            <dep:groupId>${project.groupId}</dep:groupId>
+            <dep:artifactId>${project.artifactId}</dep:artifactId>
+            <dep:version>${project.version}</dep:version>
+            <dep:type>car</dep:type>
+        </dep:moduleId>
+        <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>
@@ -62,8 +62,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-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/pom.xml?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/pom.xml Mon Mar  7 05:17:11 2011
@@ -1,60 +1,60 @@
 <?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-ejb</artifactId>
-	<name>Geronimo Samples :: DataCDInfo JTA + Struts1 :: EJB</name>
-	<packaging>jar</packaging>
-
-	<description>Geronimo Samples - DataCD Information Management Tool</description>
-
-	<dependencies>	
-		
-		<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-ejb_3.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>
-	
+    <parent>
+        <groupId>org.apache.geronimo.samples</groupId>
+        <artifactId>DataCDInfo</artifactId>
+        <version>3.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>DataCDInfo-JTA-ejb</artifactId>
+    <name>Geronimo Samples :: DataCDInfo JTA + Struts1 :: EJB</name>
+    <packaging>jar</packaging>
+
+    <description>Geronimo Samples - DataCD Information Management Tool</description>
+
+    <dependencies>    
+        
+        <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-ejb_3.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>
+    
 </project>

Modified: geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/beans/DataCDBean.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/beans/DataCDBean.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/beans/DataCDBean.java (original)
+++ geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/beans/DataCDBean.java Mon Mar  7 05:17:11 2011
@@ -39,93 +39,93 @@ import javax.persistence.*;
    @NamedQuery(name = "DataCD.getAllCDs", query = "SELECT cd FROM DataCD cd")
 })
 public class DataCDBean implements Serializable{
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -7665259395127908808L;
-	@Id
-	@Column(name = "CDID")
-	@GeneratedValue(strategy=GenerationType.AUTO)
-	private Integer cdID;
-	
-	@JoinColumn(name = "OWNER_USERNAME")
-	@ManyToOne(fetch=FetchType.EAGER, optional=false)
-	private OwnerBean owner;
-	
-	@Column(name = "CDLABEL", nullable=false)
-	private String cdLabel;
-	
-	@Column(name = "CDDESC")
-	private String cdDescription;
-	
-	@Column(name = "CDARCHIVEDATE")
-	private Date cdArchiveDate;
-	
-	@Column(name = "CDSIZE")
-	private Integer cdSize;
-	
-	public DataCDBean(){
-		
-	}
-	
-	public DataCDBean(Integer cdID, String cdLabel,
-			String cdDescription, Date cdArchiveDate, Integer cdSize) {
-		super();
-		this.cdID = cdID;
-		this.cdLabel = cdLabel;
-		this.cdDescription = cdDescription;
-		this.cdArchiveDate = cdArchiveDate;
-		this.cdSize = cdSize;
-	}
-	
-	public String toString(){
-		return "[cdID:" + this.getCdID()
-				+ " cdLabel:" + this.getCdLabel()
-				+ " cdDescription:" + this.getCdDescription()
-				+ " cdArchiveDate:" + this.getCdArchiveDate().toString()
-				+ " cdSize:" + this.getCdSize()
-				+ " Owner:" + this.getOwner().getUsername()
-				+ "]";
-		
-	}
-	public Integer getCdID() {
-		return cdID;
-	}
-	public void setCdID(Integer cdID) {
-		this.cdID = cdID;
-	}
-	public OwnerBean getOwner() {
-		return owner;
-	}
-	public void setOwner(OwnerBean owner) {
-		this.owner = owner;
-	}
-	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 Date getCdArchiveDate() {
-		return cdArchiveDate;
-	}
-	public void setCdArchiveDate(Date cdArchiveDate) {
-		this.cdArchiveDate = cdArchiveDate;
-	}
-	public Integer getCdSize() {
-		return cdSize;
-	}
-	public void setCdSize(Integer cdSize) {
-		this.cdSize = cdSize;
-	}
-	
-	
-	
+    /**
+     * 
+     */
+    private static final long serialVersionUID = -7665259395127908808L;
+    @Id
+    @Column(name = "CDID")
+    @GeneratedValue(strategy=GenerationType.AUTO)
+    private Integer cdID;
+    
+    @JoinColumn(name = "OWNER_USERNAME")
+    @ManyToOne(fetch=FetchType.EAGER, optional=false)
+    private OwnerBean owner;
+    
+    @Column(name = "CDLABEL", nullable=false)
+    private String cdLabel;
+    
+    @Column(name = "CDDESC")
+    private String cdDescription;
+    
+    @Column(name = "CDARCHIVEDATE")
+    private Date cdArchiveDate;
+    
+    @Column(name = "CDSIZE")
+    private Integer cdSize;
+    
+    public DataCDBean(){
+        
+    }
+    
+    public DataCDBean(Integer cdID, String cdLabel,
+            String cdDescription, Date cdArchiveDate, Integer cdSize) {
+        super();
+        this.cdID = cdID;
+        this.cdLabel = cdLabel;
+        this.cdDescription = cdDescription;
+        this.cdArchiveDate = cdArchiveDate;
+        this.cdSize = cdSize;
+    }
+    
+    public String toString(){
+        return "[cdID:" + this.getCdID()
+                + " cdLabel:" + this.getCdLabel()
+                + " cdDescription:" + this.getCdDescription()
+                + " cdArchiveDate:" + this.getCdArchiveDate().toString()
+                + " cdSize:" + this.getCdSize()
+                + " Owner:" + this.getOwner().getUsername()
+                + "]";
+        
+    }
+    public Integer getCdID() {
+        return cdID;
+    }
+    public void setCdID(Integer cdID) {
+        this.cdID = cdID;
+    }
+    public OwnerBean getOwner() {
+        return owner;
+    }
+    public void setOwner(OwnerBean owner) {
+        this.owner = owner;
+    }
+    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 Date getCdArchiveDate() {
+        return cdArchiveDate;
+    }
+    public void setCdArchiveDate(Date cdArchiveDate) {
+        this.cdArchiveDate = cdArchiveDate;
+    }
+    public Integer getCdSize() {
+        return cdSize;
+    }
+    public void setCdSize(Integer cdSize) {
+        this.cdSize = cdSize;
+    }
+    
+    
+    
 
 }

Modified: geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/beans/OwnerBean.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/beans/OwnerBean.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/beans/OwnerBean.java (original)
+++ geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/beans/OwnerBean.java Mon Mar  7 05:17:11 2011
@@ -32,59 +32,59 @@ import javax.persistence.*;
 @Entity(name="Owner")
 @Table(name = "OWNER_TABLE")
 public class OwnerBean implements Serializable {
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -7231801785238251943L;
-	
-	
-	@Id
-	@Column(name = "USERNAME", length=20)
-	private String username;
-	
-	@Column(name = "PASSWORD", nullable=false, length=20)
-	private String password;
-	
-	@OneToMany(mappedBy= "owner", 
-			fetch=FetchType.LAZY,
-			cascade=CascadeType.ALL)	
-	@OrderBy("cdArchiveDate DESC")
-	private Collection<DataCDBean> DataCDs;
-	
-	public OwnerBean(){
-		
-	}
-	
-	public OwnerBean(String userName, String password) {
-		super();
-		this.username = userName;
-		this.password = password;
-	}
-	
-	public String toString(){
-		return "username:" + getUsername()
-				+ "\n password:" + getPassword();
-	}
-	
-	public String getUsername() {
-		return username;
-	}
-	public void setUsername(String userName) {
-		this.username = userName;
-	}
-	public String getPassword() {
-		return password;
-	}
-	public void setPassword(String password) {
-		this.password = password;
-	}
+    /**
+     * 
+     */
+    private static final long serialVersionUID = -7231801785238251943L;
+    
+    
+    @Id
+    @Column(name = "USERNAME", length=20)
+    private String username;
+    
+    @Column(name = "PASSWORD", nullable=false, length=20)
+    private String password;
+    
+    @OneToMany(mappedBy= "owner", 
+            fetch=FetchType.LAZY,
+            cascade=CascadeType.ALL)    
+    @OrderBy("cdArchiveDate DESC")
+    private Collection<DataCDBean> DataCDs;
+    
+    public OwnerBean(){
+        
+    }
+    
+    public OwnerBean(String userName, String password) {
+        super();
+        this.username = userName;
+        this.password = password;
+    }
+    
+    public String toString(){
+        return "username:" + getUsername()
+                + "\n password:" + getPassword();
+    }
+    
+    public String getUsername() {
+        return username;
+    }
+    public void setUsername(String userName) {
+        this.username = userName;
+    }
+    public String getPassword() {
+        return password;
+    }
+    public void setPassword(String password) {
+        this.password = password;
+    }
 
-	public void setDataCDs(Collection<DataCDBean> dataCDs) {
-		this.DataCDs = dataCDs;
-	}
+    public void setDataCDs(Collection<DataCDBean> dataCDs) {
+        this.DataCDs = dataCDs;
+    }
 
-	public Collection<DataCDBean> getDataCDs() {
-		return DataCDs;
-	}
+    public Collection<DataCDBean> getDataCDs() {
+        return DataCDs;
+    }
 
 }

Modified: geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/core/DataCDInfoAdmin.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/DataCDInfoAdmin.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/DataCDInfoAdmin.java (original)
+++ geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/core/DataCDInfoAdmin.java Mon Mar  7 05:17:11 2011
@@ -41,9 +41,9 @@ import javax.persistence.Query;
 //@Stateful(name="ejb/DataCDInfoAdmin")
 @Stateful
 public class DataCDInfoAdmin implements DataCDInfoAdminLocal {
-	
-	@PersistenceContext(unitName="DataCDInfoUnit", type = PersistenceContextType.EXTENDED)	
-	private EntityManager em;
+    
+    @PersistenceContext(unitName="DataCDInfoUnit", type = PersistenceContextType.EXTENDED)    
+    private EntityManager em;
 
     /**
      * Default constructor. 
@@ -53,37 +53,37 @@ public class DataCDInfoAdmin implements 
     }
     
     @RolesAllowed("superadmin")
-	public String findpasswd(String username) {
-		OwnerBean owner = em.find(OwnerBean.class, username);
-		String passwd = owner.getPassword();
-		return passwd;
-	}
+    public String findpasswd(String username) {
+        OwnerBean owner = em.find(OwnerBean.class, username);
+        String passwd = owner.getPassword();
+        return passwd;
+    }
+    
+    @RolesAllowed("superadmin")
+    public String[] listAllDataCDs() {
+        ArrayList<String> allcdstring = new ArrayList<String>();
+        Query query = em.createNamedQuery("DataCD.getAllCDs");
+        List<DataCDBean> allcds = query.getResultList();
+        for (DataCDBean cd : allcds){
+            allcdstring.add(cd.toString());
+        }
+        
+        String[] result = allcdstring.toArray(new String[0]);
+        return result;
+    }
     
-	@RolesAllowed("superadmin")
-	public String[] listAllDataCDs() {
-		ArrayList<String> allcdstring = new ArrayList<String>();
-		Query query = em.createNamedQuery("DataCD.getAllCDs");
-		List<DataCDBean> allcds = query.getResultList();
-		for (DataCDBean cd : allcds){
-			allcdstring.add(cd.toString());
-		}
-		
-		String[] result = allcdstring.toArray(new String[0]);
-		return result;
-	}
-	
-	@RolesAllowed({"admin","superadmin"})
-	public String[] listOwners() {
-		ArrayList<String> allusers = new ArrayList<String>();
-		List<Object> owners = new ArrayList<Object>();
-		Query query = em.createNativeQuery("SELECT USERNAME FROM OWNER_TABLE");
-		owners = query.getResultList(); 
-		for (Object owner : owners ) {
-			String ownername = owner.toString();
-			allusers.add(ownername);
-		}
-		String[] result = allusers.toArray(new String[0]);
-		return result;
-	}
+    @RolesAllowed({"admin","superadmin"})
+    public String[] listOwners() {
+        ArrayList<String> allusers = new ArrayList<String>();
+        List<Object> owners = new ArrayList<Object>();
+        Query query = em.createNativeQuery("SELECT USERNAME FROM OWNER_TABLE");
+        owners = query.getResultList(); 
+        for (Object owner : owners ) {
+            String ownername = owner.toString();
+            allusers.add(ownername);
+        }
+        String[] result = allusers.toArray(new String[0]);
+        return result;
+    }
 
 }

Modified: geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/core/DataCDInfoAdminLocal.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/DataCDInfoAdminLocal.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/DataCDInfoAdminLocal.java (original)
+++ geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/core/DataCDInfoAdminLocal.java Mon Mar  7 05:17:11 2011
@@ -21,9 +21,9 @@ package org.apache.geronimo.samples.data
 import javax.ejb.Local;
 
 @Local
-public interface DataCDInfoAdminLocal {	
-	public String[] listOwners();	
-	public String findpasswd(String username);
-	public String[] listAllDataCDs();
+public interface DataCDInfoAdminLocal {    
+    public String[] listOwners();    
+    public String findpasswd(String username);
+    public String[] listAllDataCDs();
 
 }

Modified: geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/core/DataCDInfoJTAImpl.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/DataCDInfoJTAImpl.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/DataCDInfoJTAImpl.java (original)
+++ geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/core/DataCDInfoJTAImpl.java Mon Mar  7 05:17:11 2011
@@ -55,173 +55,173 @@ import org.apache.geronimo.samples.datac
 @TransactionManagement(TransactionManagementType.CONTAINER)
 public class DataCDInfoJTAImpl implements DataCDInfoLocal, DataCDInfoRemote {
 
-	@PersistenceContext(unitName = "DataCDInfoUnit", type = PersistenceContextType.TRANSACTION)
-	private EntityManager em;
+    @PersistenceContext(unitName = "DataCDInfoUnit", type = PersistenceContextType.TRANSACTION)
+    private EntityManager em;
 
-	public DataCDInfoJTAImpl() {
-		// do nothing
-	}
-
-	public OwnerBean login(String username, String passwd)
-			throws InvalidOwnerException, IncorrectPasswordException {
-		// check if the owner is registered
-		OwnerBean owner = em.find(OwnerBean.class, username);
-		if (owner == null) {
-			String error = "No such user: " + username + "!";
-			throw new InvalidOwnerException(error);
-		}
-
-		if (!passwd.equals(owner.getPassword())) {
-			String error = "Incorrect password!";
-			throw new IncorrectPasswordException(error);
-		}
-
-		// Load CDs to cache
-		populateCDs(owner);
-
-		return owner;
-	}
-
-	public void logout(String username) {
-		// do nothing
-
-	}
-
-	public OwnerBean register(String username, String passwd)
-			throws InvalidOwnerException, InvalidPasswordException {
-
-		OwnerBean user = em.find(OwnerBean.class, username);
-		if (user != null) {
-			String error = "Can not register existing user:" + username;
-			throw new InvalidOwnerException(error);
-		}
-
-		if (passwd.length() < 6) {
-			String error = "Invalid password:" + passwd
-					+ ". Password must be at least 6 chars";
-			throw new InvalidPasswordException(error);
-		}
-
-		OwnerBean newuser = new OwnerBean(username, passwd);
-		try {
-			em.persist(newuser);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-
-		return newuser;
-	}
-
-	public boolean unregister(String username) {
-
-		// Delete owner as well as cascadely deleting CDs owned by the owner.
-		OwnerBean deluser = em.find(OwnerBean.class, username.toLowerCase());
-		populateCDs(deluser);
-		try {
-			em.remove(deluser);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return true;
-	}
-
-	public DataCDBean addCD(String ownername, String cdlabel, Integer cdsize,
-			String cddesc, Date cdarchivedate)
-			throws DuplicatedDataCDException, InvalidOwnerException {
-
-		DataCDBean newcd = new DataCDBean();
-
-		Query query = em.createNamedQuery("DataCD.findByOwnerIdandCDLabel");
-		query.setParameter("ownername", ownername.toLowerCase());
-		query.setParameter("cdlabel", cdlabel);
-		Collection<DataCDBean> cd = query.getResultList();
-
-		Iterator<DataCDBean> itr = cd.iterator();
-
-		if (!itr.hasNext()) {
-
-			newcd.setCdArchiveDate(cdarchivedate);
-			newcd.setCdDescription(cddesc);
-			newcd.setCdLabel(cdlabel);
-			newcd.setCdSize(cdsize);
-
-			OwnerBean theowner = em.find(OwnerBean.class, ownername
-					.toLowerCase());
-			newcd.setOwner(theowner);
-
-			try {
-				em.persist(newcd);
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-
-		} else {
-			newcd = null;
-		}
-
-		return newcd;
-	}
-
-	public Collection<DataCDBean> listCDs(String ownername) {
-
-		OwnerBean owner = em.find(OwnerBean.class, ownername);
-		Query query = em.createNamedQuery("DataCD.findByOwnerId");
-		query.setParameter("ownername", owner.getUsername());
-		Collection<DataCDBean> cds = query.getResultList();
-		if (cds == null) {
-			cds = new ArrayList<DataCDBean>();
-		}
-		return cds;
-	}
-
-	public boolean removeCD(Integer cdid) {
-		boolean success = false;
-
-		DataCDBean datacd = em.find(DataCDBean.class, cdid);
-		if (datacd != null) {
-			try {
-				em.remove(datacd);
-				success = true;
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-		}
-
-		return success;
-	}
-
-	public DataCDBean updateCD(Integer cdid, Integer cdsize, String cddesc,
-			Date cdarchivedate) {
-
-		DataCDBean datacd = em.find(DataCDBean.class, cdid);
-		if (datacd != null) {
-			datacd.setCdArchiveDate(cdarchivedate);
-			datacd.setCdDescription(cddesc);
-			datacd.setCdSize(cdsize);
-			try {
-				em.persist(datacd);
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-		}
-		return datacd;
-	}
-
-	public OwnerBean refreshCDInfo(String ownername) {
-		OwnerBean owner = null;
-		owner = em.find(OwnerBean.class, ownername);
-		if (owner != null) {
-			populateCDs(owner);
-		}
-		return owner;
-	}
-
-	private void populateCDs(OwnerBean owner) {
-		Collection<DataCDBean> ownedcds = owner.getDataCDs();
-		Iterator<DataCDBean> itr = ownedcds.iterator();
-		while (itr.hasNext()) {
-			((DataCDBean) itr.next()).getCdLabel();
-		}
-	}
+    public DataCDInfoJTAImpl() {
+        // do nothing
+    }
+
+    public OwnerBean login(String username, String passwd)
+            throws InvalidOwnerException, IncorrectPasswordException {
+        // check if the owner is registered
+        OwnerBean owner = em.find(OwnerBean.class, username);
+        if (owner == null) {
+            String error = "No such user: " + username + "!";
+            throw new InvalidOwnerException(error);
+        }
+
+        if (!passwd.equals(owner.getPassword())) {
+            String error = "Incorrect password!";
+            throw new IncorrectPasswordException(error);
+        }
+
+        // Load CDs to cache
+        populateCDs(owner);
+
+        return owner;
+    }
+
+    public void logout(String username) {
+        // do nothing
+
+    }
+
+    public OwnerBean register(String username, String passwd)
+            throws InvalidOwnerException, InvalidPasswordException {
+
+        OwnerBean user = em.find(OwnerBean.class, username);
+        if (user != null) {
+            String error = "Can not register existing user:" + username;
+            throw new InvalidOwnerException(error);
+        }
+
+        if (passwd.length() < 6) {
+            String error = "Invalid password:" + passwd
+                    + ". Password must be at least 6 chars";
+            throw new InvalidPasswordException(error);
+        }
+
+        OwnerBean newuser = new OwnerBean(username, passwd);
+        try {
+            em.persist(newuser);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return newuser;
+    }
+
+    public boolean unregister(String username) {
+
+        // Delete owner as well as cascadely deleting CDs owned by the owner.
+        OwnerBean deluser = em.find(OwnerBean.class, username.toLowerCase());
+        populateCDs(deluser);
+        try {
+            em.remove(deluser);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return true;
+    }
+
+    public DataCDBean addCD(String ownername, String cdlabel, Integer cdsize,
+            String cddesc, Date cdarchivedate)
+            throws DuplicatedDataCDException, InvalidOwnerException {
+
+        DataCDBean newcd = new DataCDBean();
+
+        Query query = em.createNamedQuery("DataCD.findByOwnerIdandCDLabel");
+        query.setParameter("ownername", ownername.toLowerCase());
+        query.setParameter("cdlabel", cdlabel);
+        Collection<DataCDBean> cd = query.getResultList();
+
+        Iterator<DataCDBean> itr = cd.iterator();
+
+        if (!itr.hasNext()) {
+
+            newcd.setCdArchiveDate(cdarchivedate);
+            newcd.setCdDescription(cddesc);
+            newcd.setCdLabel(cdlabel);
+            newcd.setCdSize(cdsize);
+
+            OwnerBean theowner = em.find(OwnerBean.class, ownername
+                    .toLowerCase());
+            newcd.setOwner(theowner);
+
+            try {
+                em.persist(newcd);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+
+        } else {
+            newcd = null;
+        }
+
+        return newcd;
+    }
+
+    public Collection<DataCDBean> listCDs(String ownername) {
+
+        OwnerBean owner = em.find(OwnerBean.class, ownername);
+        Query query = em.createNamedQuery("DataCD.findByOwnerId");
+        query.setParameter("ownername", owner.getUsername());
+        Collection<DataCDBean> cds = query.getResultList();
+        if (cds == null) {
+            cds = new ArrayList<DataCDBean>();
+        }
+        return cds;
+    }
+
+    public boolean removeCD(Integer cdid) {
+        boolean success = false;
+
+        DataCDBean datacd = em.find(DataCDBean.class, cdid);
+        if (datacd != null) {
+            try {
+                em.remove(datacd);
+                success = true;
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+
+        return success;
+    }
+
+    public DataCDBean updateCD(Integer cdid, Integer cdsize, String cddesc,
+            Date cdarchivedate) {
+
+        DataCDBean datacd = em.find(DataCDBean.class, cdid);
+        if (datacd != null) {
+            datacd.setCdArchiveDate(cdarchivedate);
+            datacd.setCdDescription(cddesc);
+            datacd.setCdSize(cdsize);
+            try {
+                em.persist(datacd);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        return datacd;
+    }
+
+    public OwnerBean refreshCDInfo(String ownername) {
+        OwnerBean owner = null;
+        owner = em.find(OwnerBean.class, ownername);
+        if (owner != null) {
+            populateCDs(owner);
+        }
+        return owner;
+    }
+
+    private void populateCDs(OwnerBean owner) {
+        Collection<DataCDBean> ownedcds = owner.getDataCDs();
+        Iterator<DataCDBean> itr = ownedcds.iterator();
+        while (itr.hasNext()) {
+            ((DataCDBean) itr.next()).getCdLabel();
+        }
+    }
 
 }



Mime
View raw message