diff --git a/.gitignore b/.gitignore index 9298981..9afd572 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,9 @@ *.jar *.war +# maven output +target/ + # gwt caches and compiled units # war/gwt_bree/ gwt-unitCache/ diff --git a/businessenergybox-client/pom.xml b/businessenergybox-client/pom.xml index 82a5406..f403bec 100644 --- a/businessenergybox-client/pom.xml +++ b/businessenergybox-client/pom.xml @@ -1,52 +1,63 @@ - - 4.0.0 - - - com.usav.beb - businessenergybox - 1.0-SNAPSHOT - - - businessenergybox-client - gwt-app - - - ${mavenVersion} - - - - - ${project.groupId} - businessenergybox-shared - ${project.version} - - - ${project.groupId} - businessenergybox-shared - ${project.version} - sources - - - com.google.gwt - gwt-user - - - com.google.gwt - gwt-dev - - - - - - - net.ltgt.gwt.maven - gwt-maven-plugin - - com.usav.beb.App - app - - - - + + 4.0.0 + + + com.usav.beb + businessenergybox + 1.0-SNAPSHOT + + + businessenergybox-client + gwt-app + + + ${mavenVersion} + + + + + ${project.groupId} + businessenergybox-shared + ${project.version} + + + ${project.groupId} + businessenergybox-shared + ${project.version} + sources + + + com.google.gwt + gwt-user + + + com.google.gwt + gwt-dev + + + + + + + net.ltgt.gwt.maven + gwt-maven-plugin + + com.usav.beb.App + app + + + + + generate-module + generate-resources + + generate-module + + + + + + diff --git a/businessenergybox-client/src/main/java/com/usav/beb/App.java b/businessenergybox-client/src/main/java/com/usav/beb/App.java index 4a2cf5a..f79c72d 100644 --- a/businessenergybox-client/src/main/java/com/usav/beb/App.java +++ b/businessenergybox-client/src/main/java/com/usav/beb/App.java @@ -20,139 +20,152 @@ /** * Entry point classes define onModuleLoad(). */ -public class App implements EntryPoint { - /** - * The message displayed to the user when the server cannot be reached or - * returns an error. - */ - private static final String SERVER_ERROR = "An error occurred while " - + "attempting to contact the server. Please check your network " - + "connection and try again."; +public class App implements EntryPoint +{ + /** + * The message displayed to the user when the server cannot be reached or + * returns an error. + */ + private static final String SERVER_ERROR = "An error occurred while " + + "attempting to contact the server. Please check your network " + + "connection and try again."; - /** - * Create a remote service proxy to talk to the server-side Greeting service. - */ - private final GreetingServiceAsync greetingService = GWT - .create(GreetingService.class); + /** + * Create a remote service proxy to talk to the server-side Greeting service. + */ + private final GreetingServiceAsync greetingService = GWT + .create(GreetingService.class); - /** - * This is the entry point method. - */ - public void onModuleLoad() { - final Button sendButton = new Button("Send"); - final TextBox nameField = new TextBox(); - nameField.setText("GWT User"); - final Label errorLabel = new Label(); + /** + * This is the entry point method. + */ + public void onModuleLoad() + { + final Button sendButton = new Button("Call the A-Team"); + final TextBox nameField = new TextBox(); + nameField.setText("Yo Name, Sucka!"); + final Label errorLabel = new Label(); - // We can add style names to widgets - sendButton.addStyleName("sendButton"); + // We can add style names to widgets + sendButton.addStyleName("sendButton"); - // Add the nameField and sendButton to the RootPanel - // Use RootPanel.get() to get the entire body element - RootPanel.get("nameFieldContainer").add(nameField); - RootPanel.get("sendButtonContainer").add(sendButton); - RootPanel.get("errorLabelContainer").add(errorLabel); + // Add the nameField and sendButton to the RootPanel + // Use RootPanel.get() to get the entire body element + RootPanel.get("nameFieldContainer").add(nameField); + RootPanel.get("sendButtonContainer").add(sendButton); + RootPanel.get("errorLabelContainer").add(errorLabel); - // Focus the cursor on the name field when the app loads - nameField.setFocus(true); - nameField.selectAll(); + // Focus the cursor on the name field when the app loads + nameField.setFocus(true); + nameField.selectAll(); - // Create the popup dialog box - final DialogBox dialogBox = new DialogBox(); - dialogBox.setText("Remote Procedure Call"); - dialogBox.setAnimationEnabled(true); - final Button closeButton = new Button("Close"); - // We can set the id of a widget by accessing its Element - closeButton.getElement().setId("closeButton"); - final Label textToServerLabel = new Label(); - final HTML serverResponseLabel = new HTML(); - VerticalPanel dialogVPanel = new VerticalPanel(); - dialogVPanel.addStyleName("dialogVPanel"); - dialogVPanel.add(new HTML("Sending name to the server:")); - dialogVPanel.add(textToServerLabel); - dialogVPanel.add(new HTML("
Server replies:")); - dialogVPanel.add(serverResponseLabel); - dialogVPanel.setHorizontalAlignment(VerticalPanel.ALIGN_RIGHT); - dialogVPanel.add(closeButton); - dialogBox.setWidget(dialogVPanel); + // Create the popup dialog box + final DialogBox dialogBox = new DialogBox(); + dialogBox.setText("Remote Procedure Call"); + dialogBox.setAnimationEnabled(true); + final Button closeButton = new Button("Close"); + // We can set the id of a widget by accessing its Element + closeButton.getElement().setId("closeButton"); + final Label textToServerLabel = new Label(); + final HTML serverResponseLabel = new HTML(); + VerticalPanel dialogVPanel = new VerticalPanel(); + dialogVPanel.addStyleName("dialogVPanel"); + dialogVPanel.add(new HTML("Sending name to the server:")); + dialogVPanel.add(textToServerLabel); + dialogVPanel.add(new HTML("
Server replies:")); + dialogVPanel.add(serverResponseLabel); + dialogVPanel.setHorizontalAlignment(VerticalPanel.ALIGN_RIGHT); + dialogVPanel.add(closeButton); + dialogBox.setWidget(dialogVPanel); - // Add a handler to close the DialogBox - closeButton.addClickHandler(new ClickHandler() { - public void onClick(ClickEvent event) { - dialogBox.hide(); - sendButton.setEnabled(true); - sendButton.setFocus(true); - } - }); + // Add a handler to close the DialogBox + closeButton.addClickHandler(new ClickHandler() + { + public void onClick(ClickEvent event) + { + dialogBox.hide(); + sendButton.setEnabled(true); + sendButton.setFocus(true); + } + }); - // Create a handler for the sendButton and nameField - class MyHandler implements ClickHandler, KeyUpHandler { - /** - * Fired when the user clicks on the sendButton. - */ - public void onClick(ClickEvent event) { - sendNameToServer(); - } + // Create a handler for the sendButton and nameField + class MyHandler implements ClickHandler, KeyUpHandler + { + /** + * Fired when the user clicks on the sendButton. + */ + public void onClick(ClickEvent event) + { + sendNameToServer(); + } - /** - * Fired when the user types in the nameField. - */ - public void onKeyUp(KeyUpEvent event) { - if (event.getNativeKeyCode() == KeyCodes.KEY_ENTER) { - sendNameToServer(); - } - } + /** + * Fired when the user types in the nameField. + */ + public void onKeyUp(KeyUpEvent event) + { + if(event.getNativeKeyCode() == KeyCodes.KEY_ENTER) + { + sendNameToServer(); + } + } - /** - * Send the name from the nameField to the server and wait for a response. - */ - private void sendNameToServer() { - // First, we validate the input. - errorLabel.setText(""); - String textToServer = nameField.getText(); - if (!FieldVerifier.isValidName(textToServer)) { - errorLabel.setText("Please enter at least four characters"); - return; - } + /** + * Send the name from the nameField to the server and wait for a response. + */ + private void sendNameToServer() + { + // First, we validate the input. + errorLabel.setText(""); + String textToServer = nameField.getText(); + if(!FieldVerifier.isValidName(textToServer)) + { + errorLabel.setText("Please enter at least four characters"); + return; + } - // Then, we send the input to the server. - sendButton.setEnabled(false); - textToServerLabel.setText(textToServer); - serverResponseLabel.setText(""); - greetingService.greetServer(textToServer, - new AsyncCallback() { - public void onFailure(Throwable caught) { - // Show the RPC error message to the user - dialogBox - .setText("Remote Procedure Call - Failure"); - serverResponseLabel - .addStyleName("serverResponseLabelError"); - serverResponseLabel.setHTML(SERVER_ERROR); - dialogBox.center(); - closeButton.setFocus(true); - } + // Then, we send the input to the server. + sendButton.setEnabled(false); + textToServerLabel.setText(textToServer); + serverResponseLabel.setText(""); + greetingService.greetServer(textToServer, + new AsyncCallback() + { + public void onFailure(Throwable caught) + { + // Show the RPC error message to the user + dialogBox + .setText("Remote Procedure Call - Failure"); + serverResponseLabel + .addStyleName("serverResponseLabelError"); + serverResponseLabel.setHTML(SERVER_ERROR); + dialogBox.center(); + closeButton.setFocus(true); + } - public void onSuccess(GreetingResponse result) { - dialogBox.setText("Remote Procedure Call"); - serverResponseLabel - .removeStyleName("serverResponseLabelError"); - serverResponseLabel.setHTML(new SafeHtmlBuilder() - .appendEscaped(result.getGreeting()) - .appendHtmlConstant("

I am running ") - .appendEscaped(result.getServerInfo()) - .appendHtmlConstant(".

It looks like you are using:
") - .appendEscaped(result.getUserAgent()) - .toSafeHtml()); - dialogBox.center(); - closeButton.setFocus(true); - } - }); - } - } + public void onSuccess(GreetingResponse result) + { + dialogBox.setText("Remote Procedure Call"); + serverResponseLabel + .removeStyleName("serverResponseLabelError"); + serverResponseLabel.setHTML(new SafeHtmlBuilder() + .appendEscaped(result.getGreeting()) + .appendHtmlConstant("

I am running ") + .appendEscaped(result.getServerInfo()) + .appendHtmlConstant(".

It looks like you are using:
") + .appendEscaped(result.getUserAgent()) + .toSafeHtml()); + dialogBox.center(); + closeButton.setFocus(true); + } + }); + } + } - // Add a handler to send the name to the server - MyHandler handler = new MyHandler(); - sendButton.addClickHandler(handler); - nameField.addKeyUpHandler(handler); - } + // Add a handler to send the name to the server + MyHandler handler = new MyHandler(); + sendButton.addClickHandler(handler); + nameField.addKeyUpHandler(handler); + } } diff --git a/businessenergybox-server/pom.xml b/businessenergybox-server/pom.xml index f3fa272..a1b775e 100644 --- a/businessenergybox-server/pom.xml +++ b/businessenergybox-server/pom.xml @@ -1,141 +1,147 @@ - - 4.0.0 - - - com.usav.beb - businessenergybox - 1.0-SNAPSHOT - - - businessenergybox-server - war - - - ${mavenVersion} - - - - - ${project.groupId} - businessenergybox-shared - ${project.version} - - - com.google.gwt - gwt-servlet - - - javax.servlet - javax.servlet-api - provided - - - - - - - - org.eclipse.jetty - jetty-maven-plugin - - false - 1 - - ${basedir}/../businessenergybox-shared/target/classes/ - - - - - org.apache.tomcat.maven - tomcat6-maven-plugin - - false - / - UTF-8 - - - - org.apache.tomcat.maven - tomcat7-maven-plugin - - false - / - UTF-8 - - - - - - - - - - env-prod - - true - - + + 4.0.0 + + + com.usav.beb + businessenergybox + 1.0-SNAPSHOT + + + businessenergybox-server + war + + + ${mavenVersion} + + + - ${project.groupId} - businessenergybox-client - ${project.version} - war - runtime + ${project.groupId} + businessenergybox-shared + ${project.version} - - - - env-dev - - - env - dev - - - - - - - org.eclipse.jetty - jetty-maven-plugin - - - - src/main/webapp,${basedir}/../target/gwt/launcherDir/ - - - - - gwt.codeserver.port - 9876 - - - - - - org.apache.tomcat.maven - tomcat6-maven-plugin - - ${basedir}/src/main/tomcatconf/context.xml - - 9876 - - - + + com.google.gwt + gwt-servlet + + + javax.servlet + javax.servlet-api + provided + + + + + com.google.appengine + appengine-api-1.0-sdk + 1.9.38 + + + + com.google.appengine + appengine-tools-sdk + 1.9.38 + + + + + + + + - org.apache.tomcat.maven - tomcat7-maven-plugin - - ${basedir}/src/main/tomcatconf/context.xml - - 9876 - - + com.google.appengine + appengine-maven-plugin + 1.9.38 + + false + true + ${webappDirectory} + + +
0.0.0.0
+ 8888 + + + + - + + + + + + + org.eclipse.jetty + jetty-maven-plugin + + false + 1 + + + ${basedir}/../businessenergybox-shared/target/classes/ + + + + - - - + + + + + + + + + env-prod + + true + + + + ${project.groupId} + businessenergybox-client + ${project.version} + war + runtime + + + + + env-dev + + + env + dev + + + + + + + + org.eclipse.jetty + jetty-maven-plugin + + + + src/main/webapp,${basedir}/../target/gwt/launcherDir/ + + + + + gwt.codeserver.port + 9876 + + + + + + + + + diff --git a/businessenergybox-server/src/main/webapp/WEB-INF/appengine-web.xml b/businessenergybox-server/src/main/webapp/WEB-INF/appengine-web.xml new file mode 100644 index 0000000..b33fabb --- /dev/null +++ b/businessenergybox-server/src/main/webapp/WEB-INF/appengine-web.xml @@ -0,0 +1,31 @@ + + + + + business-energy-box + mod1 + + + true + true + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/businessenergybox-server/src/main/webapp/WEB-INF/logging.properties b/businessenergybox-server/src/main/webapp/WEB-INF/logging.properties new file mode 100644 index 0000000..a172066 --- /dev/null +++ b/businessenergybox-server/src/main/webapp/WEB-INF/logging.properties @@ -0,0 +1,13 @@ +# A default java.util.logging configuration. +# (All App Engine logging is through java.util.logging by default). +# +# To use this configuration, copy it into your application's WEB-INF +# folder and add the following to your appengine-web.xml: +# +# +# +# +# + +# Set the default logging level for all loggers to WARNING +.level = WARNING diff --git a/businessenergybox-server/src/main/webapp/WEB-INF/web.xml b/businessenergybox-server/src/main/webapp/WEB-INF/web.xml index a0eb663..da2df97 100644 --- a/businessenergybox-server/src/main/webapp/WEB-INF/web.xml +++ b/businessenergybox-server/src/main/webapp/WEB-INF/web.xml @@ -1,22 +1,23 @@ - - - - greetServlet - com.usav.beb.GreetingServiceImpl - - - - greetServlet - /app/greet - - - - - index.html - + xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" + version="2.5"> + + + + greetServlet + com.usav.beb.GreetingServiceImpl + + + + greetServlet + /app/greet + + + + + index.html + diff --git a/businessenergybox-shared/pom.xml b/businessenergybox-shared/pom.xml index 3923dde..8e7021c 100644 --- a/businessenergybox-shared/pom.xml +++ b/businessenergybox-shared/pom.xml @@ -1,57 +1,59 @@ - - 4.0.0 - - - com.usav.beb - businessenergybox - 1.0-SNAPSHOT - - - businessenergybox-shared - - - ${mavenVersion} - - - - - com.google.gwt - gwt-servlet - provided - - - - - - - maven-source-plugin - - - - - - - m2e - - - m2e.version - - - + + 4.0.0 + + + com.usav.beb + businessenergybox + 1.0-SNAPSHOT + + + businessenergybox-shared + + + + ${mavenVersion} + + + - com.google.gwt - gwt-user + com.google.gwt + gwt-servlet + provided - - + + + - - org.codehaus.mojo - gwt-maven-plugin - + + maven-source-plugin + - - - + + + + + m2e + + + m2e.version + + + + + com.google.gwt + gwt-user + + + + + + org.codehaus.mojo + gwt-maven-plugin + + + + + diff --git a/pom.xml b/pom.xml index 0711e1f..1f8f6d1 100644 --- a/pom.xml +++ b/pom.xml @@ -14,8 +14,9 @@ UTF-8 - 3.0 + + ${project.build.directory}/${project.build.finalName} @@ -23,7 +24,7 @@ com.google.gwt gwt - 2.8.0-rc1 + 2.8.0-rc2 pom import @@ -36,13 +37,15 @@ + + ${webappDirectory}/WEB-INF/classes + net.ltgt.gwt.maven gwt-maven-plugin false - ${project.build.directory}/gwt/launcherDir @@ -57,6 +60,7 @@ 1.8 + org.eclipse.jetty jetty-maven-plugin @@ -65,6 +69,7 @@ true + net.ltgt.gwt.maven gwt-maven-plugin @@ -73,13 +78,9 @@ 1.8 true - - - - - + maven-source-plugin 3.0.0 @@ -93,16 +94,7 @@ - - org.apache.tomcat.maven - tomcat6-maven-plugin - 2.2 - - - org.apache.tomcat.maven - tomcat7-maven-plugin - 2.2 - +