diff options
author | Rich Hickey <richhickey@gmail.com> | 2008-12-16 14:10:56 +0000 |
---|---|---|
committer | Rich Hickey <richhickey@gmail.com> | 2008-12-16 14:10:56 +0000 |
commit | 2917a416236cf0a885098a0da1f629a58782a5db (patch) | |
tree | d12e105d320ed68d0b6f363cffd2e6b070d76f0d | |
parent | 56431834457820979e55c066e995ffe961ca11b3 (diff) |
EPL in header
-rw-r--r-- | clojure.iml | 39 | ||||
-rw-r--r-- | src/jvm/clojure/lang/AFunction.java | 4 |
2 files changed, 41 insertions, 2 deletions
diff --git a/clojure.iml b/clojure.iml index ce7869b6..a7b0514d 100644 --- a/clojure.iml +++ b/clojure.iml @@ -11,15 +11,54 @@ <setting name="buildJar" value="true" /> <setting name="mainClass" value="clojure.lang.Compiler" /> </component> + <component name="FacetManager"> + <facet type="web" name="Web" implicit="true"> + <configuration> + <descriptors> + <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/servlet/WEB-INF/web.xml" optional="false" version="2.5" /> + </descriptors> + <webroots> + <root url="file://$MODULE_DIR$/servlet" relative="/" /> + </webroots> + <building> + <setting name="EXPLODED_URL" value="file://" /> + <setting name="EXPLODED_ENABLED" value="false" /> + <setting name="JAR_URL" value="file://" /> + <setting name="JAR_ENABLED" value="false" /> + <setting name="BUILD_MODULE_ON_FRAME_DEACTIVATION" value="false" /> + <setting name="BUILD_EXTERNAL_DEPENDENCIES" value="false" /> + <setting name="EXCLUDE_EXPLODED_DIRECTORY" value="true" /> + <setting name="RUN_JASPER_VALIDATION" value="true" /> + <setting name="BUILD_ONLY_WEB_RESOURCES" value="false" /> + </building> + <packaging> + <containerElement type="module" name="clojure"> + <attribute name="method" value="1" /> + <attribute name="URI" value="/WEB-INF/classes" /> + </containerElement> + </packaging> + </configuration> + </facet> + </component> <component name="NewModuleRootManager" inherit-compiler-output="false"> <output url="file://$MODULE_DIR$/classes" /> <exclude-output /> <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/src/clj" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/jvm" isTestSource="false" /> </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="asm-3.0" level="project" /> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$APPLICATION_HOME_DIR$/lib/javaee.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> </component> <component name="VcsManagerConfiguration"> diff --git a/src/jvm/clojure/lang/AFunction.java b/src/jvm/clojure/lang/AFunction.java index fed5e267..82a79070 100644 --- a/src/jvm/clojure/lang/AFunction.java +++ b/src/jvm/clojure/lang/AFunction.java @@ -1,8 +1,8 @@ /** * Copyright (c) Rich Hickey. All rights reserved. * The use and distribution terms for this software are covered by the - * Common Public License 1.0 (http://opensource.org/licenses/cpl.php) - * which can be found in the file CPL.TXT at the root of this distribution. + * Eclipse Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php) + * which can be found in the file epl-v10.html at the root of this distribution. * By using this software in any fashion, you are agreeing to be bound by * the terms of this license. * You must not remove this notice, or any other, from this software. |