[jboss-svn-commits] JBL Code SVN: r37225 - in labs/jbosstm/trunk/ArjunaJTA/quickstarts/integration: src/main/java/org/jboss/narayana/quickstarts/ejb and 2 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: tomjenkinson
Date: 2011-07-04 11:20:30 -0400 (Mon, 04 Jul 2011)
New Revision: 37225

Removed:
   labs/jbosstm/trunk/ArjunaJTA/quickstarts/integration/src/main/resources/META-INF/MANIFEST.MF
Modified:
   labs/jbosstm/trunk/ArjunaJTA/quickstarts/integration/pom.xml
   labs/jbosstm/trunk/ArjunaJTA/quickstarts/integration/src/main/java/org/jboss/narayana/quickstarts/ejb/SimpleEJB.java
   labs/jbosstm/trunk/ArjunaJTA/quickstarts/integration/src/main/java/org/jboss/narayana/quickstarts/ejb/SimpleEJBImpl.java
   labs/jbosstm/trunk/ArjunaJTA/quickstarts/integration/src/main/java/org/jboss/narayana/quickstarts/servlet/SimpleServlet.java
Log:
JBTM-854 added the module dependency through pom rather than defined manifest

Modified: labs/jbosstm/trunk/ArjunaJTA/quickstarts/integration/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/quickstarts/integration/pom.xml	2011-07-04 13:09:29 UTC (rev 37224)
+++ labs/jbosstm/trunk/ArjunaJTA/quickstarts/integration/pom.xml	2011-07-04 15:20:30 UTC (rev 37225)
@@ -36,7 +36,9 @@
           <!-- Java EE 6 doesn't require web.xml, Maven needs to catch up! -->
           <failOnMissingWebXml>false</failOnMissingWebXml>
           <archive>
-            <manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
+            <manifestEntries>
+              <Dependencies>org.jboss.jts</Dependencies>
+            </manifestEntries>
           </archive>
         </configuration>
       </plugin>

Modified: labs/jbosstm/trunk/ArjunaJTA/quickstarts/integration/src/main/java/org/jboss/narayana/quickstarts/ejb/SimpleEJB.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/quickstarts/integration/src/main/java/org/jboss/narayana/quickstarts/ejb/SimpleEJB.java	2011-07-04 13:09:29 UTC (rev 37224)
+++ labs/jbosstm/trunk/ArjunaJTA/quickstarts/integration/src/main/java/org/jboss/narayana/quickstarts/ejb/SimpleEJB.java	2011-07-04 15:20:30 UTC (rev 37225)
@@ -34,5 +34,5 @@
 	 */
 	public int createCustomer(String name) throws NamingException;
 
-	public String listIds() throws NamingException;
+	public String listCustomers() throws NamingException;
 }

Modified: labs/jbosstm/trunk/ArjunaJTA/quickstarts/integration/src/main/java/org/jboss/narayana/quickstarts/ejb/SimpleEJBImpl.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/quickstarts/integration/src/main/java/org/jboss/narayana/quickstarts/ejb/SimpleEJBImpl.java	2011-07-04 13:09:29 UTC (rev 37224)
+++ labs/jbosstm/trunk/ArjunaJTA/quickstarts/integration/src/main/java/org/jboss/narayana/quickstarts/ejb/SimpleEJBImpl.java	2011-07-04 15:20:30 UTC (rev 37225)
@@ -50,7 +50,7 @@
 	}
 
 	@TransactionAttribute(TransactionAttributeType.REQUIRED)
-	public String listIds() throws NamingException {
+	public String listCustomers() throws NamingException {
 		UserTransaction tx = (UserTransaction) new InitialContext()
 				.lookup("java:comp/UserTransaction");
 		System.out.println("listIds transaction is identified as: "

Modified: labs/jbosstm/trunk/ArjunaJTA/quickstarts/integration/src/main/java/org/jboss/narayana/quickstarts/servlet/SimpleServlet.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/quickstarts/integration/src/main/java/org/jboss/narayana/quickstarts/servlet/SimpleServlet.java	2011-07-04 13:09:29 UTC (rev 37224)
+++ labs/jbosstm/trunk/ArjunaJTA/quickstarts/integration/src/main/java/org/jboss/narayana/quickstarts/servlet/SimpleServlet.java	2011-07-04 15:20:30 UTC (rev 37225)
@@ -35,7 +35,7 @@
 import org.jboss.narayana.quickstarts.ejb.SimpleEJB;
 import org.jboss.narayana.quickstarts.txoj.AtomicObject;
 
- at WebServlet(displayName = "hello", urlPatterns = "/hello")
+ at WebServlet(displayName = "customer-db", urlPatterns = "/customer-db")
 public class SimpleServlet extends HttpServlet {
 
 	@EJB(lookup = "java:module/SimpleEJBImpl")
@@ -49,8 +49,9 @@
 		response.setContentType("text/html");
 		PrintWriter out = response.getWriter();
 		out.println("<html>");
-		out.println("<head><title>Rocking out with Openshift</title></head>");
+		out.println("<head><title>Customer Database</title></head>");
 		out.println("<body>");
+		out.println("<h1>Customer Database</h2>");
 		String operation = request.getParameter("operation");
 		if (operation != null) {
 			if (operation.equals("list")) {
@@ -66,7 +67,16 @@
 				out.println(error("Unknown operation: " + operation));
 			}
 		} else {
-			out.println(error("Requires operation"));
+			out.println("<form method=\"get\" >");
+			out.println("<input type=\"text\" name=\"name\" size=30>");
+			out.println("<input type=\"hidden\" name=\"operation\" value=\"create\">");
+			out.println("<input type=\"submit\" value=\"Create customer\">");
+			out.println("</form>");
+
+			out.println("<form method=\"get\" >");
+			out.println("<input type=\"hidden\" name=\"operation\" value=\"list\">");
+			out.println("<input type=\"submit\" value=\"List customers\">");
+			out.println("</form>");
 		}
 		out.println("</body>");
 		out.println("</html>");
@@ -84,10 +94,13 @@
 		toWrite.append("<h1>List of customer Ids</h1>\n");
 
 		try {
+			toWrite.append("<p>Customers created this run: "
+					+ atomicObject.get() + "</p>\n");
+
 			UserTransaction tx = (UserTransaction) new InitialContext()
 					.lookup("java:comp/UserTransaction");
 			tx.begin();
-			toWrite.append("<p>" + simpleEJB.listIds() + "</p>");
+			toWrite.append("<p>" + simpleEJB.listCustomers() + "</p>");
 			tx.commit();
 		} catch (Throwable e) {
 			toWrite.append("FAILED: " + e.toString());

Deleted: labs/jbosstm/trunk/ArjunaJTA/quickstarts/integration/src/main/resources/META-INF/MANIFEST.MF
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/quickstarts/integration/src/main/resources/META-INF/MANIFEST.MF	2011-07-04 13:09:29 UTC (rev 37224)
+++ labs/jbosstm/trunk/ArjunaJTA/quickstarts/integration/src/main/resources/META-INF/MANIFEST.MF	2011-07-04 15:20:30 UTC (rev 37225)
@@ -1,2 +0,0 @@
-Dependencies: org.jboss.jts
-