Author: lindner
Date: Wed Sep 8 11:42:50 2010
New Revision: 994996
URL: http://svn.apache.org/viewvc?rev=994996&view=rev
Log:
merge latest from trunk, revert back to 2.0.0 for redo
Modified:
shindig/branches/2.0.x/ (props changed)
shindig/branches/2.0.x/assembly/pom.xml
shindig/branches/2.0.x/content/container/gadgets.css
shindig/branches/2.0.x/extras/pom.xml
shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/core/model/ActionLinkImpl.java
shindig/branches/2.0.x/features/pom.xml
shindig/branches/2.0.x/features/src/main/javascript/features/core.config/config.js
shindig/branches/2.0.x/features/src/main/javascript/features/core.io/io.js
shindig/branches/2.0.x/features/src/main/javascript/features/core.json/json.js
shindig/branches/2.0.x/features/src/main/javascript/features/osapi/batch.js
shindig/branches/2.0.x/features/src/main/javascript/features/osapi/osapi.js
shindig/branches/2.0.x/features/src/main/javascript/features/rpc/fe.transport.js
shindig/branches/2.0.x/features/src/main/javascript/features/rpc/ifpc.transport.js
shindig/branches/2.0.x/features/src/main/javascript/features/rpc/rpc.js
shindig/branches/2.0.x/features/src/main/javascript/features/shindig.uri.ext/util.js
shindig/branches/2.0.x/java/common/conf/shindig.properties
shindig/branches/2.0.x/java/common/pom.xml
shindig/branches/2.0.x/java/gadgets/pom.xml
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleConcatContentRewriter.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleTagExtractorContentRewriter.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BMPOptimizer.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ConcatProxyServlet.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingServlet.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HtmlAccelServlet.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/MakeRequestServlet.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/OAuthCallbackServlet.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyServlet.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/RpcServlet.java
shindig/branches/2.0.x/java/samples/pom.xml
shindig/branches/2.0.x/java/server/pom.xml
shindig/branches/2.0.x/java/social-api/pom.xml
shindig/branches/2.0.x/pom.xml
Propchange: shindig/branches/2.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 8 11:42:50 2010
@@ -1 +1 @@
-/shindig/trunk:983949-993302
+/shindig/trunk:983949-994995
Modified: shindig/branches/2.0.x/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/shindig/branches/2.0.x/assembly/pom.xml?rev=994996&r1=994995&r2=994996&view=diff
==============================================================================
--- shindig/branches/2.0.x/assembly/pom.xml (original)
+++ shindig/branches/2.0.x/assembly/pom.xml Wed Sep 8 11:42:50 2010
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shindig</groupId>
<artifactId>shindig-project</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: shindig/branches/2.0.x/content/container/gadgets.css
URL:
http://svn.apache.org/viewvc/shindig/branches/2.0.x/content/container/gadgets.css?rev=994996&r1=994995&r2=994996&view=diff
==============================================================================
--- shindig/branches/2.0.x/content/container/gadgets.css (original)
+++ shindig/branches/2.0.x/content/container/gadgets.css Wed Sep 8 11:42:50
2010
@@ -60,7 +60,7 @@
.gadgets-log-entry {
}
-// Used to style messages produced during rewriting by CajaContentRewriter
+/* Used to style messages produced during rewriting by CajaContentRewriter */
.gadgets-messages {
}
Modified: shindig/branches/2.0.x/extras/pom.xml
URL:
http://svn.apache.org/viewvc/shindig/branches/2.0.x/extras/pom.xml?rev=994996&r1=994995&r2=994996&view=diff
==============================================================================
--- shindig/branches/2.0.x/extras/pom.xml (original)
+++ shindig/branches/2.0.x/extras/pom.xml Wed Sep 8 11:42:50 2010
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shindig</groupId>
<artifactId>shindig-project</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified:
shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/core/model/ActionLinkImpl.java
URL:
http://svn.apache.org/viewvc/shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/core/model/ActionLinkImpl.java?rev=994996&r1=994995&r2=994996&view=diff
==============================================================================
---
shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/core/model/ActionLinkImpl.java
(original)
+++
shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/core/model/ActionLinkImpl.java
Wed Sep 8 11:42:50 2010
@@ -26,9 +26,9 @@ public class ActionLinkImpl implements A
private String target;
private String caption;
-
+
/**
- * Construct an empty ActionLinkImpl
+ * Construct an empty ActionLinkImpl.
*/
public ActionLinkImpl() {
this.target = null;
Modified: shindig/branches/2.0.x/features/pom.xml
URL:
http://svn.apache.org/viewvc/shindig/branches/2.0.x/features/pom.xml?rev=994996&r1=994995&r2=994996&view=diff
==============================================================================
--- shindig/branches/2.0.x/features/pom.xml (original)
+++ shindig/branches/2.0.x/features/pom.xml Wed Sep 8 11:42:50 2010
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.shindig</groupId>
<artifactId>shindig-project</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified:
shindig/branches/2.0.x/features/src/main/javascript/features/core.config/config.js
URL:
http://svn.apache.org/viewvc/shindig/branches/2.0.x/features/src/main/javascript/features/core.config/config.js?rev=994996&r1=994995&r2=994996&view=diff
==============================================================================
---
shindig/branches/2.0.x/features/src/main/javascript/features/core.config/config.js
(original)
+++
shindig/branches/2.0.x/features/src/main/javascript/features/core.config/config.js
Wed Sep 8 11:42:50 2010
@@ -184,6 +184,7 @@ gadgets.config = function() {
return true;
}
}
+ return false;
};
},
Modified:
shindig/branches/2.0.x/features/src/main/javascript/features/core.io/io.js
URL:
http://svn.apache.org/viewvc/shindig/branches/2.0.x/features/src/main/javascript/features/core.io/io.js?rev=994996&r1=994995&r2=994996&view=diff
==============================================================================
--- shindig/branches/2.0.x/features/src/main/javascript/features/core.io/io.js
(original)
+++ shindig/branches/2.0.x/features/src/main/javascript/features/core.io/io.js
Wed Sep 8 11:42:50 2010
@@ -51,16 +51,18 @@ gadgets.io = function() {
shindig.xhrwrapper &&
shindig.xhrwrapper.createXHR) {
return shindig.xhrwrapper.createXHR();
- } else if (window.ActiveXObject) {
+ } else if (typeof ActiveXObject != 'undefined') {
x = new ActiveXObject("Msxml2.XMLHTTP");
if (!x) {
x = new ActiveXObject("Microsoft.XMLHTTP");
}
return x;
}
- else if (window.XMLHttpRequest) {
+ // The second construct is for the benefit of jsunit...
+ else if (typeof XMLHttpRequest != 'undefined' || window.XMLHttpRequest) {
return new window.XMLHttpRequest();
}
+ else throw("no xhr available");
}
/**
@@ -196,7 +198,7 @@ gadgets.io = function() {
break;
case "DOM":
var dom;
- if (window.ActiveXObject) {
+ if (typeof ActiveXObject != 'undefined') {
dom = new ActiveXObject("Microsoft.XMLDOM");
dom.async = false;
dom.validateOnParse = false;
Modified:
shindig/branches/2.0.x/features/src/main/javascript/features/core.json/json.js
URL:
http://svn.apache.org/viewvc/shindig/branches/2.0.x/features/src/main/javascript/features/core.json/json.js?rev=994996&r1=994995&r2=994996&view=diff
==============================================================================
---
shindig/branches/2.0.x/features/src/main/javascript/features/core.json/json.js
(original)
+++
shindig/branches/2.0.x/features/src/main/javascript/features/core.json/json.js
Wed Sep 8 11:42:50 2010
@@ -175,6 +175,7 @@ if (window.JSON && window.JSON.parse &&
// Join all of the member texts together and wrap them in braces.
return '{' + a.join(',') + '}';
}
+ return "undefined";
}
return {
Modified:
shindig/branches/2.0.x/features/src/main/javascript/features/osapi/batch.js
URL:
http://svn.apache.org/viewvc/shindig/branches/2.0.x/features/src/main/javascript/features/osapi/batch.js?rev=994996&r1=994995&r2=994996&view=diff
==============================================================================
--- shindig/branches/2.0.x/features/src/main/javascript/features/osapi/batch.js
(original)
+++ shindig/branches/2.0.x/features/src/main/javascript/features/osapi/batch.js
Wed Sep 8 11:42:50 2010
@@ -52,8 +52,8 @@
var add = function(key, request) {
if (request && key) {
keyedRequests.push({"key" : key, "request" : request});
- return that;
}
+ return that;
};
/**
Modified:
shindig/branches/2.0.x/features/src/main/javascript/features/osapi/osapi.js
URL:
http://svn.apache.org/viewvc/shindig/branches/2.0.x/features/src/main/javascript/features/osapi/osapi.js?rev=994996&r1=994995&r2=994996&view=diff
==============================================================================
--- shindig/branches/2.0.x/features/src/main/javascript/features/osapi/osapi.js
(original)
+++ shindig/branches/2.0.x/features/src/main/javascript/features/osapi/osapi.js
Wed Sep 8 11:42:50 2010
@@ -23,6 +23,7 @@
* @param {Object.<string,Object>} transport The transport used to execute a
call for the method
*/
osapi._registerMethod = function (method, transport) {
+ var has___ = typeof ___ !== 'undefined';
// Skip registration of local newBatch implementation.
if (method == "newBatch") {
@@ -42,8 +43,8 @@
var batch = osapi.newBatch();
var boundCall = {};
boundCall.execute = function(callback) {
- var feralCallback = window.___ ? ___.untame(callback) : callback;
- var that = window.___ ? ___.USELESS : this;
+ var feralCallback = has___ ? ___.untame(callback) : callback;
+ var that = has___ ? ___.USELESS : this;
batch.add(method, this);
batch.execute(function(batchResult) {
if (batchResult.error) {
@@ -53,7 +54,7 @@
}
});
}
- if (window.___) {
+ if (has___) {
___.markInnocent(boundCall.execute, 'execute');
}
// TODO: This shouldnt really be necessary. The spec should be clear
enough about
@@ -69,7 +70,7 @@
return boundCall;
};
- if (window.___ && window.___.markInnocent) {
+ if (has___ && typeof ___.markInnocent !== 'undefined') {
___.markInnocent(apiMethod, method);
}
Modified:
shindig/branches/2.0.x/features/src/main/javascript/features/rpc/fe.transport.js
URL:
http://svn.apache.org/viewvc/shindig/branches/2.0.x/features/src/main/javascript/features/rpc/fe.transport.js?rev=994996&r1=994995&r2=994996&view=diff
==============================================================================
---
shindig/branches/2.0.x/features/src/main/javascript/features/rpc/fe.transport.js
(original)
+++
shindig/branches/2.0.x/features/src/main/javascript/features/rpc/fe.transport.js
Wed Sep 8 11:42:50 2010
@@ -65,7 +65,7 @@ gadgets.rpctx.frameElement = function()
// Conduct the RPC call.
fe[FE_G2C_CHANNEL](gadgets.json.stringify(rpc));
- return;
+ return true;
}
} else {
// Call from container to gadget[targetId].
@@ -76,12 +76,12 @@ gadgets.rpctx.frameElement = function()
// Conduct the RPC call.
frame[FE_G2C_CHANNEL][FE_C2G_CHANNEL](gadgets.json.stringify(rpc));
- return;
+ return true;
}
}
} catch (e) {
}
- return true;
+ return false;
}
return {
@@ -128,7 +128,7 @@ gadgets.rpctx.frameElement = function()
},
call: function(targetId, from, rpc) {
- callFrameElement(targetId, from, rpc);
+ return callFrameElement(targetId, from, rpc);
}
};
Modified:
shindig/branches/2.0.x/features/src/main/javascript/features/rpc/ifpc.transport.js
URL:
http://svn.apache.org/viewvc/shindig/branches/2.0.x/features/src/main/javascript/features/rpc/ifpc.transport.js?rev=994996&r1=994995&r2=994996&view=diff
==============================================================================
---
shindig/branches/2.0.x/features/src/main/javascript/features/rpc/ifpc.transport.js
(original)
+++
shindig/branches/2.0.x/features/src/main/javascript/features/rpc/ifpc.transport.js
Wed Sep 8 11:42:50 2010
@@ -130,7 +130,7 @@ gadgets.rpctx.ifpc = function() {
if (!relay) {
gadgets.warn('No relay file assigned for IFPC');
- return;
+ return false;
}
// The RPC mechanism supports two formats for IFPC (legacy and current).
Modified:
shindig/branches/2.0.x/features/src/main/javascript/features/rpc/rpc.js
URL:
http://svn.apache.org/viewvc/shindig/branches/2.0.x/features/src/main/javascript/features/rpc/rpc.js?rev=994996&r1=994995&r2=994996&view=diff
==============================================================================
--- shindig/branches/2.0.x/features/src/main/javascript/features/rpc/rpc.js
(original)
+++ shindig/branches/2.0.x/features/src/main/javascript/features/rpc/rpc.js Wed
Sep 8 11:42:50 2010
@@ -951,7 +951,7 @@ gadgets.rpc = function() {
_createRelayIframe: function(token, data) {
var relay = gadgets.rpc.getRelayUrl('..');
if (!relay) {
- return;
+ return null;
}
// Format: #targetId & sourceId & authToken & data
Modified:
shindig/branches/2.0.x/features/src/main/javascript/features/shindig.uri.ext/util.js
URL:
http://svn.apache.org/viewvc/shindig/branches/2.0.x/features/src/main/javascript/features/shindig.uri.ext/util.js?rev=994996&r1=994995&r2=994996&view=diff
==============================================================================
---
shindig/branches/2.0.x/features/src/main/javascript/features/shindig.uri.ext/util.js
(original)
+++
shindig/branches/2.0.x/features/src/main/javascript/features/shindig.uri.ext/util.js
Wed Sep 8 11:42:50 2010
@@ -52,11 +52,11 @@ shindig.uri = (function() {
self.setAuthority(base.getAuthority());
}
var selfPath = self.getPath();
- if (selfPath == '' || selfPath[0] != '/') {
+ if (selfPath == '' || selfPath.charAt(0) != '/') {
var basePath = base.getPath();
var lastSlash = basePath.lastIndexOf('/');
if (lastSlash != -1) {
- basePath = basePath(0, lastSlash + 1);
+ basePath = basePath.substring(0, lastSlash + 1);
}
self.setPath(base.getPath() + selfPath);
}
Modified: shindig/branches/2.0.x/java/common/conf/shindig.properties
URL:
http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/common/conf/shindig.properties?rev=994996&r1=994995&r2=994996&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/common/conf/shindig.properties (original)
+++ shindig/branches/2.0.x/java/common/conf/shindig.properties Wed Sep 8
11:42:50 2010
@@ -59,11 +59,11 @@ shindig.content-rewrite.enable-split-js-
#
# NOTE: setting this causes the EndToEnd test to fail the opensocial-templates
test
shindig.gadget-rewrite.default-forced-libs=core:rpc
-shindig.gadget-rewrite.default-forced-libs=
+#shindig.gadget-rewrite.default-forced-libs=
#
# Allow supported JavaScript features required by a gadget to be externalized
on demand
-shindig.gadget-rewrite.externalize-feature-libs=true
+shindig.gadget-rewrite.externalize-feature-libs=false
# Configuration for image rewriter
shindig.image-rewrite.max-inmem-bytes = 1048576
Modified: shindig/branches/2.0.x/java/common/pom.xml
URL:
http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/common/pom.xml?rev=994996&r1=994995&r2=994996&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/common/pom.xml (original)
+++ shindig/branches/2.0.x/java/common/pom.xml Wed Sep 8 11:42:50 2010
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shindig</groupId>
<artifactId>shindig-project</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: shindig/branches/2.0.x/java/gadgets/pom.xml
URL:
http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/pom.xml?rev=994996&r1=994995&r2=994996&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/gadgets/pom.xml (original)
+++ shindig/branches/2.0.x/java/gadgets/pom.xml Wed Sep 8 11:42:50 2010
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shindig</groupId>
<artifactId>shindig-project</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified:
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleConcatContentRewriter.java
URL:
http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleConcatContentRewriter.java?rev=994996&r1=994995&r2=994996&view=diff
==============================================================================
---
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleConcatContentRewriter.java
(original)
+++
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleConcatContentRewriter.java
Wed Sep 8 11:42:50 2010
@@ -22,7 +22,6 @@ import com.google.inject.Inject;
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.gadgets.Gadget;
-import org.apache.shindig.gadgets.rewrite.DomWalker;
import org.apache.shindig.gadgets.rewrite.DomWalker.Visitor;
import org.apache.shindig.gadgets.uri.ConcatUriManager;
Modified:
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleTagExtractorContentRewriter.java
URL:
http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleTagExtractorContentRewriter.java?rev=994996&r1=994995&r2=994996&view=diff
==============================================================================
---
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleTagExtractorContentRewriter.java
(original)
+++
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleTagExtractorContentRewriter.java
Wed Sep 8 11:42:50 2010
@@ -22,7 +22,6 @@ import com.google.inject.Inject;
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.gadgets.Gadget;
-import org.apache.shindig.gadgets.rewrite.DomWalker;
import org.apache.shindig.gadgets.rewrite.DomWalker.Visitor;
import org.apache.shindig.gadgets.uri.ConcatUriManager;
import org.apache.shindig.gadgets.uri.ProxyUriManager;
@@ -42,8 +41,7 @@ public class StyleTagExtractorContentRew
@Inject
public StyleTagExtractorContentRewriter(ContentRewriterFeature.Factory
featureConfigFactory,
- ConcatUriManager concatUriManager, ProxyUriManager proxyUriManager,
- CssResponseRewriter cssRewriter) {
+ ProxyUriManager proxyUriManager, CssResponseRewriter cssRewriter) {
this.featureConfigFactory = featureConfigFactory;
this.proxyUriManager = proxyUriManager;
this.cssRewriter = cssRewriter;
Modified:
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BMPOptimizer.java
URL:
http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BMPOptimizer.java?rev=994996&r1=994995&r2=994996&view=diff
==============================================================================
---
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BMPOptimizer.java
(original)
+++
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BMPOptimizer.java
Wed Sep 8 11:42:50 2010
@@ -44,11 +44,6 @@ public class BMPOptimizer extends PNGOpt
}
@Override
- protected void rewriteImpl(BufferedImage image) throws IOException {
- super.rewriteImpl(image);
- }
-
- @Override
protected String getOriginalContentType() {
return "image/bmp";
}
Modified:
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ConcatProxyServlet.java
URL:
http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ConcatProxyServlet.java?rev=994996&r1=994995&r2=994996&view=diff
==============================================================================
---
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ConcatProxyServlet.java
(original)
+++
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ConcatProxyServlet.java
Wed Sep 8 11:42:50 2010
@@ -105,11 +105,6 @@ public class ConcatProxyServlet extends
this.executor = executor;
}
- @Override
- public void init(ServletConfig config) throws ServletException {
- super.init(config);
- }
-
@SuppressWarnings("boxing")
@Override
protected void doGet(HttpServletRequest request, HttpServletResponse
response)
Modified:
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingServlet.java
URL:
http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingServlet.java?rev=994996&r1=994995&r2=994996&view=diff
==============================================================================
---
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingServlet.java
(original)
+++
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingServlet.java
Wed Sep 8 11:42:50 2010
@@ -68,11 +68,6 @@ public class GadgetRenderingServlet exte
}
@Override
- public void init(ServletConfig config) throws ServletException {
- super.init(config);
- }
-
- @Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws IOException {
// If an If-Modified-Since header is ever provided, we always say
// not modified. This is because when there actually is a change,
Modified:
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HtmlAccelServlet.java
URL:
http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HtmlAccelServlet.java?rev=994996&r1=994995&r2=994996&view=diff
==============================================================================
---
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HtmlAccelServlet.java
(original)
+++
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HtmlAccelServlet.java
Wed Sep 8 11:42:50 2010
@@ -52,11 +52,6 @@ public class HtmlAccelServlet extends In
}
@Override
- public void init(ServletConfig config) throws ServletException {
- super.init(config);
- }
-
- @Override
protected void doGet(HttpServletRequest request, HttpServletResponse
servletResponse)
throws IOException {
if (logger.isLoggable(Level.FINE)) {
Modified:
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java
URL:
http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java?rev=994996&r1=994995&r2=994996&view=diff
==============================================================================
---
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java
(original)
+++
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java
Wed Sep 8 11:42:50 2010
@@ -68,11 +68,6 @@ public class JsServlet extends InjectedS
}
@Override
- public void init(ServletConfig config) throws ServletException {
- super.init(config);
- }
-
- @Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws IOException {
// If an If-Modified-Since header is ever provided, we always say
Modified:
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/MakeRequestServlet.java
URL:
http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/MakeRequestServlet.java?rev=994996&r1=994995&r2=994996&view=diff
==============================================================================
---
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/MakeRequestServlet.java
(original)
+++
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/MakeRequestServlet.java
Wed Sep 8 11:42:50 2010
@@ -51,11 +51,6 @@ public class MakeRequestServlet extends
}
@Override
- public void init(ServletConfig config) throws ServletException {
- super.init(config);
- }
-
- @Override
protected void doGet(HttpServletRequest request, HttpServletResponse
response)
throws IOException {
try {
Modified:
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/OAuthCallbackServlet.java
URL:
http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/OAuthCallbackServlet.java?rev=994996&r1=994995&r2=994996&view=diff
==============================================================================
---
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/OAuthCallbackServlet.java
(original)
+++
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/OAuthCallbackServlet.java
Wed Sep 8 11:42:50 2010
@@ -89,11 +89,6 @@ public class OAuthCallbackServlet extend
}
@Override
- public void init(ServletConfig config) throws ServletException {
- super.init(config);
- }
-
- @Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws IOException {
OAuthCallbackState callbackState = new OAuthCallbackState(stateCrypter,
req.getParameter(CALLBACK_STATE_PARAM));
Modified:
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyServlet.java
URL:
http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyServlet.java?rev=994996&r1=994995&r2=994996&view=diff
==============================================================================
---
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyServlet.java
(original)
+++
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyServlet.java
Wed Sep 8 11:42:50 2010
@@ -68,11 +68,6 @@ public class ProxyServlet extends Inject
}
@Override
- public void init(ServletConfig config) throws ServletException {
- super.init(config);
- }
-
- @Override
protected void doGet(HttpServletRequest request, HttpServletResponse
servletResponse)
throws IOException {
if (request.getHeader("If-Modified-Since") != null) {
Modified:
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/RpcServlet.java
URL:
http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/RpcServlet.java?rev=994996&r1=994995&r2=994996&view=diff
==============================================================================
---
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/RpcServlet.java
(original)
+++
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/RpcServlet.java
Wed Sep 8 11:42:50 2010
@@ -59,11 +59,6 @@ public class RpcServlet extends Injected
}
@Override
- public void init(ServletConfig config) throws ServletException {
- super.init(config);
- }
-
- @Override
protected void doGet(HttpServletRequest request, HttpServletResponse
response)
throws IOException {
String reqValue;
Modified: shindig/branches/2.0.x/java/samples/pom.xml
URL:
http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/samples/pom.xml?rev=994996&r1=994995&r2=994996&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/samples/pom.xml (original)
+++ shindig/branches/2.0.x/java/samples/pom.xml Wed Sep 8 11:42:50 2010
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shindig</groupId>
<artifactId>shindig-project</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: shindig/branches/2.0.x/java/server/pom.xml
URL:
http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/server/pom.xml?rev=994996&r1=994995&r2=994996&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/server/pom.xml (original)
+++ shindig/branches/2.0.x/java/server/pom.xml Wed Sep 8 11:42:50 2010
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shindig</groupId>
<artifactId>shindig-project</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: shindig/branches/2.0.x/java/social-api/pom.xml
URL:
http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/social-api/pom.xml?rev=994996&r1=994995&r2=994996&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/social-api/pom.xml (original)
+++ shindig/branches/2.0.x/java/social-api/pom.xml Wed Sep 8 11:42:50 2010
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shindig</groupId>
<artifactId>shindig-project</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: shindig/branches/2.0.x/pom.xml
URL:
http://svn.apache.org/viewvc/shindig/branches/2.0.x/pom.xml?rev=994996&r1=994995&r2=994996&view=diff
==============================================================================
--- shindig/branches/2.0.x/pom.xml (original)
+++ shindig/branches/2.0.x/pom.xml Wed Sep 8 11:42:50 2010
@@ -28,7 +28,7 @@
<groupId>org.apache.shindig</groupId>
<artifactId>shindig-project</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Shindig Project</name>
@@ -1056,6 +1056,11 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>2.4.3</version>
</plugin>
