Permalink
Browse files

Merged branches

  • Loading branch information...
EricThorsen committed Jun 21, 2010
2 parents 0adebb0 + 129d02f commit 67e302ecc6cd9b4edc5a3c822199b637fdcc662a

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -16,7 +16,6 @@
; setup logging
(logger/ensure-logger)
-
(def *src-base-dir* (str (System/getProperty "user.dir")
"/../../../templates/netbeans"))
(def *dest-base-dir* (str (System/getProperty "user.dir")
@@ -102,57 +101,3 @@
(zip-project-templates)
(zip-project-samples)
-
-;(defn zip-dir [zip-dir out-zip file-name-fn list-fn]
-; (println "iam here " zip-dir)
-; (flush)
-; (let [zipf (java-utils/file zip-dir)
-; dir-name (file-name-fn (.trim (.getName zipf)))]
-; (println "putting " dir-name "/")
-; (println "list is " (list-fn zipf))
-; (flush)
-; (.putNextEntry out-zip (ZipEntry. dir-name)) ; place an entry for the directory
-; (loop [file-list (list-fn zipf)]
-; (if-let [fentry (first file-list)]
-; (let [f (java-utils/file fentry)]
-; (println "class is " (class f) " " f)
-; (if (.isDirectory f)
-; (zip-dir f out-zip)
-; (with-open [in (FileInputStream. f)]
-; (println "opened " f " " f)
-; (.putNextEntry out-zip (ZipEntry. (file-name-fn (.getName f))))
-; (loop [bytes (byte-array 1024) read-count (.read in bytes 1024)]
-;
-; (duck-streams/copy in out-zip))))
-; (recur (rest file-list))))))
-;
-;(defn zip-files [target-path target-file
-; src-base-dir filter-fn]
-; (println "starting???????????")
-; (when (.exists target-file)
-; (println "deleting " target-file)
-; (.delete target-file))
-; (.mkdirs target-path)
-; (println "opening " target-file)
-; (let [out-zip (ZipOutputStream. (FileOutputStream. target-file))]
-; (println "target file opened " target-file)
-; (zip-dir src-base-dir out-zip
-; #(if (.startsWith % (str src-base-dir))
-; (subs % (count (str src-base-dir)))
-; %)
-; filter-fn)))
-;
-;(defn zip-and-copy-dir [src-dir dest-dir]
-; (.mkdirs (File. dest-dir))
-; (zip-files
-; (File. (str dest-dir "/" (.getName src-dir)))
-; (File. (str dest-dir "/" (.getName src-dir) "/" (.getName src-dir) ".zip"))
-; src-dir
-; (fn [path]
-; (filter #(every? (fn [fexpr]
-; (and (not= (.getPath path) (str %))
-; (not (.contains (str %) fexpr))))
-; *filter-files*)
-; (file-seq (java-utils/file path))))
-; ))
-;
@@ -635,6 +635,26 @@
<attr name="SystemFileSystem.icon"
urlvalue="nbresloc:/org/enclojure/ide/nb/clojure/project/enclojure 16x16.png"/>
</file>
+ <file name="Clojure 1.1 Maven Project" url="nbresloc:/org/enclojure/ide/templates/project/Clojure-1.1/Clojure-1.1.zip">
+ <attr name="SystemFileSystem.localizingBundle" stringvalue="org.enclojure.ide.nb.editor.Bundle"/>
+ <attr name="instantiatingWizardURL"
+ urlvalue="nbresloc:/org/enclojure/ide/nb/clojure/project/ClojureTemplateDescription.html"/>
+ <attr name="instantiatingIterator"
+ methodvalue="org.enclojure.ide.nb.clojure.project.ClojureTemplateWizardIterator.createIterator"/>
+ <attr name="template" boolvalue="true"/>
+ <attr name="SystemFileSystem.icon"
+ urlvalue="nbresloc:/org/enclojure/ide/nb/clojure/project/enclojure 16x16.png"/>
+ </file>
+ <file name="Clojure 1.2-SNAPSHOT Maven Project" url="nbresloc:/org/enclojure/ide/templates/project/Clojure-1.2-SNAPSHOT/Clojure-1.2-SNAPSHOT.zip">
+ <attr name="SystemFileSystem.localizingBundle" stringvalue="org.enclojure.ide.nb.editor.Bundle"/>
+ <attr name="instantiatingWizardURL"
+ urlvalue="nbresloc:/org/enclojure/ide/nb/clojure/project/ClojureTemplateDescription.html"/>
+ <attr name="instantiatingIterator"
+ methodvalue="org.enclojure.ide.nb.clojure.project.ClojureTemplateWizardIterator.createIterator"/>
+ <attr name="template" boolvalue="true"/>
+ <attr name="SystemFileSystem.icon"
+ urlvalue="nbresloc:/org/enclojure/ide/nb/clojure/project/enclojure 16x16.png"/>
+ </file>
</folder>
<folder name="Samples">
<folder name="Clojure">
@@ -5,7 +5,7 @@
<parent>
<groupId>org.enclojure</groupId>
<artifactId>nb-enclojure-app</artifactId>
- <version>1.1</version>
+ <version>${enclojure.version.release}</version>
</parent>
<artifactId>org-enclojure-commons</artifactId>
<version>1.0-SNAPSHOT</version>
@@ -5,7 +5,7 @@
<parent>
<artifactId>nb-enclojure-app</artifactId>
<groupId>org.enclojure</groupId>
- <version>1.1</version>
+ <version>${enclojure.version.release}</version>
</parent>
<groupId>org.enclojure</groupId>
<artifactId>org-enclojure-ide</artifactId>
@@ -5,7 +5,7 @@
<parent>
<artifactId>nb-enclojure-app</artifactId>
<groupId>org.enclojure</groupId>
- <version>1.1</version>
+ <version>${enclojure.version.release}</version>
</parent>
<groupId>org.enclojure</groupId>
<artifactId>org-enclojure-repl-client</artifactId>
@@ -5,7 +5,7 @@
<parent>
<artifactId>nb-enclojure-app</artifactId>
<groupId>org.enclojure</groupId>
- <version>1.1</version>
+ <version>${enclojure.version.release}</version>
</parent>
<groupId>org.enclojure</groupId>
<artifactId>org-enclojure-repl-server</artifactId>
View
@@ -8,12 +8,11 @@
<netbeans.version>RELEASE68</netbeans.version>
<brandingToken>enclojure</brandingToken>
<enclojure.version.dev>1.0-SNAPSHO</enclojure.version.dev>
- <enclojure.version.release>1.1.0</enclojure.version.release>
</properties>
<modelVersion>4.0.0</modelVersion>
<groupId>org.enclojure</groupId>
<artifactId>nb-enclojure-app</artifactId>
- <version>1.1</version>
+ <version>${enclojure.version.release}</version>
<url>http://enclojure.org/</url>
<description>Enclojure library.</description>
<name>Enclojure Tools</name>
View
@@ -0,0 +1 @@
+enclojure.version.release=1.4

0 comments on commit 67e302e

Please sign in to comment.