                                    {}
                                    {:module (str (-> webapp-edn-c :module :name))})
                                  {}))
-              app-id (name (-> (boot/get-env) :gae :app-id))
-              version (str/replace (-> (boot/get-env) :gae :version) "." "-")
-              version (str "r-" (subs version 0 (.lastIndexOf version "-SNAPSHOT")))
+              app-id (name (-> (boot/get-env) :gae :app :id))
+              ;; version (str/replace (-> (boot/get-env) :gae :module :version) "." "-")
+              ;; version (str "r-" (subs version 0 (.lastIndexOf version "-SNAPSHOT")))
               module (-> (boot/get-env) :gae :module :name)
               ;; module (if (:module gae-forms)
               ;;          (str (:module gae-forms) "-" version)

  (if verbose (println "TASK: boot-gae/deploy"))
  (validate-tools-api-jar)
  (println "PARAMS: " *opts*)
  (let [opts (merge {:sdk-root (:sdk-root config-map)
                     ;; :use-java7 true
                     :build-dir (gae-app-dir)} ;; (:build-dir config-map)}
                    *opts*)
        _ (println "OPTS: " opts)
        params (into [] (for [[k v] (remove (comp nil? second)

   k keep bool str "keep intermediate .clj files"
   m module MODULE str "module dirpath"
   v verbose bool "Print trace messages."]
  ;; boolean hasUppercase = !password.equals(password.toLowerCase());
  (let [tmp-dir (boot/tmp-dir!)
        prev-pre (atom nil)
        dir (if dir dir web-inf-dir)
        version (str/replace (-> (boot/get-env) :gae :module :version) "." "-")]
    (if (not= version  (.toLowerCase version))
      (throw (Exception. (str "Upper-case not allowed in GAE version string: " version))))
    (boot/with-pre-wrap fileset
      (let [webapp-edn-files (->> (boot/fileset-diff @prev-pre fileset)
                                  boot/input-files
