Merge branch 'technology-2014-12-18'

Author: ykohata

build.xml

@@ -381,6 +381,7 @@
                 <include name="scripts/*.*"/>
                 <include name="scripts/launch/**/*.*"/>
 				<include name="scripts/copilot/**/*.*"/>
+                <include name="scripts/my/**/*.*"/>
                 <include name="scripts/scorecard/**/*.*"/>
                 <include name="scripts/tinyMCE/templates/*.html"/>
                 <include name="scripts/ckeditor/templates/**/*.*"/>

conf/web/WEB-INF/struts.xml

@@ -15,6 +15,7 @@
     <constant name="struts.convention.exclude.parentClassLoader" value="true"/>
     <constant name="struts.convention.action.fileProtocols" value="jar,vfsfile,vfszip"/>
     <constant name="struts.multipart.maxSize" value="20971520"/>
+    <constant name="struts.ognl.allowStaticMethodAccess" value="true" />
 
 
     <package name="base" namespace="/base" extends="default">
@@ -1196,14 +1197,14 @@
             <result name="success">/WEB-INF/vmmanager/dashboard-vm-management.jsp</result>
         </action>
         <action name="launchVMInstance" class="launchVMInstanceAction">
-            <interceptor-ref name="token"/>
+            <!--<interceptor-ref name="token"/>-->
             <interceptor-ref name="authnInterceptor"/>
             <result name="success" type="json"/>
             <result name="error" type="json"/>
             <result name="invalid.token" type="json"/>
         </action>
         <action name="terminateVMInstance" class="terminateVMInstanceAction">
-            <interceptor-ref name="token"/>
+            <!--<interceptor-ref name="token"/>-->
             <interceptor-ref name="authnInterceptor"/>
             <result name="success" type="json"/>
             <result name="error" type="json"/>