You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by jc...@apache.org on 2011/10/21 15:10:03 UTC
svn commit: r1187324 -
/incubator/rave/site/trunk/content/rave/documentation/configure-ssl.mdtext
Author: jcian
Date: Fri Oct 21 13:10:02 2011
New Revision: 1187324
URL: http://svn.apache.org/viewvc?rev=1187324&view=rev
Log:
CMS commit to rave by jcian
Modified:
incubator/rave/site/trunk/content/rave/documentation/configure-ssl.mdtext
Modified: incubator/rave/site/trunk/content/rave/documentation/configure-ssl.mdtext
URL: http://svn.apache.org/viewvc/incubator/rave/site/trunk/content/rave/documentation/configure-ssl.mdtext?rev=1187324&r1=1187323&r2=1187324&view=diff
==============================================================================
--- incubator/rave/site/trunk/content/rave/documentation/configure-ssl.mdtext (original)
+++ incubator/rave/site/trunk/content/rave/documentation/configure-ssl.mdtext Fri Oct 21 13:10:02 2011
@@ -102,4 +102,100 @@ These instructions demonstrate how to ge
## Complete diff of modified files follows
+<blockquote>
+diff --exclude=*logs -r tomcat-vanila\bin\startup.bat tomcat\bin\startup.bat
+<br>56c56,57
+<br><
+<br>---
+<br>>
+<br>> set JAVA_OPTS=%JAVA_OPTS% -Djavax.net.ssl.trustStore=c:\temp\tomcat\custom-cacerts
+<br>
+<br>diff --exclude=*logs -r tomcat-vanila\conf\server.xml tomcat\conf\server.xml
+<br>71c71
+<br>< redirectPort="8443" />
+<br>---
+<br>> redirectPort="443" />
+<br>77c77
+<br>< redirectPort="8443" />
+<br>---
+<br>> redirectPort="443" />
+<br>79c79
+<br>< <!-- Define a SSL HTTP/1.1 Connector on port 8443
+<br>---
+<br>> <!-- Define a SSL HTTP/1.1 Connector on port 443
+<br>83,84c83
+<br>< <!--
+<br>< <Connector port="8443" protocol="HTTP/1.1" SSLEnabled="true"
+<br>---
+<br>> <Connector port="443" protocol="HTTP/1.1" SSLEnabled="true"
+<br>85a85
+<br>> keystoreFile="c:\temp\tomcat\custom-cacerts" keystorePass="changeit"
+<br>87d86
+<br>< -->
+<br>90c89
+<br>< <Connector port="8009" protocol="AJP/1.3" redirectPort="8443" />
+<br>---
+<br>> <Connector port="8009" protocol="AJP/1.3" redirectPort="443" />
+<br>
+<br>diff --exclude=*logs -r tomcat-vanila\webapps\portal\WEB-INF\classes\portal.properties tomcat\webapps\portal\WEB-INF\classes\portal.properties
+<br>25,26c25,26
+<br>< portal.opensocial_engine.protocol=http
+<br>< portal.opensocial_engine.root=localhost:8080
+<br>---
+<br>> portal.opensocial_engine.protocol=https
+<br>> portal.opensocial_engine.root=mm187390-pc.mitre.org
+<br>
+<br>diff --exclude=*logs -r tomcat-vanila\webapps\ROOT\WEB-INF\classes\containers\default\container.js tomcat\webapps\ROOT\WEB-INF\classes\containers\default\container.js
+<br>10c10
+<br>< * http://www.apache.org/licenses/LICENSE-2.0
+<br>---
+<br>> * https://www.apache.org/licenses/LICENSE-2.0
+<br>78c78
+<br>< "gadgets.jsUriTemplate" : "http://%host%${CONTEXT_ROOT}/gadgets/js/%js%",
+<br>---
+<br>> "gadgets.jsUriTemplate" : "https://%host%${CONTEXT_ROOT}/gadgets/js/%js%",
+<br>86c86
+<br>< "gadgets.uri.js.host" : "http://www.example.com/",
+<br>---
+<br>> "gadgets.uri.js.host" : "https://www.example.com/",
+<br>99c99
+<br>< "gadgets.osDataUri" : "http://%host%${CONTEXT_ROOT}/rpc",
+<br>---
+<br>> "gadgets.osDataUri" : "https://%host%${CONTEXT_ROOT}/rpc",
+<br>106,107c106,107
+<br>< //"defaultShindigTestHost": "http://${SERVER_HOST}:${SERVER_PORT}",
+<br>< "defaultShindigTestHost":"http://%authority%",
+<br>---
+<br>> //"defaultShindigTestHost": "https://${SERVER_HOST}:${SERVER_PORT}",
+<br>> "defaultShindigTestHost":"https://%authority%",
+<br>154c154
+<br>< "urlTemplate" : "http://localhost${CONTEXT_ROOT}/gadgets/profile?{var}",
+<br>---
+<br>> "urlTemplate" : "https://localhost${CONTEXT_ROOT}/gadgets/profile?{var}",
+<br>159c159
+<br>< "urlTemplate" : "http://localhost${CONTEXT_ROOT}/gadgets/canvas?{var}",
+<br>---
+<br>> "urlTemplate" : "https://localhost${CONTEXT_ROOT}/gadgets/canvas?{var}",
+<br>260c260
+<br>< "path" : "http://%host%${CONTEXT_ROOT}/rpc",
+<br>---
+<br>> "path" : "https://%host%${CONTEXT_ROOT}/rpc",
+<br>262c262
+<br>< "invalidatePath" : "http://%host%${CONTEXT_ROOT}/rpc",
+<br>---
+<br>> "invalidatePath" : "https://%host%${CONTEXT_ROOT}/rpc",
+<br>290c290
+<br>< "endPoints" : [ "http://%host%${CONTEXT_ROOT}/rpc" ]
+<br>---
+<br>> "endPoints" : [ "https://%host%${CONTEXT_ROOT}/rpc" ]
+<br>
+<br>diff --exclude=*logs -r tomcat-vanila\webapps\ROOT\WEB-INF\classes\rave.shindig.properties tomcat\webapps\ROOT\WEB-INF\classes\rave.shindig.properties
+<br>24,25c24,25
+<br>< shindig.host=localhost
+<br>< shindig.port=8080
+<br>---
+<br>> shindig.host=mm187390-pc.mitre.org
+<br>> shindig.port=
+</blockquote>
+
[1]: installing.html
\ No newline at end of file