Permalink
Browse files

Had to make some changes to hide the duplicate 'with-bindings symbol …

…that is in both clojure.core and clojure.main.

Not sure why I needed to do this for the 'new branch in clojure and not the previous???
  • Loading branch information...
Eric Thor Eric Thor
Eric Thor authored and Eric Thor committed Dec 4, 2009
1 parent 0b22ab4 commit 0ea8ef3acd6ae13de4e8ddc3c5ef9fc25517385b
View
@@ -2,8 +2,8 @@
<ivy-module version="2.0">
<info organisation="org.enclojure" module="commons"/>
<dependencies>
- <dependency org="Clojure" name="clojure" rev="1.0.0-2009-11-13"/>
- <dependency org="Clojure-contrib" name="clojure-contrib" rev="1.0.0-2009-11-13"/>
+ <dependency org="Clojure" name="clojure" rev="1.0.0-2009-10-28"/>
+ <dependency org="Clojure-contrib" name="clojure-contrib" rev="1.0.0-2009-10-28"/>
<dependency org="Apache" name="commons-exec" rev="1.0.0"/>
<dependency org="Apache" name="commons-io" rev="1.4"/>
<dependency org="Apache" name="commons-logging" rev="1.1.1"/>
View
@@ -4,8 +4,8 @@
<dependencies>
<dependency org="org.enclojure" name="commons" rev="latest.integration"/>
<dependency org="org.enclojure" name="protocols" rev="latest.integration"/>
- <dependency org="Clojure" name="clojure" rev="1.0.0-2009-11-13"/>
- <dependency org="Clojure-contrib" name="clojure-contrib" rev="1.0.0-2009-11-13"/>
+ <dependency org="Clojure" name="clojure" rev="1.0.0-2009-10-28"/>
+ <dependency org="Clojure-contrib" name="clojure-contrib" rev="1.0.0-2009-10-28"/>
<dependency org="slf4j" name="slf4j-api" rev="1.5.8"/>
<dependency org="slf4j" name="slf4j-jdk14" rev="1.5.8"/>
<dependency org="java-cup" name="java-cup" rev="11a"/>
@@ -1,7 +1,7 @@
//----------------------------------------------------
// The following code was generated by CUP v0.11a beta 20060608
-// Sun Nov 22 17:24:38 EST 2009
+// Fri Dec 04 14:12:41 EST 2009
//----------------------------------------------------
package Example;
@@ -13,7 +13,7 @@
import clojure.lang.*;
/** CUP v0.11a beta 20060608 generated parser.
- * @version Sun Nov 22 17:24:38 EST 2009
+ * @version Fri Dec 04 14:12:41 EST 2009
*/
public class ClojureParser extends java_cup.runtime.lr_parser {
@@ -1,7 +1,7 @@
//----------------------------------------------------
// The following code was generated by CUP v0.11a beta 20060608
-// Sun Nov 22 17:24:38 EST 2009
+// Fri Dec 04 14:12:41 EST 2009
//----------------------------------------------------
package Example;
View
@@ -6,8 +6,8 @@
<dependency org="org.enclojure" name="repl-server" rev="latest.integration"/>
<dependency org="org.enclojure" name="repl-client" rev="latest.integration"/>
<dependency org="org.enclojure" name="ide-tools" rev="latest.integration"/>
- <dependency org="Clojure" name="clojure" rev="1.0.0-2009-11-13"/>
- <dependency org="Clojure-contrib" name="clojure-contrib" rev="1.0.0-2009-11-13"/>
+ <dependency org="Clojure" name="clojure" rev="1.0.0-2009-10-28"/>
+ <dependency org="Clojure-contrib" name="clojure-contrib" rev="1.0.0-2009-10-28"/>
<dependency org="Apache" name="commons-exec" rev="1.0.0"/>
<dependency org="Apache" name="commons-io" rev="1.4"/>
<dependency org="Apache" name="commons-logging" rev="1.1.1"/>
@@ -16,7 +16,8 @@
)
(ns org.enclojure.ide.analyze.files
- (:use clojure.main)
+ (:refer-clojure :exclude (with-bindings))
+ (:use [clojure.main :exclude (with-bindings)])
(:require [clojure.set :as set]
[org.enclojure.ide.navigator.parser :as parser]
[org.enclojure.ide.analyze.core :as analyze.core]
@@ -16,7 +16,7 @@
)
(ns org.enclojure.ide.analyze.symbol-meta
- (:use clojure.main)
+ (:use [clojure.main :exclude (with-bindings)])
(:import (java.util.logging Level))
(:require
[clojure.set :as set]
@@ -5,7 +5,7 @@
<project name="enclojure.plugin.netbeans" default="default" basedir=".">
<description>Builds, tests, and runs the project org.enclojure.ide.nb.editor.</description>
<property name="nb.version" value="6.7" />
- <property name="clojure-version" value="-1.0.0-2009-11-13" />
+ <property name="clojure-version" value="-1.0.0-2009-10-28" />
<!--
If this is not here, the project must be loaded into NB once in order for a
private properties file to get initialized with this info in it. Otherwise
@@ -1 +1 @@
-user.properties.file=/Users/ericthorsen/.netbeans/6.7/build.properties
+user.properties.file=/Users/ericthor/.netbeans/6.7/build.properties
@@ -472,12 +472,12 @@
<package>org.enclojure.repl</package>
</public-packages>
<class-path-extension>
- <runtime-relative-path>ext/clojure-1.0.0-2009-11-13.jar</runtime-relative-path>
- <binary-origin>release/modules/ext/clojure-1.0.0-2009-11-13.jar</binary-origin>
+ <runtime-relative-path>ext/clojure-1.0.0-2009-10-28.jar</runtime-relative-path>
+ <binary-origin>release/modules/ext/clojure-1.0.0-2009-10-28.jar</binary-origin>
</class-path-extension>
<class-path-extension>
- <runtime-relative-path>ext/clojure-contrib-1.0.0-2009-11-13.jar</runtime-relative-path>
- <binary-origin>release/modules/ext/clojure-contrib-1.0.0-2009-11-13.jar</binary-origin>
+ <runtime-relative-path>ext/clojure-contrib-1.0.0-2009-10-28.jar</runtime-relative-path>
+ <binary-origin>release/modules/ext/clojure-contrib-1.0.0-2009-10-28.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/commons-exec-1.0.0.jar</runtime-relative-path>
@@ -16,7 +16,7 @@
)
(ns org.enclojure.ide.nb.classpaths.listeners
- (:use clojure.main)
+ (:use [clojure.main :exclude (with-bindings)])
(:require
[clojure.set :as set]
[org.enclojure.ide.navigator.parser :as parser]
@@ -16,7 +16,7 @@
)
(ns org.enclojure.ide.nb.editor.completion.symbol-caching
- (:use clojure.main)
+ (:use [clojure.main :exclude (with-bindings)])
(:require [clojure.set :as set]
[org.enclojure.ide.navigator.parser :as parser]
[org.enclojure.ide.analyze.symbol-meta :as symbol-meta]
View
@@ -2,6 +2,7 @@
<ivy-module version="2.0">
<info organisation="org.enclojure" module="protocols"/>
<dependencies>
- <dependency org="Clojure" name="clojure" rev="1.0.0-2009-11-13"/>
+ <dependency org="Clojure" name="clojure" rev="1.0.0-2009-10-28"/>
+ <dependency org="Clojure-contrib" name="clojure-contrib" rev="1.0.0-2009-10-28"/>
</dependencies>
</ivy-module>
View
@@ -4,8 +4,8 @@
<dependencies>
<dependency org="org.enclojure" name="commons" rev="latest.integration"/>
<dependency org="org.enclojure" name="repl-server" rev="latest.integration"/>
- <dependency org="Clojure" name="clojure" rev="1.0.0-2009-11-13"/>
- <dependency org="Clojure-contrib" name="clojure-contrib" rev="1.0.0-2009-11-13"/>
+ <dependency org="Clojure" name="clojure" rev="1.0.0-2009-10-28"/>
+ <dependency org="Clojure-contrib" name="clojure-contrib" rev="1.0.0-2009-10-28"/>
<dependency org="Apache" name="commons-exec" rev="1.0.0"/>
<dependency org="Apache" name="commons-io" rev="1.4"/>
<dependency org="Apache" name="commons-logging" rev="1.1.1"/>
@@ -12,6 +12,7 @@
)
(ns org.enclojure.ide.repl.repl-manager
+ (:refer-clojure :exclude (with-bindings))
(:use org.enclojure.repl.main)
(:require [org.enclojure.commons.c-slf4j :as logger]
[org.enclojure.commons.validation :as validation]
@@ -12,13 +12,14 @@
)
(ns org.enclojure.ide.repl.repl-panel
- (:use org.enclojure.repl.main
- org.enclojure.ide.repl.repl-manager
+ (:refer-clojure :exclude (with-bindings))
+ (:use org.enclojure.ide.repl.repl-manager
org.enclojure.ide.repl.repl-history
+ org.enclojure.repl.main
)
(:require [org.enclojure.ide.repl.repl-history-browse :as repl-history-browse]
[org.enclojure.commons.meta-utils :as meta-utils]
- [org.enclojure.commons.c-slf4j :as logger]
+ [org.enclojure.commons.c-slf4j :as logger]
)
(:import (java.util.logging Logger Level)
(org.enclojure.ide.repl ReplPanel)
View
@@ -2,7 +2,7 @@
<ivy-module version="2.0">
<info organisation="org.enclojure" module="repl-server"/>
<dependencies>
- <dependency org="Clojure" name="clojure" rev="1.0.0-2009-11-13"/>
- <dependency org="Clojure-contrib" name="clojure-contrib" rev="1.0.0-2009-11-13"/>
+ <dependency org="Clojure" name="clojure" rev="1.0.0-2009-10-28"/>
+ <dependency org="Clojure-contrib" name="clojure-contrib" rev="1.0.0-2009-10-28"/>
</dependencies>
</ivy-module>
@@ -37,8 +37,10 @@
where you can set the function to be called in your client application.
"}
org.enclojure.repl.main
- (:use clojure.contrib.pprint clojure.main)
- (:require [clojure.contrib.pprint :as pprint])
+ (:refer-clojure :exclude (with-bindings))
+ (:use clojure.contrib.pprint)
+ (:require [clojure.contrib.pprint :as pprint]
+ [clojure.main :exclude (with-binding)])
(:import (java.net Socket ServerSocket)
(java.util.logging Level Logger)
(java.io InputStreamReader DataOutputStream DataInputStream

0 comments on commit 0ea8ef3

Please sign in to comment.