svn commit: r1243399 [2/7] - in /shindig/trunk: content/samplecontainer/examples/ content/samplecontainer/examples/oauth2/ extras/src/main/javascript/features-extras/firebug-lite/ features/src/main/javascript/features/container.site.gadget/ features/sr...

[li...@apache.org]

Modified: shindig/trunk/features/src/main/javascript/features/container.site/site_holder.js
URL: http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/container.site/site_holder.js?rev=1243399&r1=1243398&r2=1243399&view=diff
==============================================================================
--- shindig/trunk/features/src/main/javascript/features/container.site/site_holder.js (original)
+++ shindig/trunk/features/src/main/javascript/features/container.site/site_holder.js Mon Feb 13 02:59:33 2012
@@ -1,176 +1,176 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- */
-
-/**
- * @fileoverview Abstract base-class for site holders.
- */
-
-/**
- * @param {osapi.container.Site} site The site containing this holder.
- * @param {Element} el The element that this holder manages.
- * @param {string} onLoad The name of an onLoad function to call in window scope
- *          to assign as the onload handler of this holder's iframe.
- *
- * @constructor
- */
-osapi.container.SiteHolder = function(site, el, onLoad) {
-  var undef;
-
-  /**
-   * The site containing this holder.
-   * @type {osapi.container.Site}
-   * @protected
-   */
-  this.site_ = site;
-
-  /**
-   * The element that this holder manages.
-   * @type {Element}
-   * @protected
-   */
-  this.el_ = el;
-
-  /**
-   * On load function for gadget iFrames in window scope
-   * @type {string}
-   * @protected
-   */
-  this.onLoad_ = onLoad;
-
-  /**
-   * Id of the iframe contained within this holder.
-   * @type {string}
-   * @protected
-   */
-  this.iframeId_ = undef;
-
-  /**
-   * @type {object}
-   * @protected
-   */
-  this.renderParams_ = undef;
-
-  this.onConstructed();
-};
-
-/**
- * Callback that occurs after instantiation/construction of any SiteHolder.
- * Override on SiteHolder to provide your specific functionalities for all sites.
- * Override on any subclass of SiteHolder to provide your specific functionalities
- * for that subclass of SiteHolder. Overriding subclass onConstructed will not fire
- * generic SiteHolder onConstructed unless you do so manually.
- */
-osapi.container.SiteHolder.prototype.onConstructed = function() {};
-
-/**
- * @return {Element} The holder's HTML element.
- */
-osapi.container.SiteHolder.prototype.getElement = function() {
-  return this.el_;
-};
-
-/**
- * Gets the id of the iframe contained within this holder.
- * @return {string} the id of the iframe contained within this holder.
- */
-osapi.container.SiteHolder.prototype.getIframeId = function() {
-  return this.iframeId_;
-};
-
-/**
- * Creates the iframe element source for this holder's iframe element.
- * @param {string} url The src url for the iframe.
- * @param {Object.<string, string>=} overrides A bag of iframe attribute overrides.
- * @return {string} The new iframe element source.
- * @protected
- */
-osapi.container.SiteHolder.prototype.createIframeHtml = function(url, overrides) {
-   return osapi.container.util.createIframeHtml(
-     this.createIframeAttributeMap(url, overrides)
-   );
-};
-
-/**
- * Creates the iframe element source for this holder's iframe element.
- * @param {string} url The src url for the iframe.
- * @param {Object=} overrides A bag of iframe attribute overrides.
- * @return {string} The new iframe element source.
- * @protected
- */
-osapi.container.SiteHolder.prototype.createIframeAttributeMap = function(url, overrides) {
-  var undef,
-      renderParams = this.renderParams_ || {},
-      params = {
-        id: this.iframeId_,
-        name: this.iframeId_,
-        src: url,
-        scrolling: 'no',
-        marginwidth: 0,
-        marginheight: 0,
-        frameborder: 0,
-        vspace: 0,
-        hspace: 0,
-        'class': renderParams[osapi.container.RenderParam.CLASS],
-        height: renderParams[osapi.container.RenderParam.HEIGHT],
-        width: renderParams[osapi.container.RenderParam.WIDTH],
-        onload: this.onLoad_ ?
-                ('window.' + this.onLoad_ + "('" + this.getUrl() + "');") : undef
-      };
-   if (overrides) {
-     for(var i in overrides) {
-       params[i] = overrides[i];
-     }
-   }
-   return params;
-};
-
-//Abstract methods
-
-/**
- * Disposes the gadget holder and performs cleanup of any holder state.
- * @abstract
- */
-osapi.container.SiteHolder.prototype.dispose = function() {
-  throw new Error("This method must be implemented by a subclass.");
-};
-
-/**
- * Gets the iFrame element itself.
- * @abstract
- * @return {Element} The iframe element in this holder.
- */
-osapi.container.SiteHolder.prototype.getIframeElement = function() {
-  throw new Error("This method must be implemented by a subclass.");
-};
-
-/**
- * Gets the iFrame element itself.
- * @abstract
- * @return {Element} The iframe element in this holder.
- */
-osapi.container.SiteHolder.prototype.render = function() {
-  throw new Error("This method must be implemented by a subclass.");
-};
-
-/**
- * @abstract
- * @return {string} The URL associated with the holder.
- */
-osapi.container.SiteHolder.prototype.getUrl = function() {
-  throw new Error("This method must be implemented by a subclass.");
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+
+/**
+ * @fileoverview Abstract base-class for site holders.
+ */
+
+/**
+ * @param {osapi.container.Site} site The site containing this holder.
+ * @param {Element} el The element that this holder manages.
+ * @param {string} onLoad The name of an onLoad function to call in window scope
+ *          to assign as the onload handler of this holder's iframe.
+ *
+ * @constructor
+ */
+osapi.container.SiteHolder = function(site, el, onLoad) {
+  var undef;
+
+  /**
+   * The site containing this holder.
+   * @type {osapi.container.Site}
+   * @protected
+   */
+  this.site_ = site;
+
+  /**
+   * The element that this holder manages.
+   * @type {Element}
+   * @protected
+   */
+  this.el_ = el;
+
+  /**
+   * On load function for gadget iFrames in window scope
+   * @type {string}
+   * @protected
+   */
+  this.onLoad_ = onLoad;
+
+  /**
+   * Id of the iframe contained within this holder.
+   * @type {string}
+   * @protected
+   */
+  this.iframeId_ = undef;
+
+  /**
+   * @type {object}
+   * @protected
+   */
+  this.renderParams_ = undef;
+
+  this.onConstructed();
+};
+
+/**
+ * Callback that occurs after instantiation/construction of any SiteHolder.
+ * Override on SiteHolder to provide your specific functionalities for all sites.
+ * Override on any subclass of SiteHolder to provide your specific functionalities
+ * for that subclass of SiteHolder. Overriding subclass onConstructed will not fire
+ * generic SiteHolder onConstructed unless you do so manually.
+ */
+osapi.container.SiteHolder.prototype.onConstructed = function() {};
+
+/**
+ * @return {Element} The holder's HTML element.
+ */
+osapi.container.SiteHolder.prototype.getElement = function() {
+  return this.el_;
+};
+
+/**
+ * Gets the id of the iframe contained within this holder.
+ * @return {string} the id of the iframe contained within this holder.
+ */
+osapi.container.SiteHolder.prototype.getIframeId = function() {
+  return this.iframeId_;
+};
+
+/**
+ * Creates the iframe element source for this holder's iframe element.
+ * @param {string} url The src url for the iframe.
+ * @param {Object.<string, string>=} overrides A bag of iframe attribute overrides.
+ * @return {string} The new iframe element source.
+ * @protected
+ */
+osapi.container.SiteHolder.prototype.createIframeHtml = function(url, overrides) {
+   return osapi.container.util.createIframeHtml(
+     this.createIframeAttributeMap(url, overrides)
+   );
+};
+
+/**
+ * Creates the iframe element source for this holder's iframe element.
+ * @param {string} url The src url for the iframe.
+ * @param {Object=} overrides A bag of iframe attribute overrides.
+ * @return {string} The new iframe element source.
+ * @protected
+ */
+osapi.container.SiteHolder.prototype.createIframeAttributeMap = function(url, overrides) {
+  var undef,
+      renderParams = this.renderParams_ || {},
+      params = {
+        id: this.iframeId_,
+        name: this.iframeId_,
+        src: url,
+        scrolling: 'no',
+        marginwidth: 0,
+        marginheight: 0,
+        frameborder: 0,
+        vspace: 0,
+        hspace: 0,
+        'class': renderParams[osapi.container.RenderParam.CLASS],
+        height: renderParams[osapi.container.RenderParam.HEIGHT],
+        width: renderParams[osapi.container.RenderParam.WIDTH],
+        onload: this.onLoad_ ?
+                ('window.' + this.onLoad_ + "('" + this.getUrl() + "');") : undef
+      };
+   if (overrides) {
+     for(var i in overrides) {
+       params[i] = overrides[i];
+     }
+   }
+   return params;
+};
+
+//Abstract methods
+
+/**
+ * Disposes the gadget holder and performs cleanup of any holder state.
+ * @abstract
+ */
+osapi.container.SiteHolder.prototype.dispose = function() {
+  throw new Error("This method must be implemented by a subclass.");
+};
+
+/**
+ * Gets the iFrame element itself.
+ * @abstract
+ * @return {Element} The iframe element in this holder.
+ */
+osapi.container.SiteHolder.prototype.getIframeElement = function() {
+  throw new Error("This method must be implemented by a subclass.");
+};
+
+/**
+ * Gets the iFrame element itself.
+ * @abstract
+ * @return {Element} The iframe element in this holder.
+ */
+osapi.container.SiteHolder.prototype.render = function() {
+  throw new Error("This method must be implemented by a subclass.");
+};
+
+/**
+ * @abstract
+ * @return {string} The URL associated with the holder.
+ */
+osapi.container.SiteHolder.prototype.getUrl = function() {
+  throw new Error("This method must be implemented by a subclass.");
 };
\ No newline at end of file

Propchange: shindig/trunk/features/src/main/javascript/features/container.site/site_holder.js
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/features/src/main/javascript/features/container.site/site_holder.js
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Mon Feb 13 02:59:33 2012
@@ -1 +1 @@
-text/plain
+text/javascript

Modified: shindig/trunk/features/src/main/javascript/features/proxied-form-post/feature.xml
URL: http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/proxied-form-post/feature.xml?rev=1243399&r1=1243398&r2=1243399&view=diff
==============================================================================
--- shindig/trunk/features/src/main/javascript/features/proxied-form-post/feature.xml (original)
+++ shindig/trunk/features/src/main/javascript/features/proxied-form-post/feature.xml Mon Feb 13 02:59:33 2012
@@ -1,38 +1,38 @@
-<?xml version="1.0"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations under the License.
--->
-<feature>
-<!--
-  Required configuration:
-
-  jsonProxyUrl: A url pointing to the JSON proxy endpoint, used by
-      gadgets.io.makeRequest. All data passed to this end point will be
-      encoded inside of the POST body.
--->
-  <name>proxied-form-post</name>
-  <dependency>core.io</dependency>
-  <dependency>security-token</dependency>
-  <dependency>taming</dependency>
-  <gadget>
-    <script src="post.js"/>
-    <script src="taming.js" caja="1"/>
-    <api>
-      <exports type="js">gadgets.io.proxiedMultipartFormPost</exports>
-    </api>
-  </gadget>
-</feature>
+<?xml version="1.0"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements. See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership. The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License. You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied. See the License for the
+  specific language governing permissions and limitations under the License.
+-->
+<feature>
+<!--
+  Required configuration:
+
+  jsonProxyUrl: A url pointing to the JSON proxy endpoint, used by
+      gadgets.io.makeRequest. All data passed to this end point will be
+      encoded inside of the POST body.
+-->
+  <name>proxied-form-post</name>
+  <dependency>core.io</dependency>
+  <dependency>security-token</dependency>
+  <dependency>taming</dependency>
+  <gadget>
+    <script src="post.js"/>
+    <script src="taming.js" caja="1"/>
+    <api>
+      <exports type="js">gadgets.io.proxiedMultipartFormPost</exports>
+    </api>
+  </gadget>
+</feature>

Propchange: shindig/trunk/features/src/main/javascript/features/proxied-form-post/feature.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/features/src/main/javascript/features/proxied-form-post/feature.xml
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Mon Feb 13 02:59:33 2012
@@ -1 +1 @@
-text/plain
+text/xml

Modified: shindig/trunk/features/src/main/javascript/features/proxied-form-post/post.js
URL: http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/proxied-form-post/post.js?rev=1243399&r1=1243398&r2=1243399&view=diff
==============================================================================
--- shindig/trunk/features/src/main/javascript/features/proxied-form-post/post.js (original)
+++ shindig/trunk/features/src/main/javascript/features/proxied-form-post/post.js Mon Feb 13 02:59:33 2012
@@ -1,204 +1,204 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * @fileoverview This provides the ability to upload a file through the shindig
- *         proxy by posting a form element.
- */
-
-(function () {
-  var config,
-      iframe,
-      work,
-      workQ = [],
-      workTimout;
-
-  /**
-   * @param {Object} configuration Configuration settings.
-   * @private
-   */
-  function init(configuration) {
-    config = configuration['core.io'] || {};
-  }
-  gadgets.config.register('core.io', {
-    "jsonProxyUrl": gadgets.config.NonEmptyStringValidator
-  }, init);
-
-  // IE and FF3.6 only
-  function getIFrame() {
-    if (!iframe) {
-      var container = gadgets.util.createElement('div');
-      container.innerHTML =
-          '<iframe name="os-xhrframe"'
-        + ' style="position:absolute;left:1px;top:1px;height:1px;width:1px;visibility:hidden"'
-        + ' onload="gadgets.io.proxiedMultipartFormPostCB_();"></iframe>';
-      gadgets.util.getBodyElement().appendChild(iframe = container.firstChild);
-    }
-    return iframe;
-  }
-
-  gadgets.io.proxiedMultipartFormPostCB_ = function(event) {
-    if (!work) {
-      return;
-    }
-
-    try {
-      var doc = iframe.contentDocument || iframe.document,
-          data = doc.getElementsByTagName('textarea')[0].value;
-    } catch (e) {}
-    var xhrobj = {
-      readyState: 4,
-      status: data ? 200 : 500,
-      responseText: data ? data : 'Unknown error.'
-    };
-    work.form.setAttribute('action', work.url);
-
-    gadgets.io.processResponse_.call(null, work.url, work.onresult, work.params, xhrobj);
-    work = 0;
-    if (workQ.length) {
-      work = workQ.shift();
-      work.form.submit();
-    }
-  };
-
-  /**
-   * Posts a form through the proxy to a remote service.
-   *
-   * @param {Element} form The form element to be posted. This form element must
-   *           include the action attribute for where you want the data to be posted.
-   * @param {Object} params The request options. Similar to gadgets.io.makeRequest
-   * @param {function} onresult The callback to process the success or failure of
-   *           the post.  Similar to gadgets.io.makeRequest's callback param.
-   * @param {function=} opt_onprogress The callback to call with progress updates.
-   *           This callback may not be called if the browser does not
-   *           support the api. Please note that this only reflects the progress of
-   *           uploading to the shindig proxy and does not account for progress of
-   *           the request from the shindig proxy to the remote server.
-   *           This callback takes 2 arguments:
-   *             {Event} event The progress event.
-   *             {function} abort Function to call to abort the post.
-   * @param {FormData=} opt_formdata The FormData object to post. If provided, this
-   *           object will be used as the data to post the provided form and the form
-   *           element provided should contain the action attribute of where to post
-   *           the form. If ommitted and the browser supports it, a FormData object
-   *           will be created from the provided form element.
-   */
-  gadgets.io.proxiedMultipartFormPost = function (form, params, onresult, onprogress, formdata) {
-    params = params || {};
-
-    var auth, signOwner,
-        signViewer = signOwner = true,
-        st = shindig.auth.getSecurityToken(),
-        url = form.getAttribute('action'),
-        contentType = 'multipart/form-data',
-        headers = params['HEADERS'] || (params['HEADERS'] = {}),
-        urlParams = gadgets.util.getUrlParameters();
-
-    if (params['AUTHORIZATION'] && params['AUTHORIZATION'] !== 'NONE') {
-      auth = params['AUTHORIZATION'].toLowerCase();
-    }
-    // Include owner information?
-    if (typeof params['OWNER_SIGNED'] !== 'undefined') {
-      signOwner = params['OWNER_SIGNED'];
-    }
-    // Include viewer information?
-    if (typeof params['VIEWER_SIGNED'] !== 'undefined') {
-      signViewer = params['VIEWER_SIGNED'];
-    }
-
-    if (!url) {
-      throw new Error('Form missing action attribute.');
-    }
-    if (!st) {
-      throw new Error('Something went wrong, security token is unavailable.');
-    }
-
-    form.setAttribute('enctype', headers['Content-Type'] = contentType);
-
-    // Info that the proxy endpoint needs.
-    var query = {
-      'MPFP': 1, // This will force an alternate route in the makeRequest proxy endpoint
-      'url': url,
-      'httpMethod': 'POST',
-      'headers': gadgets.io.encodeValues(headers, false),
-      'authz': auth || '',
-      'st': st,
-      'contentType': params['CONTENT_TYPE'] || 'TEXT',
-      'signOwner': signOwner,
-      'signViewer': signViewer,
-      // should we bypass gadget spec cache (e.g. to read OAuth provider URLs)
-      'bypassSpecCache': gadgets.util.getUrlParameters()['nocache'] || '',
-      'getFullHeaders': !!params['GET_FULL_HEADERS']
-    };
-
-    delete params['OAUTH_RECEIVED_CALLBACK'];
-    // OAuth goodies
-    if (auth === 'oauth' || auth === 'signed' || auth === 'oauth2') {
-      // Just copy the OAuth parameters into the req to the server
-      for (var opt in params) {
-        if (params.hasOwnProperty(opt)) {
-          if (opt.indexOf('OAUTH_') === 0 || opt === 'code') {
-            query[opt] = params[opt];
-          }
-        }
-      }
-    }
-
-    var proxyUrl = config['jsonProxyUrl'].replace('%host%', document.location.host)
-      + '?' + gadgets.io.encodeValues(query);
-
-    if (window.FormData) {
-      var xhr = new XMLHttpRequest(),
-          data = formdata || new FormData(form);
-
-      if (xhr.upload) {
-        xhr.upload.onprogress = function(event) {
-          onprogress.call(null, event, xhr.abort);
-        };
-      }
-      xhr.onreadystatechange = gadgets.util.makeClosure(
-        null, gadgets.io.processResponse_, url, onresult, params, xhr
-      );
-      xhr.open("POST", proxyUrl);
-      xhr.send(data);
-    } else {
-      // IE and FF3.6 only
-      proxyUrl += '&iframe=1';
-      form.setAttribute('action', proxyUrl);
-      form.setAttribute('target', getIFrame().name);
-      form.setAttribute('method', 'POST');
-
-      // This transport can only support 1 request at a time, so we serialize
-      // them.
-      var job = {
-        form: form,
-        onresult: onresult,
-        params: params,
-        url: url
-      };
-      if (work) {
-        workQ.push(job);
-      } else {
-        work = job;
-        form.submit();
-      }
-    }
-  };
-
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * @fileoverview This provides the ability to upload a file through the shindig
+ *         proxy by posting a form element.
+ */
+
+(function () {
+  var config,
+      iframe,
+      work,
+      workQ = [],
+      workTimout;
+
+  /**
+   * @param {Object} configuration Configuration settings.
+   * @private
+   */
+  function init(configuration) {
+    config = configuration['core.io'] || {};
+  }
+  gadgets.config.register('core.io', {
+    "jsonProxyUrl": gadgets.config.NonEmptyStringValidator
+  }, init);
+
+  // IE and FF3.6 only
+  function getIFrame() {
+    if (!iframe) {
+      var container = gadgets.util.createElement('div');
+      container.innerHTML =
+          '<iframe name="os-xhrframe"'
+        + ' style="position:absolute;left:1px;top:1px;height:1px;width:1px;visibility:hidden"'
+        + ' onload="gadgets.io.proxiedMultipartFormPostCB_();"></iframe>';
+      gadgets.util.getBodyElement().appendChild(iframe = container.firstChild);
+    }
+    return iframe;
+  }
+
+  gadgets.io.proxiedMultipartFormPostCB_ = function(event) {
+    if (!work) {
+      return;
+    }
+
+    try {
+      var doc = iframe.contentDocument || iframe.document,
+          data = doc.getElementsByTagName('textarea')[0].value;
+    } catch (e) {}
+    var xhrobj = {
+      readyState: 4,
+      status: data ? 200 : 500,
+      responseText: data ? data : 'Unknown error.'
+    };
+    work.form.setAttribute('action', work.url);
+
+    gadgets.io.processResponse_.call(null, work.url, work.onresult, work.params, xhrobj);
+    work = 0;
+    if (workQ.length) {
+      work = workQ.shift();
+      work.form.submit();
+    }
+  };
+
+  /**
+   * Posts a form through the proxy to a remote service.
+   *
+   * @param {Element} form The form element to be posted. This form element must
+   *           include the action attribute for where you want the data to be posted.
+   * @param {Object} params The request options. Similar to gadgets.io.makeRequest
+   * @param {function} onresult The callback to process the success or failure of
+   *           the post.  Similar to gadgets.io.makeRequest's callback param.
+   * @param {function=} opt_onprogress The callback to call with progress updates.
+   *           This callback may not be called if the browser does not
+   *           support the api. Please note that this only reflects the progress of
+   *           uploading to the shindig proxy and does not account for progress of
+   *           the request from the shindig proxy to the remote server.
+   *           This callback takes 2 arguments:
+   *             {Event} event The progress event.
+   *             {function} abort Function to call to abort the post.
+   * @param {FormData=} opt_formdata The FormData object to post. If provided, this
+   *           object will be used as the data to post the provided form and the form
+   *           element provided should contain the action attribute of where to post
+   *           the form. If ommitted and the browser supports it, a FormData object
+   *           will be created from the provided form element.
+   */
+  gadgets.io.proxiedMultipartFormPost = function (form, params, onresult, onprogress, formdata) {
+    params = params || {};
+
+    var auth, signOwner,
+        signViewer = signOwner = true,
+        st = shindig.auth.getSecurityToken(),
+        url = form.getAttribute('action'),
+        contentType = 'multipart/form-data',
+        headers = params['HEADERS'] || (params['HEADERS'] = {}),
+        urlParams = gadgets.util.getUrlParameters();
+
+    if (params['AUTHORIZATION'] && params['AUTHORIZATION'] !== 'NONE') {
+      auth = params['AUTHORIZATION'].toLowerCase();
+    }
+    // Include owner information?
+    if (typeof params['OWNER_SIGNED'] !== 'undefined') {
+      signOwner = params['OWNER_SIGNED'];
+    }
+    // Include viewer information?
+    if (typeof params['VIEWER_SIGNED'] !== 'undefined') {
+      signViewer = params['VIEWER_SIGNED'];
+    }
+
+    if (!url) {
+      throw new Error('Form missing action attribute.');
+    }
+    if (!st) {
+      throw new Error('Something went wrong, security token is unavailable.');
+    }
+
+    form.setAttribute('enctype', headers['Content-Type'] = contentType);
+
+    // Info that the proxy endpoint needs.
+    var query = {
+      'MPFP': 1, // This will force an alternate route in the makeRequest proxy endpoint
+      'url': url,
+      'httpMethod': 'POST',
+      'headers': gadgets.io.encodeValues(headers, false),
+      'authz': auth || '',
+      'st': st,
+      'contentType': params['CONTENT_TYPE'] || 'TEXT',
+      'signOwner': signOwner,
+      'signViewer': signViewer,
+      // should we bypass gadget spec cache (e.g. to read OAuth provider URLs)
+      'bypassSpecCache': gadgets.util.getUrlParameters()['nocache'] || '',
+      'getFullHeaders': !!params['GET_FULL_HEADERS']
+    };
+
+    delete params['OAUTH_RECEIVED_CALLBACK'];
+    // OAuth goodies
+    if (auth === 'oauth' || auth === 'signed' || auth === 'oauth2') {
+      // Just copy the OAuth parameters into the req to the server
+      for (var opt in params) {
+        if (params.hasOwnProperty(opt)) {
+          if (opt.indexOf('OAUTH_') === 0 || opt === 'code') {
+            query[opt] = params[opt];
+          }
+        }
+      }
+    }
+
+    var proxyUrl = config['jsonProxyUrl'].replace('%host%', document.location.host)
+      + '?' + gadgets.io.encodeValues(query);
+
+    if (window.FormData) {
+      var xhr = new XMLHttpRequest(),
+          data = formdata || new FormData(form);
+
+      if (xhr.upload) {
+        xhr.upload.onprogress = function(event) {
+          onprogress.call(null, event, xhr.abort);
+        };
+      }
+      xhr.onreadystatechange = gadgets.util.makeClosure(
+        null, gadgets.io.processResponse_, url, onresult, params, xhr
+      );
+      xhr.open("POST", proxyUrl);
+      xhr.send(data);
+    } else {
+      // IE and FF3.6 only
+      proxyUrl += '&iframe=1';
+      form.setAttribute('action', proxyUrl);
+      form.setAttribute('target', getIFrame().name);
+      form.setAttribute('method', 'POST');
+
+      // This transport can only support 1 request at a time, so we serialize
+      // them.
+      var job = {
+        form: form,
+        onresult: onresult,
+        params: params,
+        url: url
+      };
+      if (work) {
+        workQ.push(job);
+      } else {
+        work = job;
+        form.submit();
+      }
+    }
+  };
+
 })();
\ No newline at end of file

Propchange: shindig/trunk/features/src/main/javascript/features/proxied-form-post/post.js
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/features/src/main/javascript/features/proxied-form-post/post.js
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Mon Feb 13 02:59:33 2012
@@ -1 +1 @@
-text/plain
+text/javascript

Propchange: shindig/trunk/features/src/main/javascript/features/proxied-form-post/taming.js
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/features/src/main/javascript/features/proxied-form-post/taming.js
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Mon Feb 13 02:59:33 2012
@@ -1 +1 @@
-text/plain
+text/javascript

Propchange: shindig/trunk/features/src/main/javascript/features/shared-script-frame/feature.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/features/src/main/javascript/features/shared-script-frame/feature.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: shindig/trunk/features/src/main/javascript/features/shared-script-frame/shared-script-frame-container.js
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/features/src/main/javascript/features/shared-script-frame/shared-script-frame-container.js
------------------------------------------------------------------------------
    svn:mime-type = text/javascript

Propchange: shindig/trunk/features/src/main/javascript/features/shared-script-frame/shared-script-frame.js
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/features/src/main/javascript/features/shared-script-frame/shared-script-frame.js
------------------------------------------------------------------------------
    svn:mime-type = text/javascript

Propchange: shindig/trunk/features/src/main/javascript/features/shared-script-frame/taming.js
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/features/src/main/javascript/features/shared-script-frame/taming.js
------------------------------------------------------------------------------
    svn:mime-type = text/javascript

Modified: shindig/trunk/java/common/src/test/resources/classpath-accessible-test-file.txt
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/test/resources/classpath-accessible-test-file.txt?rev=1243399&r1=1243398&r2=1243399&view=diff
==============================================================================
--- shindig/trunk/java/common/src/test/resources/classpath-accessible-test-file.txt (original)
+++ shindig/trunk/java/common/src/test/resources/classpath-accessible-test-file.txt Mon Feb 13 02:59:33 2012
@@ -1,18 +1,18 @@
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+
 classpath-accessible-test-file.txt
\ No newline at end of file

Propchange: shindig/trunk/java/common/src/test/resources/classpath-accessible-test-file.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/common/src/test/resources/classpath-accessible-test-file.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/AbstractLockedDomainService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/admin/BasicGadgetAdminStore.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/admin/ContainerAdminData.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/admin/FeatureAdminData.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/admin/GadgetAdminData.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/admin/GadgetAdminModule.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/admin/GadgetAdminStore.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/admin/ServerAdminData.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthCallbackStateToken.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/BasicOAuth2Accessor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/BasicOAuth2Message.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/BasicOAuth2Request.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/BasicOAuth2RequestParameterGenerator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/BasicOAuth2Store.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/GadgetOAuth2TokenStore.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2Accessor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2Arguments.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2Error.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2FetcherConfig.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2GadgetContext.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2Message.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2MessageModule.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2Module.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2Request.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2RequestException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2RequestParameterGenerator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2ResponseParams.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2Store.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2Token.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2Utils.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/AuthorizationEndpointResponseHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/BasicAuthenticationHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/BearerTokenHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/ClientAuthenticationHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/ClientCredentialsGrantTypeHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/CodeAuthorizationResponseHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/CodeGrantTypeHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/GrantRequestHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/MacTokenHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/OAuth2HandlerError.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/OAuth2HandlerModule.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/ResourceRequestHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/StandardAuthenticationHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/TokenAuthorizationResponseHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/TokenEndpointResponseHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/logger/FilteredLogger.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2Cache.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2CacheException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2Client.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2Encrypter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2EncryptionException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2PersistenceException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2Persister.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2TokenPersistence.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/sample/InMemoryCache.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/sample/JSONOAuth2Persister.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/sample/NoOpEncrypter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/sample/OAuth2GadgetBinding.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/sample/OAuth2PersistenceModule.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/sample/OAuth2Provider.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ModuleIdManager.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ModuleIdManager.java?rev=1243399&r1=1243398&r2=1243399&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ModuleIdManager.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ModuleIdManager.java Mon Feb 13 02:59:33 2012
@@ -1,57 +1,57 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.shindig.gadgets.servlet;
-
-import org.apache.shindig.common.uri.Uri;
-import org.apache.shindig.gadgets.servlet.GadgetsHandlerApi.AuthContext;
-
-import com.google.inject.ImplementedBy;
-
-@ImplementedBy (ModuleIdManagerImpl.class)
-public interface ModuleIdManager {
-  /**
-   * Checks to make sure that the proposed moduleId for this gadget is valid.
-   * This data is not 100% trustworthy becaue we can't extract it from a
-   * token, so we validate it here, usually against the AuthContext viewerId,
-   * gadgetUrl, moduleId combination.
-   *
-   * If the moduleId is invalid the implementation may return:
-   *   null (in which case a null security token will be returned to the container)
-   *   0 (Default value for non-persisted gadgets)
-   *   A newly generated moduleId
-   *
-   * If the supplied moduleId is valid, this function is expected to return the
-   * value of the moduleId param.
-   *
-   * @param gadgetUri The location of the gadget xml to validate the token for
-   * @param containerAuthContext The Auth context.  Basically, the container security token.
-   * @param moduleId The moduleId sent by the container page.
-   * @return moduleId.
-   */
-  public Long validate(Uri gadgetUri, AuthContext containerAuthContext, Long moduleId);
-
-  /**
-   * Generate and persist a new moduleId for the given gadgetUri and container auth context.
-   *
-   * @param gadgetUri The location of the gadget xml to generate the token for
-   * @param containerAuthContext The Auth context.  Basically, the container security token.
-   * @return moduleId.
-   */
-  public Long generate(Uri gadgetUri, AuthContext containerAuthContext);
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.shindig.gadgets.servlet;
+
+import org.apache.shindig.common.uri.Uri;
+import org.apache.shindig.gadgets.servlet.GadgetsHandlerApi.AuthContext;
+
+import com.google.inject.ImplementedBy;
+
+@ImplementedBy (ModuleIdManagerImpl.class)
+public interface ModuleIdManager {
+  /**
+   * Checks to make sure that the proposed moduleId for this gadget is valid.
+   * This data is not 100% trustworthy becaue we can't extract it from a
+   * token, so we validate it here, usually against the AuthContext viewerId,
+   * gadgetUrl, moduleId combination.
+   *
+   * If the moduleId is invalid the implementation may return:
+   *   null (in which case a null security token will be returned to the container)
+   *   0 (Default value for non-persisted gadgets)
+   *   A newly generated moduleId
+   *
+   * If the supplied moduleId is valid, this function is expected to return the
+   * value of the moduleId param.
+   *
+   * @param gadgetUri The location of the gadget xml to validate the token for
+   * @param containerAuthContext The Auth context.  Basically, the container security token.
+   * @param moduleId The moduleId sent by the container page.
+   * @return moduleId.
+   */
+  public Long validate(Uri gadgetUri, AuthContext containerAuthContext, Long moduleId);
+
+  /**
+   * Generate and persist a new moduleId for the given gadgetUri and container auth context.
+   *
+   * @param gadgetUri The location of the gadget xml to generate the token for
+   * @param containerAuthContext The Auth context.  Basically, the container security token.
+   * @return moduleId.
+   */
+  public Long generate(Uri gadgetUri, AuthContext containerAuthContext);
 }
\ No newline at end of file

Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ModuleIdManager.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ModuleIdManagerImpl.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ModuleIdManagerImpl.java?rev=1243399&r1=1243398&r2=1243399&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ModuleIdManagerImpl.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ModuleIdManagerImpl.java Mon Feb 13 02:59:33 2012
@@ -1,36 +1,36 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.shindig.gadgets.servlet;
-
-import org.apache.shindig.common.uri.Uri;
-import org.apache.shindig.gadgets.servlet.GadgetsHandlerApi.AuthContext;
-
-/**
- * Override this class to provide meaningful moduleId validation and generation for gadgets.
- */
-public class ModuleIdManagerImpl implements ModuleIdManager {
-  public Long validate(Uri gadgetUri, AuthContext containerAuthContext, Long moduleId) {
-    return 0L;
-  }
-
-  public Long generate(Uri gadgetUri, AuthContext containerAuthContext) {
-    return 0L;
-  }
-}
-
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.shindig.gadgets.servlet;
+
+import org.apache.shindig.common.uri.Uri;
+import org.apache.shindig.gadgets.servlet.GadgetsHandlerApi.AuthContext;
+
+/**
+ * Override this class to provide meaningful moduleId validation and generation for gadgets.
+ */
+public class ModuleIdManagerImpl implements ModuleIdManager {
+  public Long validate(Uri gadgetUri, AuthContext containerAuthContext, Long moduleId) {
+    return 0L;
+  }
+
+  public Long generate(Uri gadgetUri, AuthContext containerAuthContext) {
+    return 0L;
+  }
+}
+

Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ModuleIdManagerImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/OAuth2CallbackServlet.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/BaseOAuthService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/ExternalServices.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/OAuth2Service.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/OAuth2Spec.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: shindig/trunk/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_en_US.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/main/resources/org/apache/shindig/gadgets/oauth2/resource_en_US.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/admin/BasicGadgetAdminStoreTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/admin/ContainerAdminDataTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/admin/FeatureAdminDataTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/admin/GadgetAdminDataTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/admin/ServerAdminDataTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/GadgetOAuth2TokenStoreTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/MockUtils.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/OAuth2ArgumentsTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/OAuth2ErrorTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/OAuth2FetcherConfigTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/OAuth2GadgetContextTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/OAuth2MessageModuleTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/OAuth2ModuleTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/OAuth2RequestExceptionTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/OAuth2ResponseParamsTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/handler/BasicAuthenticationHandlerTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/handler/BearerTokenHandlerTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/handler/ClientCredentialsGrantTypeHandlerTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/handler/CodeAuthorizationResponseHandlerTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/handler/CodeGrantTypeHandlerTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/handler/MacTokenHandlerTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/handler/OAuth2HandlerErrorTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/handler/OAuth2HandlerModuleTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/handler/StandardAuthenticationHandlerTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/handler/TokenAuthorizationResponseHandlerTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/logger/FilteredLoggerTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2CacheExceptionTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2ClientTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2EncryptionExceptionTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2PersistenceExceptionTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2TokenPersistenceTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/persistence/sample/InMemoryCacheTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/persistence/sample/JSONOAuth2PersisterTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/persistence/sample/NoOpEncrypterTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/persistence/sample/OAuth2GadgetBindingTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/persistence/sample/OAuth2PersistenceModuleTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth2/persistence/sample/OAuth2ProviderTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/sample-container/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Feb 13 02:59:33 2012
@@ -0,0 +1,22 @@
+target
+work
+dojo
+*.iws
+*.ipr
+*.iml
+derby.log
+maven.log
+build.xml
+build-dependency.xml
+velocity.log*
+junit*.properties
+surefire*.properties
+.project
+.classpath
+.settings
+.deployables
+.wtpmodules
+.externalToolBuilders
+create.sql
+drop.sql
+derby.log

Modified: shindig/trunk/java/sample-container/pom.xml
URL: http://svn.apache.org/viewvc/shindig/trunk/java/sample-container/pom.xml?rev=1243399&r1=1243398&r2=1243399&view=diff
==============================================================================
--- shindig/trunk/java/sample-container/pom.xml (original)
+++ shindig/trunk/java/sample-container/pom.xml Mon Feb 13 02:59:33 2012
@@ -1,80 +1,80 @@
-<?xml version="1.0" encoding="UTF-8"?><!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.shindig</groupId>
-    <artifactId>shindig-project</artifactId>
-    <version>3.0.0-SNAPSHOT</version>
-    <relativePath>../../pom.xml</relativePath>
-  </parent>
-
-  <artifactId>shindig-sample-container</artifactId>
-  <packaging>jar</packaging>
-
-  <name>Apache Shindig Sample Container</name>
-  <description>Default Shindig Sample Container module</description>
-
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/shindig/trunk/java/sample-container</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/shindig/trunk/java/sample-container</developerConnection>
-    <url>http://svn.apache.org/viewvc/shindig/trunk/java/server</url>
-  </scm>
-
-  <dependencies>
-    <!-- project dependencies -->
-    <dependency>
-      <groupId>org.apache.shindig</groupId>
-      <artifactId>shindig-common</artifactId>
-      <classifier>${shindig.jdk.classifier}</classifier>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.shindig</groupId>
-      <artifactId>shindig-gadgets</artifactId>
-      <classifier>${shindig.jdk.classifier}</classifier>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.shindig</groupId>
-      <artifactId>shindig-social-api</artifactId>
-      <classifier>${shindig.jdk.classifier}</classifier>
-      <version>${project.version}</version>
-    </dependency>
-
-    <!-- external dependencies -->
-    <dependency>
-      <groupId>com.google.inject</groupId>
-      <artifactId>guice</artifactId>
-    </dependency>    
-    <dependency>
-      <groupId>com.google.inject.extensions</groupId>
-      <artifactId>guice-multibindings</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.json</groupId>
-      <artifactId>json</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.shiro</groupId>
-      <artifactId>shiro-web</artifactId>
-    </dependency>
-  </dependencies>
-</project>
+<?xml version="1.0" encoding="UTF-8"?><!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.shindig</groupId>
+    <artifactId>shindig-project</artifactId>
+    <version>3.0.0-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
+  </parent>
+
+  <artifactId>shindig-sample-container</artifactId>
+  <packaging>jar</packaging>
+
+  <name>Apache Shindig Sample Container</name>
+  <description>Default Shindig Sample Container module</description>
+
+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/shindig/trunk/java/sample-container</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/shindig/trunk/java/sample-container</developerConnection>
+    <url>http://svn.apache.org/viewvc/shindig/trunk/java/server</url>
+  </scm>
+
+  <dependencies>
+    <!-- project dependencies -->
+    <dependency>
+      <groupId>org.apache.shindig</groupId>
+      <artifactId>shindig-common</artifactId>
+      <classifier>${shindig.jdk.classifier}</classifier>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.shindig</groupId>
+      <artifactId>shindig-gadgets</artifactId>
+      <classifier>${shindig.jdk.classifier}</classifier>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.shindig</groupId>
+      <artifactId>shindig-social-api</artifactId>
+      <classifier>${shindig.jdk.classifier}</classifier>
+      <version>${project.version}</version>
+    </dependency>
+
+    <!-- external dependencies -->
+    <dependency>
+      <groupId>com.google.inject</groupId>
+      <artifactId>guice</artifactId>
+    </dependency>    
+    <dependency>
+      <groupId>com.google.inject.extensions</groupId>
+      <artifactId>guice-multibindings</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.json</groupId>
+      <artifactId>json</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.shiro</groupId>
+      <artifactId>shiro-web</artifactId>
+    </dependency>
+  </dependencies>
+</project>

Propchange: shindig/trunk/java/sample-container/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/sample-container/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: shindig/trunk/java/server-dependencies/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Feb 13 02:59:33 2012
@@ -0,0 +1,22 @@
+target
+work
+dojo
+*.iws
+*.ipr
+*.iml
+derby.log
+maven.log
+build.xml
+build-dependency.xml
+velocity.log*
+junit*.properties
+surefire*.properties
+.project
+.classpath
+.settings
+.deployables
+.wtpmodules
+.externalToolBuilders
+create.sql
+drop.sql
+derby.log

Modified: shindig/trunk/java/server-dependencies/pom.xml
URL: http://svn.apache.org/viewvc/shindig/trunk/java/server-dependencies/pom.xml?rev=1243399&r1=1243398&r2=1243399&view=diff
==============================================================================
--- shindig/trunk/java/server-dependencies/pom.xml (original)
+++ shindig/trunk/java/server-dependencies/pom.xml Mon Feb 13 02:59:33 2012
@@ -1,91 +1,91 @@
-<?xml version="1.0" encoding="UTF-8"?><!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.shindig</groupId>
-    <artifactId>shindig-project</artifactId>
-    <version>3.0.0-SNAPSHOT</version>
-    <relativePath>../../pom.xml</relativePath>
-  </parent>
-
-  <artifactId>shindig-server-dependencies</artifactId>
-  <packaging>pom</packaging>
-
-  <name>Apache Shindig Web App Dependencies</name>
-  <description>Default server war dependencies</description>
-
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/shindig/trunk/java/server-dependencies</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/shindig/trunk/java/server-dependencies</developerConnection>
-    <url>http://svn.apache.org/viewvc/shindig/trunk/java/server-dependencies</url>
-  </scm>
-
-  <dependencies>
-    <!-- project dependencies -->
-    <dependency>
-      <groupId>org.apache.shindig</groupId>
-      <artifactId>shindig-common</artifactId>
-      <classifier>${shindig.jdk.classifier}</classifier>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.shindig</groupId>
-      <artifactId>shindig-gadgets</artifactId>
-      <classifier>${shindig.jdk.classifier}</classifier>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.shindig</groupId>
-      <artifactId>shindig-social-api</artifactId>
-      <classifier>${shindig.jdk.classifier}</classifier>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.shindig</groupId>
-      <artifactId>shindig-features</artifactId>
-      <classifier>${shindig.jdk.classifier}</classifier>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.shindig</groupId>
-      <artifactId>shindig-extras</artifactId>
-      <classifier>${shindig.jdk.classifier}</classifier>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.shindig</groupId>
-      <artifactId>shindig-sample-container</artifactId>
-      <classifier>${shindig.jdk.classifier}</classifier>
-      <version>${project.version}</version>
-    </dependency>
-
-    <!-- external dependencies -->
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>jstl</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-jdk14</artifactId>
-    </dependency>
-    
-  </dependencies>
-</project>
+<?xml version="1.0" encoding="UTF-8"?><!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.shindig</groupId>
+    <artifactId>shindig-project</artifactId>
+    <version>3.0.0-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
+  </parent>
+
+  <artifactId>shindig-server-dependencies</artifactId>
+  <packaging>pom</packaging>
+
+  <name>Apache Shindig Web App Dependencies</name>
+  <description>Default server war dependencies</description>
+
+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/shindig/trunk/java/server-dependencies</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/shindig/trunk/java/server-dependencies</developerConnection>
+    <url>http://svn.apache.org/viewvc/shindig/trunk/java/server-dependencies</url>
+  </scm>
+
+  <dependencies>
+    <!-- project dependencies -->
+    <dependency>
+      <groupId>org.apache.shindig</groupId>
+      <artifactId>shindig-common</artifactId>
+      <classifier>${shindig.jdk.classifier}</classifier>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.shindig</groupId>
+      <artifactId>shindig-gadgets</artifactId>
+      <classifier>${shindig.jdk.classifier}</classifier>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.shindig</groupId>
+      <artifactId>shindig-social-api</artifactId>
+      <classifier>${shindig.jdk.classifier}</classifier>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.shindig</groupId>
+      <artifactId>shindig-features</artifactId>
+      <classifier>${shindig.jdk.classifier}</classifier>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.shindig</groupId>
+      <artifactId>shindig-extras</artifactId>
+      <classifier>${shindig.jdk.classifier}</classifier>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.shindig</groupId>
+      <artifactId>shindig-sample-container</artifactId>
+      <classifier>${shindig.jdk.classifier}</classifier>
+      <version>${project.version}</version>
+    </dependency>
+
+    <!-- external dependencies -->
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>jstl</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-jdk14</artifactId>
+    </dependency>
+    
+  </dependencies>
+</project>

Propchange: shindig/trunk/java/server-dependencies/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shindig/trunk/java/server-dependencies/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: shindig/trunk/java/server-resources/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Feb 13 02:59:33 2012
@@ -0,0 +1,22 @@
+target
+work
+dojo
+*.iws
+*.ipr
+*.iml
+derby.log
+maven.log
+build.xml
+build-dependency.xml
+velocity.log*
+junit*.properties
+surefire*.properties
+.project
+.classpath
+.settings
+.deployables
+.wtpmodules
+.externalToolBuilders
+create.sql
+drop.sql
+derby.log