rave-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zh...@apache.org
Subject svn commit: r1146558 - in /incubator/rave/trunk: rave-portal/pom.xml rave-shindig/src/main/webapp/WEB-INF/web.xml
Date Thu, 14 Jul 2011 05:10:36 GMT
Author: zhguo
Date: Thu Jul 14 05:10:36 2011
New Revision: 1146558

URL: http://svn.apache.org/viewvc?rev=1146558&view=rev
Log:
RAVE-45: Portal host/ip configuration (Non-localhost support)
https://issues.apache.org/jira/browse/RAVE-45

- Updated rave-shindig/src/main/webapp/WEB-INF/web.xml to use the web.xml from shindig-3.0.0-beta2
with our change integrated.  For the original version, setting system property shindig.host
does NOT work. For this updated version, it works.
- Add a configuration property in rave-portal/pom.xml by which the user can easily specify
value of system property *shindig.host*.


Modified:
    incubator/rave/trunk/rave-portal/pom.xml
    incubator/rave/trunk/rave-shindig/src/main/webapp/WEB-INF/web.xml

Modified: incubator/rave/trunk/rave-portal/pom.xml
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/pom.xml?rev=1146558&r1=1146557&r2=1146558&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/pom.xml (original)
+++ incubator/rave/trunk/rave-portal/pom.xml Thu Jul 14 05:10:36 2011
@@ -260,6 +260,7 @@
                             <cargo.jvmargs>
                                 <![CDATA[-Xdebug -Xrunjdwp:transport=dt_socket,address=${cargo.debug.address},server=y,suspend=${cargo.debug.suspend}
-noverify ${javaagent}]]>
                             </cargo.jvmargs>
+                            <cargo.tomcat.context.reloadable>true</cargo.tomcat.context.reloadable>
                         </properties>
                         <home>${project.build.directory}/tomcat6x</home>
                         <deployables>
@@ -289,6 +290,9 @@
                                 http://archive.apache.org/dist/tomcat/tomcat-6/v6.0.32/bin/apache-tomcat-6.0.32.tar.gz
                             </url>
                         </zipUrlInstaller>
+                        <systemProperties>
+                          <shindig.host>wave1.zhenhua.info</shindig.host>
+                        </systemProperties>
                     </container>
                 </configuration>
             </plugin>

Modified: incubator/rave/trunk/rave-shindig/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-shindig/src/main/webapp/WEB-INF/web.xml?rev=1146558&r1=1146557&r2=1146558&view=diff
==============================================================================
--- incubator/rave/trunk/rave-shindig/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/rave/trunk/rave-shindig/src/main/webapp/WEB-INF/web.xml Thu Jul 14 05:10:36
2011
@@ -43,29 +43,41 @@
     </param-value>
   </context-param>
 
-  <!-- 
+  <!--
   Syntax: <key>=<value> separated by a newline
-  
+
   system.properties specifies the environmental variables that will be set to the JVM System
Properties at server startup time.
   Alternatively, you may add these values in your app server (ex: Tomcat) as
   VM arguments like this: -Dshindig.host="my.production.shindig.server.com".
-  
+
   Here are a few properties that can be set for Shindig:
   shindig.host: the server name that Shindig is deployed and running on
   shindig.port: the port number of shindig.host server
-  
+
   Make sure you escape all HTML values for the web.xml to be parsed correctly.
   -->
    <context-param>
   	<param-name>system.properties</param-name>
      <param-value>
-    	shindig.host=localhost
-    	
-    	aKey=/shindig/gadgets/proxy?container=default&amp;url=
-    	shindig.port=
-    	
+        shindig.host=
+        shindig.port=
+    	aKey=/shindig/gadgets/proxy?container=default&amp;url=    	
      </param-value>
-  </context-param>  
+  </context-param>
+
+  <filter>
+    <filter-name>hostFilter</filter-name>
+    <filter-class>org.apache.shindig.common.servlet.HostFilter</filter-class>
+  </filter>
+  <filter-mapping>
+    <filter-name>hostFilter</filter-name>
+    <url-pattern>/gadgets/ifr</url-pattern>
+    <url-pattern>/gadgets/js/*</url-pattern>
+    <url-pattern>/gadgets/proxy/*</url-pattern>
+    <url-pattern>/gadgets/concat</url-pattern>
+    <url-pattern>/rpc/*</url-pattern>
+    <url-pattern>/rest/*</url-pattern>
+  </filter-mapping>
 
     <filter>
         <filter-name>ShiroFilter</filter-name>
@@ -99,7 +111,7 @@
     <filter-name>authFilter</filter-name>
     <filter-class>org.apache.shindig.auth.AuthenticationServletFilter</filter-class>
   </filter>
-  
+
   <filter>
     <filter-name>etagFilter</filter-name>
     <filter-class>org.apache.shindig.gadgets.servlet.ETagFilter</filter-class>
@@ -321,9 +333,8 @@
     <servlet-name>rpcSwf</servlet-name>
     <url-pattern>/xpc*</url-pattern>
   </servlet-mapping>
-  
-  
-  
+
+ 
   <servlet>
 		<servlet-name>H2Console</servlet-name>
 		<servlet-class>org.h2.server.web.WebServlet</servlet-class>



Mime
View raw message