[
https://issues.apache.org/jira/browse/SHINDIG-152?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=12584006#action_12584006
]
Santiago Gala commented on SHINDIG-152:
---------------------------------------
The patch doesn't apply here, it refers to files that don't exist (at least in
my working copy), GadgetTokenDecoder and BasicGadgetTokenDecoder
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/
can't find them either, which puzzles me a lot as the patch contains an
rXXXXXX as if they were existing files:
$ cat /tmp/guice-2.patch.txt | patch -p0 --dry-run
patching file
java/gadgets/src/test/java/org/apache/shindig/util/BlobCrypterTest.java
patching file
java/gadgets/src/test/java/org/apache/shindig/gadgets/SigningFetcherTest.java
patching file
java/gadgets/src/test/java/org/apache/shindig/gadgets/http/ProxyHandlerTest.java
patching file
java/gadgets/src/test/java/org/apache/shindig/gadgets/http/GadgetRendererTest.java
patching file
java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpTestFixture.java
patching file
java/gadgets/src/test/java/org/apache/shindig/gadgets/http/JsonRpcRequestTest.java
patching file
java/gadgets/src/test/java/org/apache/shindig/gadgets/http/GadgetRenderingTaskTest.java
patching file
java/gadgets/src/test/java/org/apache/shindig/gadgets/http/JsonRpcHandlerTest.java
patching file
java/gadgets/src/test/java/org/apache/shindig/gadgets/JsLibraryTest.java
patching file
java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetTestFixture.java
patching file
java/gadgets/src/test/java/org/apache/shindig/gadgets/SignedFetchRequestSignerTest.java
patching file
java/gadgets/src/test/java/org/apache/shindig/gadgets/EasyMockTestCase.java
patching file
java/gadgets/src/test/java/org/apache/shindig/gadgets/InterceptingContentFetcher.java
patching file
java/gadgets/src/main/java/org/apache/shindig/social/samplecontainer/XmlStateFileFetcher.java
patching file
java/gadgets/src/main/java/org/apache/shindig/social/GadgetDataServlet.java
patching file
java/gadgets/src/main/java/org/apache/shindig/social/opensocial/OpenSocialDataHandler.java
patching file
java/gadgets/src/main/java/org/apache/shindig/util/BlobCrypter.java
patching file
java/gadgets/src/main/java/org/apache/shindig/util/ResourceLoader.java
patching file
java/gadgets/src/main/java/org/apache/shindig/gadgets/RemoteContentRequest.java
patching file
java/gadgets/src/main/java/org/apache/shindig/gadgets/http/CrossServletState.java
patching file
java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpGuiceModule.java
patching file
java/gadgets/src/main/java/org/apache/shindig/gadgets/http/DefaultCrossServletState.java
patching file
java/gadgets/src/main/java/org/apache/shindig/gadgets/http/UrlGenerator.java
patching file
java/gadgets/src/main/java/org/apache/shindig/gadgets/http/GuiceServletContextListener.java
patching file
java/gadgets/src/main/java/org/apache/shindig/gadgets/http/GadgetRenderingTask.java
patching file
java/gadgets/src/main/java/org/apache/shindig/gadgets/http/JsonRpcHandler.java
patching file
java/gadgets/src/main/java/org/apache/shindig/gadgets/http/ProxyHandler.java
patching file
java/gadgets/src/main/java/org/apache/shindig/gadgets/http/JsServlet.java
patching file
java/gadgets/src/main/java/org/apache/shindig/gadgets/http/GadgetRenderer.java
patching file
java/gadgets/src/main/java/org/apache/shindig/gadgets/http/JsonRpcGadgetJob.java
patching file
java/gadgets/src/main/java/org/apache/shindig/gadgets/http/ProxyServlet.java
patching file
java/gadgets/src/main/java/org/apache/shindig/gadgets/http/JsonRpcRequest.java
patching file
java/gadgets/src/main/java/org/apache/shindig/gadgets/http/RpcServlet.java
patching file
java/gadgets/src/main/java/org/apache/shindig/gadgets/http/InjectedServlet.java
patching file
java/gadgets/src/main/java/org/apache/shindig/gadgets/http/GadgetRenderingServlet.java
patching file
java/gadgets/src/main/java/org/apache/shindig/gadgets/SigningFetcher.java
patching file
java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetFeatureRegistry.java
patching file
java/gadgets/src/main/java/org/apache/shindig/gadgets/RequestSigner.java
patching file
java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicGadgetSigner.java
patching file
java/gadgets/src/main/java/org/apache/shindig/gadgets/SyndicatorConfig.java
patching file
java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetServerConfig.java
patching file
java/gadgets/src/main/java/org/apache/shindig/gadgets/MessageBundleFetcher.java
can't find file to patch at input line 5332
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index:
java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicGadgetTokenDecoder.java
|===================================================================
|---
java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicGadgetTokenDecoder.java
(revision 642892)
|+++
java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicGadgetTokenDecoder.java
(working copy)
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
2 out of 2 hunks ignored
patching file
java/gadgets/src/main/java/org/apache/shindig/gadgets/RemoteContentFetcher.java
patching file
java/gadgets/src/main/java/org/apache/shindig/gadgets/NullRequestSigner.java
patching file
java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicGadgetToken.java
patching file
java/gadgets/src/main/java/org/apache/shindig/gadgets/JsLibrary.java
patching file
java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetSigner.java
patching file
java/gadgets/src/main/java/org/apache/shindig/gadgets/SignedFetchRequestSigner.java
patching file
java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGuiceModule.java
patching file
java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetSpecFetcher.java
patching file
java/gadgets/src/main/java/org/apache/shindig/gadgets/JsFeatureLoader.java
can't find file to patch at input line 6056
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index:
java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetTokenDecoder.java
|===================================================================
|---
java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetTokenDecoder.java
(revision 642892)
|+++
java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetTokenDecoder.java
(working copy)
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
1 out of 1 hunk ignored
patching file
java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetServer.java
patching file
java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicGadgetBlacklist.java
patching file
java/gadgets/src/main/java/org/apache/shindig/gadgets/SigningFetcherFactory.java
patching file
java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicRemoteContentFetcher.java
patching file
java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetServerConfigReader.java
patching file
java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetToken.java
patching file java/gadgets/src/main/webapp/WEB-INF/web.xml
patching file java/gadgets/pom.xml
> Replace CrossServletState and other hacky junk with Guice
> ---------------------------------------------------------
>
> Key: SHINDIG-152
> URL: https://issues.apache.org/jira/browse/SHINDIG-152
> Project: Shindig
> Issue Type: Improvement
> Components: Gadgets Server - Java
> Reporter: Kevin Brown
> Assignee: Kevin Brown
> Attachments: guice-2.patch.txt
>
>
> http://code.google.com/p/google-guice
> The attached patch will get rid of several remaining bits of clunkiness that
> weren't properly addressed in the last refactoring patch by introducing
> Guice, an open source dependency injection framework.
> This patch mostly consists of removing code that is no longer necessary,
> moving some code around to facilitate DI, and adding the guice wiring.
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
