deleting old jars and xmls and adding new ones

Paco-Server/.classpath

@@ -13,10 +13,10 @@
 	<classpathentry kind="lib" path="ear/default/WEB-INF/lib/guava-16.0.1.jar"/>
 	<classpathentry kind="lib" path="ear/default/WEB-INF/lib/jackson-all-1.9.11.jar"/>
 	<classpathentry kind="lib" path="ear/default/WEB-INF/lib/opencsv-2.3.jar"/>
-	<classpathentry kind="lib" path="../tools/appengine-java-sdk-1.9.0/lib/testing/appengine-testing.jar"/>
-	<classpathentry kind="lib" path="../tools/appengine-java-sdk-1.9.0/lib/impl/appengine-api-stubs.jar"/>
-	<classpathentry kind="lib" path="../tools/appengine-java-sdk-1.9.0/lib/impl/appengine-api.jar"/>
-	<classpathentry kind="lib" path="../tools/appengine-java-sdk-1.9.0/lib/impl/appengine-api-labs.jar"/>
+	<classpathentry kind="lib" path="../tools/appengine-java-sdk-1.9.54/lib/testing/appengine-testing.jar"/>
+	<classpathentry kind="lib" path="../tools/appengine-java-sdk-1.9.54/lib/impl/appengine-api-stubs.jar"/>
+	<classpathentry kind="lib" path="../tools/appengine-java-sdk-1.9.54/lib/impl/appengine-api.jar"/>
+	<classpathentry kind="lib" path="../tools/appengine-java-sdk-1.9.54/lib/impl/appengine-api-labs.jar"/>
 	<classpathentry kind="lib" path="ear/default/WEB-INF/lib/json-1.5.jar"/>
 	<classpathentry kind="lib" path="ear/default/WEB-INF/lib/appengine-gcs-client-0.4.4.jar"/>
 	<classpathentry kind="lib" path="ear/default/WEB-INF/lib/appengine-mapreduce.jar"/>
@@ -30,6 +30,6 @@
 	<classpathentry kind="lib" path="ear/default/WEB-INF/lib/sqlbuilder-2.1.6.jar"/>
 	<classpathentry kind="lib" path="ear/default/WEB-INF/lib/commons-dbcp-1.4.jar"/>
 	<classpathentry kind="lib" path="ear/default/WEB-INF/lib/commons-pool-1.5.4.jar"/>
-	<classpathentry kind="con" path="com.google.appengine.eclipse.core.GAE_CONTAINER/appengine-java-sdk-1.9.0-paco"/>
+	<classpathentry kind="con" path="com.google.appengine.eclipse.core.GAE_CONTAINER"/>
 	<classpathentry kind="output" path="ear/default/WEB-INF/classes"/>
 </classpath>

Paco-Server/.settings/com.google.appengine.eclipse.core.prefs

@@ -1,9 +1,9 @@
 eclipse.preferences.version=1
-filesCopiedToWebInfLib=appengine-api-1.0-sdk-1.9.0.jar|appengine-api-labs.jar|appengine-endpoints-deps.jar|appengine-endpoints.jar|appengine-jsr107cache-1.9.0.jar|datanucleus-appengine-1.0.10.final.jar|datanucleus-core-1.1.5.jar|datanucleus-jpa-1.1.5.jar|geronimo-jpa_3.0_spec-1.1.1.jar|geronimo-jta_1.1_spec-1.1.1.jar|jdo2-api-2.3-eb.jar|jsr107cache-1.1.jar
+filesCopiedToWebInfLib=appengine-api-1.0-sdk-1.9.54.jar|appengine-api-labs.jar|appengine-endpoints-deps.jar|appengine-endpoints.jar|appengine-jsr107cache-1.9.54.jar|datanucleus-appengine-1.0.10.final.jar|datanucleus-core-1.1.5.jar|datanucleus-jpa-1.1.5.jar|geronimo-jpa_3.0_spec-1.1.1.jar|geronimo-jta_1.1_spec-1.1.1.jar|jdo2-api-2.3-eb.jar|jsr107cache-1.1.jar
 gaeDatanucleusVersion=v1
 gaeDeployDialogSettings=
 gaeHrdEnabled=true
 gaeIsEclipseDefaultInstPath=false
 googleCloudSqlEnabled=false
 localDevMySqlEnabled=true
-ormEnhancementInclusions=src/
+ormEnhancementInclusions=src

Paco-Server/.settings/org.eclipse.jdt.core.prefs

@@ -1,11 +1,12 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8

Paco-Server/antbuild.xml

@@ -15,7 +15,7 @@
  ~ under the License.
  -->
  <project default="build" basedir=".">
-  <property name="sdk.dir" location="../tools/appengine-java-sdk-1.9.0" />
+  <property name="sdk.dir" location="../tools/appengine-java-sdk-1.9.54" />
 
   <import file="${sdk.dir}/config/user/ant-macros.xml" />
 

Paco-Server/ear/default/WEB-INF/appengine-web.xml

@@ -51,6 +51,7 @@
   <precompilation-enabled>true</precompilation-enabled>
   <threadsafe>true</threadsafe>
   <use-google-connector-j>true</use-google-connector-j>
+  <runtime>java8</runtime>
   <!--
       <admin-console>
       <page name="Appstats" url="/appstats" />

Paco-Server/ear/default/WEB-INF/web.xml

@@ -151,14 +151,14 @@
     <url-pattern>/lastAppSessionChart</url-pattern>
   </servlet-mapping>
 
-  <servlet>
+ <!--  <servlet>
     <servlet-name>PhoneSessionServlet</servlet-name>
     <servlet-class>com.google.sampling.experiential.server.viz.appusage.PhoneSessionServlet</servlet-class>
   </servlet>
   <servlet-mapping>
     <servlet-name>PhoneSessionServlet</servlet-name>
     <url-pattern>/phoneSessions</url-pattern>
-  </servlet-mapping>
+  </servlet-mapping> -->
 
 
   <!--  administrative and debugging endpoints -->
@@ -285,8 +285,8 @@
       <url-pattern>/remote_api*</url-pattern>
       <url-pattern>/eval*</url-pattern>
       <url-pattern>/participantJoinStats*</url-pattern>
-      <url-pattern>/migration*</url-pattern>
-      <url-pattern>/csInsert*</url-pattern>
+    <!--   <url-pattern>/migration*</url-pattern> -->
+    <!--   <url-pattern>/csInsert*</url-pattern> -->
       <!--  <url-pattern>/eventCounter</url-pattern> --> 
       <!--  <url-pattern>/mayJuneEventCounter</url-pattern>  --> 
     </web-resource-collection>

Paco-Server/ear/mapreduce/WEB-INF/appengine-web.xml

@@ -22,7 +22,11 @@
     running out of memory -->
   <max-concurrent-requests>4</max-concurrent-requests>
   </automatic-scaling>
+<<<<<<< Updated upstream
 
+=======
+  <runtime>java8</runtime>
+>>>>>>> Stashed changes
   <system-properties>
     <property name="java.util.logging.config.file" value="WEB-INF/logging.properties"/>
 

Paco-Server/ear/migration/WEB-INF/appengine-web.xml

@@ -42,6 +42,7 @@
   <precompilation-enabled>true</precompilation-enabled>
   <threadsafe>true</threadsafe>
   <instance-class>B8</instance-class>
+  <runtime>java8</runtime>
   <basic-scaling>
     <max-instances>10</max-instances>
   </basic-scaling>

Paco-Server/ear/reportworker/WEB-INF/appengine-web.xml

@@ -36,7 +36,7 @@
     <property name="ae-cloudsql.local-database-username" value="XXXX"/>
     <property name="ae-cloudsql.local-database-password" value="XXXX"/>
   </system-properties>
-
+  <runtime>java8</runtime>
   <ssl-enabled>true</ssl-enabled>
   <sessions-enabled>true</sessions-enabled>
   <precompilation-enabled>true</precompilation-enabled>

Paco-Server/src/com/google/sampling/experiential/server/EventRetriever.java

@@ -54,6 +54,7 @@
 import com.google.appengine.api.datastore.Query.FilterOperator;
 import com.google.appengine.api.datastore.Query.FilterPredicate;
 import com.google.appengine.api.datastore.QueryResultList;
+import com.google.appengine.api.modules.ModulesServiceFactory;
 import com.google.appengine.api.taskqueue.Queue;
 import com.google.appengine.api.taskqueue.QueueFactory;
 import com.google.appengine.api.taskqueue.TaskOptions;
@@ -267,7 +268,14 @@ public void sendToCloudSqlQueue(JSONObject eventJson, Event event) {
     } catch (JSONException e) {
       log.severe("while sending to cloud sql queue" + e);
     }
-    queue.add(TaskOptions.Builder.withUrl("/csInsert").payload(eventJson.toString()));
+    TaskOptions to = TaskOptions.Builder.withUrl("/csInsert").payload(eventJson.toString());
+    if (!System.getProperty("com.google.appengine.runtime.version").startsWith("Google App Engine/")) {
+      log.info("hello");
+      queue.add(to.header("Host", ModulesServiceFactory.getModulesService().getVersionHostname("mapreduce", null)));
+    } else {
+      log.info("hi");
+      queue.add(to);
+    }
   }
 
   @SuppressWarnings("unchecked")

Paco-Server/src/com/google/sampling/experiential/server/FailedEventsInsertServlet.java

@@ -16,7 +16,7 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import com.google.appengine.labs.repackaged.com.google.common.collect.Lists;
+import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.sampling.experiential.shared.EventDAO;
 import com.pacoapp.paco.shared.util.Constants;

Paco-Server/src/com/google/sampling/experiential/server/migration/MigrationFrontendServlet.java

@@ -79,7 +79,16 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws Se
         resp.sendError(HttpServletResponse.SC_BAD_REQUEST);
       }
       String jobId = sendMigrateRequestToBackend(req, jobName, cursor, stDate, endDate);
-      resp.sendRedirect("/jobStatus?jobId=" + jobId);
+      String redirectUrl = null;
+      // On dev local, when we kick off job from backend module - migration with correct port number, 
+      // the job status which is defined in default module is getting searched in migration module.
+      // In other environments, the request gets routed through dispatch xml.
+      if (!System.getProperty("com.google.appengine.runtime.version").startsWith("Google App Engine/")) {
+        redirectUrl = "http://"+ModulesServiceFactory.getModulesService().getVersionHostname("default", null)+"/jobStatus?jobId=" + jobId;
+      } else {
+        redirectUrl = "/jobStatus?jobId=" + jobId;
+      }
+      resp.sendRedirect(redirectUrl);
     } else {
       resp.sendError(HttpServletResponse.SC_FORBIDDEN);
     }

Paco-Server/src/com/google/sampling/experiential/server/stats/participation/ResponseStatSummarizer.java

@@ -7,7 +7,7 @@
 
 import org.joda.time.DateTime;
 
-import com.google.appengine.labs.repackaged.com.google.common.collect.Maps;
+import com.google.common.collect.Maps;
 import com.google.common.collect.Lists;
 
 

Paco-Server/src/com/google/sampling/experiential/server/viz/appusage/AppSession.java

@@ -4,7 +4,7 @@
 
 import org.joda.time.DateTime;
 
-import com.google.appengine.labs.repackaged.com.google.common.base.Joiner;
+import com.google.common.base.Joiner;
 import com.google.common.collect.Lists;
 import com.google.sampling.experiential.shared.EventDAO;
 

Paco-Server/src/com/google/sampling/experiential/server/viz/appusage/LastAppSessionChartServlet.java

@@ -20,7 +20,7 @@
 import org.joda.time.format.DateTimeFormatter;
 
 import com.google.appengine.api.users.User;
-import com.google.appengine.labs.repackaged.com.google.common.base.Strings;
+import com.google.common.base.Strings;
 import com.google.sampling.experiential.server.AuthUtil;
 import com.google.sampling.experiential.server.EventQueryStatus;
 import com.google.sampling.experiential.server.TimeUtil;

Paco-Server/src/com/google/sampling/experiential/server/viz/appusage/PhoneSession.java

@@ -4,7 +4,7 @@
 
 import org.joda.time.DateTime;
 
-import com.google.appengine.labs.repackaged.com.google.common.collect.Lists;
+import com.google.common.collect.Lists;
 import com.google.sampling.experiential.shared.EventDAO;
 
 public class PhoneSession extends BaseSession {

Paco/src/com/pacoapp/paco/model/RegexTester.java

@@ -0,0 +1,26 @@
+package com.pacoapp.paco.model;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class RegexTester {
+	public static void main(String args[]){
+		 String line = "This order was placed for QT3000! OK?";
+	      String pattern = "(.*)";
+
+	      // Create a Pattern object
+	      Pattern r = Pattern.compile(pattern);
+
+	      // Now create matcher object.
+	      Matcher m = r.matcher(line);
+	      if (m.find( )) {
+	         System.out.println("Found value: " + m.group(0) );
+	         System.out.println("Found value: " + m.group(1) );
+	         System.out.println("Found value: " + m.group(2) );
+	      }else {
+	         System.out.println("NO MATCH");
+	      }	
+	}
+
+
+}

ServerTools/.classpath

@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="lib" path="lib/guava-16.0.1.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/Paco-Server"/>
-	<classpathentry kind="lib" path="../tools/appengine-java-sdk-1.9.0/lib/impl/appengine-api.jar"/>
-	<classpathentry kind="lib" path="../tools/appengine-java-sdk-1.9.0/lib/appengine-remote-api.jar"/>
 	<classpathentry kind="src" path="/Shared"/>
-	<classpathentry kind="lib" path="/Users/bobevans/git/paco/Paco-Server/ear/default/WEB-INF/lib/json-1.5.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/Java SE 8 [1.8.0_102]"/>
+	<classpathentry kind="lib" path="/Paco-Server/ear/default/WEB-INF/lib/json-1.5.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/Java SE 8 [1.8.0_111]"/>
+	<classpathentry kind="lib" path="/Users/imeyyappan/appengine-java-sdk-1.9.54/lib/impl/appengine-api.jar"/>
+	<classpathentry kind="lib" path="/Users/imeyyappan/appengine-java-sdk-1.9.54/lib/appengine-remote-api.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>