Author: thomas.diesler(a)jboss.com Date: 2008-07-30 07:17:46 -0400 (Wed, 30 Jul 2008) New Revision: 1771 Added: jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/ jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/java/ jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/java/org/ jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/ jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/ jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/ jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/ jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/resources/ jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/resources/jbpm-beans.xml jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/resources/log4j.xml jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/resources/samples/ jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/resources/samples/airticket/ Removed: jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/server/RandomCompliment.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/airticket/ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/samples/airticket/ Modified: jbossbpm/spec/trunk/modules/samples/airticket/client/.classpath jbossbpm/spec/trunk/modules/samples/airticket/client/.project jbossbpm/spec/trunk/modules/samples/airticket/client/pom.xml jbossbpm/spec/trunk/modules/samples/airticket/client/src/main/java/org/jboss/bpm/samples/airticket/client/Application.java jbossbpm/spec/trunk/modules/samples/airticket/client/src/main/resources/org/jboss/bpm/samples/airticket/public/Application.html jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/client/AirticketService.java jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/client/AirticketServiceAsync.java jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/server/AirticketServiceImpl.java Log: Move airticket test to samples/airticket Modified: jbossbpm/spec/trunk/modules/samples/airticket/client/.classpath =================================================================== --- jbossbpm/spec/trunk/modules/samples/airticket/client/.classpath 2008-07-30 10:13:20 UTC (rev 1770) +++ jbossbpm/spec/trunk/modules/samples/airticket/client/.classpath 2008-07-30 11:17:46 UTC (rev 1771) @@ -1,9 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" output="target/classes" path="src/main/java"/> - <classpathentry kind="src" output="target/test-classes" path="src/test/java"/> <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/> - <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> <classpathentry kind="output" path="target/classes"/> Modified: jbossbpm/spec/trunk/modules/samples/airticket/client/.project =================================================================== --- jbossbpm/spec/trunk/modules/samples/airticket/client/.project 2008-07-30 10:13:20 UTC (rev 1770) +++ jbossbpm/spec/trunk/modules/samples/airticket/client/.project 2008-07-30 11:17:46 UTC (rev 1771) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>bpm-sample-airticket-war</name> + <name>bpm-sample-airticket-client</name> <comment></comment> <projects> </projects> Modified: jbossbpm/spec/trunk/modules/samples/airticket/client/pom.xml =================================================================== --- jbossbpm/spec/trunk/modules/samples/airticket/client/pom.xml 2008-07-30 10:13:20 UTC (rev 1770) +++ jbossbpm/spec/trunk/modules/samples/airticket/client/pom.xml 2008-07-30 11:17:46 UTC (rev 1771) @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <name>JBossBPM - Spec Samples Airticket (Client)</name> <groupId>org.jboss.bpm</groupId> - <artifactId>bpm-sample-airticket-war</artifactId> + <artifactId>bpm-sample-airticket-client</artifactId> <packaging>war</packaging> <!-- Parent --> Modified: jbossbpm/spec/trunk/modules/samples/airticket/client/src/main/java/org/jboss/bpm/samples/airticket/client/Application.java =================================================================== --- jbossbpm/spec/trunk/modules/samples/airticket/client/src/main/java/org/jboss/bpm/samples/airticket/client/Application.java 2008-07-30 10:13:20 UTC (rev 1770) +++ jbossbpm/spec/trunk/modules/samples/airticket/client/src/main/java/org/jboss/bpm/samples/airticket/client/Application.java 2008-07-30 11:17:46 UTC (rev 1771) @@ -22,6 +22,24 @@ */ public class Application implements EntryPoint { + private Button buttonSubmit = new Button("Submit"); + private Button buttonPull = new Button("Pull"); + + private Label labelMessage = new Label(); + private Label labelState = new Label("SendRequest"); + + private Label labelName = new Label("Name:"); + private Label labelFrom = new Label("From:"); + private Label labelTo = new Label("To:"); + private Label labelDate = new Label("Date:"); + private Label labelSeats = new Label("Seats:"); + + private TextBox textName = new TextBox(); + private TextBox textFrom = new TextBox(); + private TextBox textTo = new TextBox(); + private TextBox textDate = new TextBox(); + private TextBox textSeats = new TextBox(); + /** * This is the entry point method. */ @@ -30,29 +48,34 @@ // image bundle final SampleImageBundle sampleImageBundle = (SampleImageBundle)GWT.create(SampleImageBundle.class); final Image logoImage = sampleImageBundle.getGWTLogo().createImage(); - final Button buttonSubmit = new Button("Submit"); - final Label labelMessage = new Label(); - final Label labelState = new Label(); - - final Label labelName = new Label("Name:"); - final Label labelFrom = new Label("From:"); - final Label labelTo = new Label("To:"); - final Label labelDate = new Label("Date:"); - final Label labelSeats = new Label("Seats:"); - - final TextBox textName = new TextBox(); - final TextBox textFrom = new TextBox(); - final TextBox textTo = new TextBox(); - final TextBox textDate = new TextBox(); - final TextBox textSeats = new TextBox(); - textName.setText("Kermit"); textFrom.setText("MUC"); textTo.setText("NYC"); textDate.setText("30-Jul-2008"); textSeats.setText("2"); + setupSubmitListener(); + + RootPanel.get("bpmLogo").add(logoImage); + RootPanel.get("labelMessage").add(labelMessage); + RootPanel.get("labelState").add(labelState); + RootPanel.get("labelName").add(labelName); + RootPanel.get("labelFrom").add(labelFrom); + RootPanel.get("labelTo").add(labelTo); + RootPanel.get("labelDate").add(labelDate); + RootPanel.get("labelSeats").add(labelSeats); + RootPanel.get("textName").add(textName); + RootPanel.get("textFrom").add(textFrom); + RootPanel.get("textTo").add(textTo); + RootPanel.get("textDate").add(textDate); + RootPanel.get("textSeats").add(textSeats); + RootPanel.get("buttonSubmit").add(buttonSubmit); + RootPanel.get("buttonPull").add(buttonPull); + } + + private void setupSubmitListener() + { buttonSubmit.addClickListener(new ClickListener() { public void onClick(Widget sender) @@ -62,11 +85,19 @@ String moduleRelativeURL = GWT.getModuleBaseURL() + "airticketService"; endpoint.setServiceEntryPoint(moduleRelativeURL); + final String state = labelState.getText(); AsyncCallback callback = new AsyncCallback() { public void onSuccess(Object result) { - labelMessage.setText((String)result); + if (state.equals("SendRequest")) + { + textName.setReadOnly(true); + textFrom.setReadOnly(true); + textTo.setReadOnly(true); + textDate.setReadOnly(true); + textSeats.setReadOnly(true); + } } public void onFailure(Throwable caught) @@ -74,31 +105,18 @@ labelMessage.setText("Error: " + caught.getMessage()); } }; - sampleRemoteService.doComplimentMe(callback); - - HashMap props = new HashMap(); - props.put("State", labelState.getText()); - props.put("Name", textName.getText()); - props.put("From", textFrom.getText()); - props.put("To", textTo.getText()); - props.put("Date", textDate.getText()); - props.put("Seats", textSeats.getText()); + + String name = textName.getText(); + String from = textFrom.getText(); + String to = textTo.getText(); + String date = textDate.getText(); + String seats = textSeats.getText(); + + if (state.equals("SendRequest")) + { + sampleRemoteService.sendUserRequest(name, from , to, date, seats, callback); + } } }); - - RootPanel.get("bpmLogo").add(logoImage); - RootPanel.get("labelMessage").add(labelMessage); - RootPanel.get("labelState").add(labelState); - RootPanel.get("labelName").add(labelName); - RootPanel.get("labelFrom").add(labelFrom); - RootPanel.get("labelTo").add(labelTo); - RootPanel.get("labelDate").add(labelDate); - RootPanel.get("labelSeats").add(labelSeats); - RootPanel.get("textName").add(textName); - RootPanel.get("textFrom").add(textFrom); - RootPanel.get("textTo").add(textTo); - RootPanel.get("textDate").add(textDate); - RootPanel.get("textSeats").add(textSeats); - RootPanel.get("buttonSubmit").add(buttonSubmit); } } Modified: jbossbpm/spec/trunk/modules/samples/airticket/client/src/main/resources/org/jboss/bpm/samples/airticket/public/Application.html =================================================================== --- jbossbpm/spec/trunk/modules/samples/airticket/client/src/main/resources/org/jboss/bpm/samples/airticket/public/Application.html 2008-07-30 10:13:20 UTC (rev 1770) +++ jbossbpm/spec/trunk/modules/samples/airticket/client/src/main/resources/org/jboss/bpm/samples/airticket/public/Application.html 2008-07-30 11:17:46 UTC (rev 1771) @@ -59,7 +59,8 @@ <td id="textSeats"></td> </tr> <tr align="center"> - <td colspan="2" id="buttonSubmit"></td> + <td id="buttonSubmit"></td> + <td id="buttonPull"></td> </tr> </table> </body> Modified: jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/client/AirticketService.java =================================================================== --- jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/client/AirticketService.java 2008-07-30 10:13:20 UTC (rev 1770) +++ jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/client/AirticketService.java 2008-07-30 11:17:46 UTC (rev 1771) @@ -4,5 +4,5 @@ public interface AirticketService extends RemoteService { - public String doComplimentMe(); + void sendUserRequest(String name, String from, String to, String date, String seats); } Modified: jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/client/AirticketServiceAsync.java =================================================================== --- jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/client/AirticketServiceAsync.java 2008-07-30 10:13:20 UTC (rev 1770) +++ jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/client/AirticketServiceAsync.java 2008-07-30 11:17:46 UTC (rev 1771) @@ -4,5 +4,5 @@ public interface AirticketServiceAsync { - public void doComplimentMe(AsyncCallback callback); + void sendUserRequest(String name, String from, String to, String date, String seats, AsyncCallback callback); } Modified: jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/server/AirticketServiceImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/server/AirticketServiceImpl.java 2008-07-30 10:13:20 UTC (rev 1770) +++ jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/server/AirticketServiceImpl.java 2008-07-30 11:17:46 UTC (rev 1771) @@ -4,10 +4,11 @@ import com.google.gwt.user.server.rpc.RemoteServiceServlet; +@SuppressWarnings("serial") public class AirticketServiceImpl extends RemoteServiceServlet implements AirticketService { - public String doComplimentMe() + public void sendUserRequest(String name, String from, String to, String date, String seats) { - return RandomCompliment.get(); + System.out.println(name); } } Deleted: jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/server/RandomCompliment.java =================================================================== --- jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/server/RandomCompliment.java 2008-07-30 10:13:20 UTC (rev 1770) +++ jbossbpm/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/server/RandomCompliment.java 2008-07-30 11:17:46 UTC (rev 1771) @@ -1,42 +0,0 @@ -package org.jboss.bpm.samples.airticket.server; - -/* - * Java5+ Class, showing how to run Java5 server side code.. and Java1.4 GWT Client code simultaneously in GWT-Maven - */ -public class RandomCompliment -{ - /* - * Java5+ enum - */ - private static enum compliment - { - GREAT, EXCELLENT, FANTASTIC, AWESOME, L337 - } - - /** - * Just use the static method to get a random value - */ - private RandomCompliment() - { - } - - /** - * Randomly select a compliment from the Java5+ enum - * - * @return a random compliment - */ - public static String get() - { - return "" + compliment.values()[(int)getRandomIndex()]; - } - - /** - * Generates a random index number, to select a random compliment - * - * @return random index number to the compliment.values array - */ - private static int getRandomIndex() - { - return (int)(Math.random() * ((double)compliment.values().length)); - } -} Copied: jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket (from rev 1765, jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/airticket) Added: jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/resources/jbpm-beans.xml =================================================================== --- jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/resources/jbpm-beans.xml (rev 0) +++ jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/resources/jbpm-beans.xml 2008-07-30 11:17:46 UTC (rev 1771) @@ -0,0 +1,57 @@ +<deployment xmlns="urn:jboss:bean-deployer:2.0"> + + <!-- The KernelLocator --> + <bean name="KernelLocator" class="org.jboss.kernel.plugins.util.KernelLocator"/> + + <!-- The Builder Factories --> + <bean name="jBPMProcessBuilderFactory" class="org.jboss.bpm.model.internal.ProcessBuilderFactoryImpl"/> + <bean name="jBPMMessageBuilderFactory" class="org.jboss.bpm.model.internal.MessageBuilderFactoryImpl"/> + <bean name="jBPMPropertyBuilderFactory" class="org.jboss.bpm.model.internal.PropertyBuilderFactoryImpl"/> + + <!-- The ProcessEngine --> + <bean name="jBPMProcessEngine" class="org.jboss.bpm.client.internal.ProcessEngineImpl"> + <property name="processManager"><inject bean="jBPMProcessManager"/></property> + <property name="executionManager"><inject bean="jBPMExecutionManager"/></property> + <property name="signalManager"><inject bean="jBPMSignalManager"/></property> + <property name="messageManager"><inject bean="jBPMMessageManager"/></property> + </bean> + + <!-- The Managers --> + <bean name="jBPMExecutionManager" class="org.jboss.bpm.client.internal.ExecutionManagerImpl"/> + <bean name="jBPMSignalManager" class="org.jboss.bpm.client.internal.SignalManagerImpl"/> + <bean name="jBPMMessageManager" class="org.jboss.bpm.client.internal.MessageManagerImpl"/> + + <!-- The ProcessManager --> + <bean name="jBPMProcessManager" class="org.jboss.bpm.client.internal.ProcessManagerImpl"> + <property name="dialectRegistry"><inject bean="jBPMDialectRegistry"/></property> + <property name="dialectHandlers"> + <map keyClass="java.lang.String" valueClass="org.jboss.bpm.client.DialectHandler"> + <!-- + <entry><key>api10</key><value><inject bean="jBPMDialectHandlerAPI10"/></value></entry> + <entry><key>jpdl32</key><value><inject bean="jBPMDialectHandlerJPDL32"/></value></entry> + <entry><key>stp</key><value><inject bean="jBPMDialectHandlerSTP"/></value></entry> + <entry><key>xpdl21</key><value><inject bean="jBPMDialectHandlerXPDL21"/></value></entry> + --> + </map> + </property> + </bean> + <!-- + <bean name="jBPMDialectHandlerAPI10" class="org.jboss.bpm.dialect.api10.DialectHandlerImpl"/> + <bean name="jBPMDialectHandlerJPDL32" class="org.jboss.bpm.dialect.jpdl32.DialectHandlerImpl"/> + <bean name="jBPMDialectHandlerSTP" class="org.jboss.bpm.dialect.stp.DialectHandlerImpl"/> + <bean name="jBPMDialectHandlerXPDL21" class="org.jboss.bpm.dialect.xpdl21.DialectHandlerImpl"/> + --> + + <!-- The DialectRegistry --> + <bean name="jBPMDialectRegistry" class="org.jboss.bpm.client.DialectRegistry"> + <property name="registry"> + <map keyClass="java.lang.String" valueClass="java.lang.String"> + <entry><key>urn:api.bpm.jboss:jpdl-0.1</key><value>api10</value></entry> + <entry><key>urn:jbpm.org:jpdl-3.2</key><value>jpdl32</value></entry> + <entry><key>http://stp.eclipse.org/bpmn</key><value>s... + <entry><key>http://www.wfmc.org/2008/XPDL2.1</key><value... + </map> + </property> + </bean> + +</deployment> \ No newline at end of file Property changes on: jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/resources/jbpm-beans.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/resources/log4j.xml =================================================================== --- jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/resources/log4j.xml (rev 0) +++ jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/resources/log4j.xml 2008-07-30 11:17:46 UTC (rev 1771) @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> + +<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false"> + + <!-- ================================= --> + <!-- Preserve messages in a local file --> + <!-- ================================= --> + + <appender name="FILE" class="org.apache.log4j.FileAppender"> + <param name="File" value="${log4j.output.dir}/test.log"/> + <param name="Append" value="false"/> + <layout class="org.apache.log4j.PatternLayout"> + <!-- The default pattern: Date Priority [Category] Message\n --> + <param name="ConversionPattern" value="%d %-5p [%c:%L] %m%n"/> + </layout> + </appender> + + <!-- ============================== --> + <!-- Append messages to the console --> + <!-- ============================== --> + + <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> + <param name="Target" value="System.out" /> + <param name="Threshold" value="INFO" /> + <layout class="org.apache.log4j.PatternLayout"> + <param name="ConversionPattern" value="%d{HH:mm:ss,SSS} [%t] %-5p %C{1} : %m%n" /> + </layout> + </appender> + + <!-- ================ --> + <!-- Limit categories --> + <!-- ================ --> + + <category name="org.jbpm"> + <priority value="DEBUG" /> + </category> + + <category name="org.hibernate"> + <priority value="INFO" /> + </category> + + <!-- hide optimistic locking failures --> + <category name="org.hibernate.event.def.AbstractFlushingEventListener"> + <priority value="FATAL" /> + </category> + + <!-- ======================= --> + <!-- Setup the Root category --> + <!-- ======================= --> + + <root> + <!--appender-ref ref="CONSOLE"/--> + <appender-ref ref="FILE"/> + </root> + +</log4j:configuration> Property changes on: jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/resources/log4j.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/resources/samples/airticket (from rev 1765, jbossbpm/spec/trunk/modules/testsuite/src/test/resources/samples/airticket)