Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[maven-release-plugin] copy for tag shindig-project-2.0.0

  • Loading branch information...
commit c6202dc4a43593f3c3509592ff9e2a6fd623ab18 2 parents 6172650 + 7561ac5
@lindner lindner authored
Showing with 41 additions and 79 deletions.
  1. +3 −3 assembly/pom.xml
  2. +1 −1  content/container/gadgets.css
  3. +3 −3 extras/pom.xml
  4. +2 −2 extras/src/main/java/org/apache/shindig/extras/as/core/model/ActionLinkImpl.java
  5. +1 −0  features/src/main/javascript/features/core.config/config.js
  6. +5 −3 features/src/main/javascript/features/core.io/io.js
  7. +1 −0  features/src/main/javascript/features/core.json/json.js
  8. +1 −1  features/src/main/javascript/features/osapi/batch.js
  9. +5 −4 features/src/main/javascript/features/osapi/osapi.js
  10. +4 −4 features/src/main/javascript/features/rpc/fe.transport.js
  11. +1 −1  features/src/main/javascript/features/rpc/ifpc.transport.js
  12. +1 −1  features/src/main/javascript/features/rpc/rpc.js
  13. +2 −2 features/src/main/javascript/features/shindig.uri.ext/util.js
  14. +2 −2 java/common/conf/shindig.properties
  15. +0 −1  java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleConcatContentRewriter.java
  16. +1 −3 java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleTagExtractorContentRewriter.java
  17. +0 −5 java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BMPOptimizer.java
  18. +0 −5 java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ConcatProxyServlet.java
  19. +0 −5 java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingServlet.java
  20. +0 −5 java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HtmlAccelServlet.java
  21. +0 −5 java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java
  22. +0 −5 java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/MakeRequestServlet.java
  23. +0 −5 java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/OAuthCallbackServlet.java
  24. +0 −5 java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyServlet.java
  25. +0 −5 java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/RpcServlet.java
  26. +3 −3 java/samples/pom.xml
  27. +5 −0 pom.xml
View
6 assembly/pom.xml
@@ -33,11 +33,11 @@
<description>Assembles the Java/PHP code base into a deployment package.</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/shindig/tags/shindig-project-2.0.0
+ <connection>scm:svn:http://svn.apache.org/repos/asf/shindig/tags/shindig-project-2.0.0/assembly
</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/shindig/tags/shindig-project-2.0.0
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/shindig/tags/shindig-project-2.0.0/assembly
</developerConnection>
- <url>http://svn.apache.org/viewvc/shindig/tags/shindig-project-2.0.0</url>
+ <url>http://svn.apache.org/viewvc/shindig/tags/shindig-project-2.0.0/assembly</url>
</scm>
<build>
View
2  content/container/gadgets.css
@@ -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 {
}
View
6 extras/pom.xml
@@ -33,9 +33,9 @@
<description>Provides extra, deprecated or extended functionality. The items here have unstable APIs and could change at any time.</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/shindig/tags/shindig-project-2.0.0/java/extras</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/shindig/tags/shindig-project-2.0.0/java/extras</developerConnection>
- <url>http://svn.apache.org/viewvc/shindig/tags/shindig-project-2.0.0/java/extras</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/shindig/tags/shindig-project-2.0.0/extras</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/shindig/tags/shindig-project-2.0.0/extras</developerConnection>
+ <url>http://svn.apache.org/viewvc/shindig/tags/shindig-project-2.0.0/extras</url>
</scm>
<build>
View
4 extras/src/main/java/org/apache/shindig/extras/as/core/model/ActionLinkImpl.java
@@ -26,9 +26,9 @@
private String target;
private String caption;
-
+
/**
- * Construct an empty ActionLinkImpl
+ * Construct an empty ActionLinkImpl.
*/
public ActionLinkImpl() {
this.target = null;
View
1  features/src/main/javascript/features/core.config/config.js
@@ -184,6 +184,7 @@ gadgets.config = function() {
return true;
}
}
+ return false;
};
},
View
8 features/src/main/javascript/features/core.io/io.js
@@ -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;
View
1  features/src/main/javascript/features/core.json/json.js
@@ -175,6 +175,7 @@ if (window.JSON && window.JSON.parse && window.JSON.stringify) {
// Join all of the member texts together and wrap them in braces.
return '{' + a.join(',') + '}';
}
+ return "undefined";
}
return {
View
2  features/src/main/javascript/features/osapi/batch.js
@@ -52,8 +52,8 @@
var add = function(key, request) {
if (request && key) {
keyedRequests.push({"key" : key, "request" : request});
- return that;
}
+ return that;
};
/**
View
9 features/src/main/javascript/features/osapi/osapi.js
@@ -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);
}
View
8 features/src/main/javascript/features/rpc/fe.transport.js
@@ -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);
}
};
View
2  features/src/main/javascript/features/rpc/ifpc.transport.js
@@ -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).
View
2  features/src/main/javascript/features/rpc/rpc.js
@@ -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
View
4 features/src/main/javascript/features/shindig.uri.ext/util.js
@@ -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);
}
View
4 java/common/conf/shindig.properties
@@ -59,11 +59,11 @@ shindig.content-rewrite.enable-split-js-concat=true
#
# 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
View
1  .../gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleConcatContentRewriter.java
@@ -22,7 +22,6 @@
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;
View
4 ...ts/src/main/java/org/apache/shindig/gadgets/rewrite/StyleTagExtractorContentRewriter.java
@@ -22,7 +22,6 @@
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 @@
@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;
View
5 java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BMPOptimizer.java
@@ -44,11 +44,6 @@ public BMPOptimizer(OptimizerConfig config, HttpResponseBuilder response) {
}
@Override
- protected void rewriteImpl(BufferedImage image) throws IOException {
- super.rewriteImpl(image);
- }
-
- @Override
protected String getOriginalContentType() {
return "image/bmp";
}
View
5 java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ConcatProxyServlet.java
@@ -105,11 +105,6 @@ public void setExecutor(@Named("shindig.concat.executor") ExecutorService execut
this.executor = executor;
}
- @Override
- public void init(ServletConfig config) throws ServletException {
- super.init(config);
- }
-
@SuppressWarnings("boxing")
@Override
protected void doGet(HttpServletRequest request, HttpServletResponse response)
View
5 java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingServlet.java
@@ -68,11 +68,6 @@ public void setIframeUriManager(IframeUriManager iframeUriManager) {
}
@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,
View
5 java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HtmlAccelServlet.java
@@ -52,11 +52,6 @@ public void setHandler(AccelHandler accelHandler) {
}
@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)) {
View
5 java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java
@@ -68,11 +68,6 @@ public void setUrlGenerator(JsUriManager jsUriManager) {
}
@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
View
5 java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/MakeRequestServlet.java
@@ -51,11 +51,6 @@ public void setMakeRequestHandler(MakeRequestHandler makeRequestHandler) {
}
@Override
- public void init(ServletConfig config) throws ServletException {
- super.init(config);
- }
-
- @Override
protected void doGet(HttpServletRequest request, HttpServletResponse response)
throws IOException {
try {
View
5 java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/OAuthCallbackServlet.java
@@ -89,11 +89,6 @@ public void setStateCrypter(@Named(OAuthFetcherConfig.OAUTH_STATE_CRYPTER) BlobC
}
@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));
View
5 java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyServlet.java
@@ -68,11 +68,6 @@ public void setLockedDomainService(LockedDomainService lockedDomainService) {
}
@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) {
View
5 java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/RpcServlet.java
@@ -59,11 +59,6 @@ public void setJsonRpcHandler(JsonRpcHandler jsonHandler) {
}
@Override
- public void init(ServletConfig config) throws ServletException {
- super.init(config);
- }
-
- @Override
protected void doGet(HttpServletRequest request, HttpServletResponse response)
throws IOException {
String reqValue;
View
6 java/samples/pom.xml
@@ -33,9 +33,9 @@
<description>Provides Sample implementations of the SPI and API's inside the core of Shindig.</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/shindig/tags/shindig-project-2.0.0</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/shindig/tags/shindig-project-2.0.0</developerConnection>
- <url>http://svn.apache.org/viewvc/shindig/tags/shindig-project-2.0.0</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/shindig/tags/shindig-project-2.0.0/java/samples</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/shindig/tags/shindig-project-2.0.0/java/samples</developerConnection>
+ <url>http://svn.apache.org/viewvc/shindig/tags/shindig-project-2.0.0/java/samples</url>
</scm>
<repositories>
View
5 pom.xml
@@ -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>
Please sign in to comment.
Something went wrong with that request. Please try again.