simile-widgets · karger · Feb 27, 2013 · Feb 27, 2013 · Feb 27, 2013 · Feb 27, 2013
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,5 @@
+build/
+src/webapp/api/simile-ajax-api.js
+src/webapp/api/simile-ajax-api-debug.js
+src/webapp/api/simile-ajax-bundle.js
+src/webapp/api/styles/simile-ajax-bundle.css
diff --git a/CHANGES.txt b/CHANGES.txt
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -25,11 +25,4 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Note: JQuery, www.jquery.com is included in this distribution. It is 
- *       covered by its own license:  
- *
- *       Copyright (c) 2008 John Resig (jquery.com)
- *       Dual licensed under the MIT (MIT-LICENSE.txt)
- *       and GPL (GPL-LICENSE.txt) licenses.
  */
diff --git a/README.md b/README.md
@@ -0,0 +1,84 @@
+SimileAjax
+==========
+
+SimileAjax is a [SIMILE](http://simile-widgets.org/) Javascript library used by [Timeline](https://github.com/zepheira/timeline/) and other frameworks.  It is relatively obsolete and has been written out of [Exhibit](https://github.com/zepheira/exhibit3/) entirely.  You should probably choose jQuery or other similar tools to meet your needs, this primarily exists as a compatibility shim until it can be replaced.
+
+Usage
+-----
+
+SimileAjax now comes in two flavors.  You can continue to call `simile-ajax-api.js` (a built file) which is a self-contained bundle that should be backwards compatible with any prior usage of the library.
+
+```html
+<script src="ajax/api/simile-ajax-api.js"></script>
+```
+
+Or you can use your own RequireJS configuration to include SimileAjax in your application.  The RequireJS-aware bundled file is quite different from the older convention and should take advantage of the RequireJS config system for setting things embedded URL parameters or global script variables used to provide.  A sample configuration:
+
+```javascript
+require.config({
+    // ... your other configuration material ...
+    paths: {
+        "simile-ajax": "ajax/api/simile-ajax-bundle"
+    },
+    config: {
+        simile-ajax: {
+            bundle: true, // default
+            prefix: "ajax/api"
+        }
+    }
+});
+require(["simile-ajax"], function(SimileAjax) {
+    if (SimileAjax.loaded) {
+        console.log("SimileAjax is working.");
+    }
+});
+```
+
+Mailing List and Forum
+----------------------
+
+Join the community by joining the [Google Group SIMILE Widgets](http://groups.google.com/group/simile-widgets/).
+
+Licensing
+---------
+
+SimileAjax is open source software and is licensed under the modified BSD license located in the LICENSE.txt file located in the same directory as this README.
+
+This code contains libraries found in `src/webapp/api/lib/` that are covered by their own licenses.
+
+ * [RequireJS](http://requirejs.org/) is covered by the [modified BSD license](https://github.com/jrburke/requirejs/blob/master/LICENSE).
+ * [almond](https://github.com/jrburke/almond) is covered by the [modified BSD license](https://github.com/jrburke/almond/blob/master/LICENSE).
+
+This code contains libraries found in `lib/` and `optimize/` that support development that are covered by their own licenses.
+
+ * [Jetty](http://jetty.codehaus.org/) is covered by the [Apache 2.0 License](http://jetty.codehaus.org/jetty/license.html)
+ * [r.js](http://requirejs.org/docs/optimization.html) is covered by the [modified BSD license](https://github.com/jrburke/r.js/blob/master/LICENSE).
+
+Bundling
+--------
+
+You will need `ant` and `node` in order to build the SimileAjax bundles.  Use `ant bundle-all` to build both the RequireJS-dependent and non-RequireJS dependent bundles (and the CSS bundle).  Use the non-RequireJS output, found in `build/simile-ajax-api.js`, for compatibility with older code that isn't AMD-aware.  Use the RequireJS output, `build/simile-ajax-bundle.js`, for code that is AMD-aware.
+
+Latest Release - 3.0.0
+----------------------
+
+Released August, 2013.
+
+ * Forked source to https://github.com/zepheira/simile-ajax/
+ * Swtiched from self-contained loading to RequireJS 2.1.2.  Do not use SimileAjax to load script files, those methods are now deprecated and will do nothing.
+ * Removed jQuery, it was only included here to use SimileAjax as a namespace.  Use RequireJS to load it into a context instead.
+ * Removed modification of native String class, use StringUtils instead.
+ * Removed all files related to loading and original bundling / compression.
+ * Demoted `bundle` parameter to only control CSS, only useful in development.
+ * Added handling for RequireJS config to ultimately supersede parameters and global variables.
+ * Minor bug fixes.
+ * See https://github.com/zepheira/simile-ajax/compare/2.2.3...3.0.0 for all commits.
+
+Credits
+-------
+
+This software was created by the SIMILE project and originally written by the SIMILE development team (in alphabetical order):
+
+ * [David Huynh](http://davidhuynh.net)
+
+Thanks for your interest.
diff --git a/README.txt b/README.txt
diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
diff --git a/build.xml b/build.xml
@@ -8,36 +8,50 @@
     |
     +-->
 
-<project default="bundle" basedir="." name="SimileAjax">
+<project default="publish-local" basedir="." name="SimileAjax">
 
   <property name="webapp.dir"  value="src/webapp"/>
   <property name="api.dir"     value="${webapp.dir}/api"/>
   <property name="site.dir"    value="${webapp.dir}/site"/>
   <property name="scripts.dir" value="${api.dir}/scripts"/>
   <property name="docs.dir"    value="${site.dir}/docs"/>
   <property name="jsdoc.dir"   value="tools/jsdoc"/>
+  <property name="rjs.dir"     value="optimize"/>
+  <property name="build.dir"   value="build"/>
 
-  <target name="tasks">
-    <taskdef name="jsmin"
-        classname="edu.mit.simile.jsminTask.JSMinTask"
-        classpath="tools/jsmin-task/jsminTask.jar"/>
+  <target name="bundle">
+    <exec dir="." executable="node">
+      <arg line="${rjs.dir}/r.js -o ${rjs.dir}/build.js"/>
+    </exec>
   </target>
-
-  <target name="bundle" depends="tasks">
-    <jsmin output="src/webapp/api/simile-ajax-bundle.js">
-        <fileset dir="src/webapp/api/scripts">
-            <include name="jquery*.js" />
-            <include name="platform.js" />
-        </fileset>
-        <fileset dir="src/webapp/api/scripts">
-            <include name="**/*.js" />
-            <exclude name="signal.js" />
-            <exclude name="jquery*.js" />
-            <exclude name="platform.js" />
-        </fileset>
-    </jsmin>
+
+  <target name="bundle-require">
+    <exec dir="." executable="node">
+      <arg line="${rjs.dir}/r.js -o ${rjs.dir}/build-require.js"/>
+    </exec>
+  </target>
+
+  <target name="bundle-css">
+    <exec dir="." executable="node">
+      <arg line="${rjs.dir}/r.js -o ${rjs.dir}/build-css.js"/>
+    </exec>
   </target>
 
+  <target name="bundle-debug">
+    <exec dir="." executable="node">
+      <arg line="${rjs.dir}/r.js -o ${rjs.dir}/build.js optimize=none out=build/simile-ajax-api-debug.js"/>
+    </exec>
+    <copy file="${build.dir}/simile-ajax-api-debug.js" todir="${api.dir}"/>
+  </target>
+
+  <target name="bundle-all" depends="bundle,bundle-require,bundle-css" />
+
+  <target name="publish-local" depends="bundle-all">
+    <copy file="${build.dir}/simile-ajax-api.js" todir="${api.dir}"/>
+    <copy file="${build.dir}/simile-ajax-bundle.js" todir="${api.dir}"/>
+    <copy file="${build.dir}/simile-ajax-bundle.css" todir="${api.dir}/styles"/>
+  </target>
+
   <target name="docs">
     <java jar="${jsdoc.dir}/app/js.jar" fork="true" dir="${jsdoc.dir}">
         <arg value="app/run.js"/>
@@ -47,4 +61,11 @@
         <arg value="../../src"/>
     </java>
   </target>
+
+  <target name="clean">
+    <delete dir="${build.dir}"/>
+    <delete file="${api.dir}/simile-ajax-api.js"/>
+    <delete file="${api.dir}/simile-ajax-bundle.js"/>
+    <delete file="${api.dir}/styles/simile-ajax-bundle.css"/>
+  </target>
 </project>
diff --git a/lib/.project b/lib/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>jetty</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
diff --git a/lib/jetty-6.0.1.jar b/lib/jetty-6.0.1.jar
diff --git a/lib/jetty-util-6.0.1.jar b/lib/jetty-util-6.0.1.jar
diff --git a/lib/servlet-api-2.5-6.0.1.jar b/lib/servlet-api-2.5-6.0.1.jar
diff --git a/lib/start.jar b/lib/start.jar
diff --git a/optimize/build-css.js b/optimize/build-css.js
@@ -0,0 +1,4 @@
+({
+    "cssIn": "../src/webapp/api/styles/main.css",
+    "out": "../build/simile-ajax-bundle.css"
+})
diff --git a/optimize/build-require.js b/optimize/build-require.js
@@ -0,0 +1,5 @@
+({
+    "baseUrl": "../src/webapp/api/",
+    "name": "simile-ajax",
+    "out": "../build/simile-ajax-bundle.js"
+})
diff --git a/optimize/build.js b/optimize/build.js
@@ -0,0 +1,10 @@
+({
+    "baseUrl": "../src/webapp/api/",
+    "name": "lib/almond",
+    "include": [ "simile-ajax" ],
+    "wrap": {
+        "startFile": "start.frag",
+        "endFile": "end.frag"
+    },
+    "out": "../build/simile-ajax-api.js"
+})
diff --git a/optimize/end.frag b/optimize/end.frag
@@ -0,0 +1,2 @@
+    return require("simile-ajax");
+}));