svn commit: r1677252 - in /portals/jetspeed-2/applications/j2-admin/trunk/src/main: java/org/apache/jetspeed/jetapp/JetAppPortlet.java java/org/apache/jetspeed/jetapp/JetAppPortletFilter.java webapp/WEB-INF/portlet.xml

Author: taylor
Date: Fri May  1 23:10:32 2015
New Revision: 1677252

URL: http://svn.apache.org/r1677252
Log:
JS2-1320: adding missing controller and service scripts

Modified:
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/jetapp/JetAppPortlet.java
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/jetapp/JetAppPortletFilter.java
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/portlet.xml

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/jetapp/JetAppPortlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/jetapp/JetAppPortlet.java?rev=1677252&r1=1677251&r2=1677252&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/jetapp/JetAppPortlet.java (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/jetapp/JetAppPortlet.java Fri May  1 23:10:32 2015
@@ -77,8 +77,10 @@ public class JetAppPortlet extends Gener
             { "/jetapp/scripts/ServerService.js", "j2admin_server"},
             { "/jetapp/scripts/RestApiService.js", "j2admin_services"},
             { "/jetapp/scripts/PortletService.js", "j2admin_portlet"},
+            { "/jetapp/scripts/StatisticsRestServices.js", "j2admin_statistics"},
             { "/jetapp/app.js", "j2admin_app"},
             { "/jetapp/scripts/controllers.js", "j2admin_controllers"},
+            { "/jetapp/scripts/chartControllers.js", "j2admin_chart_ontrollers"},
             { "/jetapp/scripts/directives.js", "j2admin_directives"},
             { "/jetapp/scripts/filters.js", "j2admin_filters"}
     };

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/jetapp/JetAppPortletFilter.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/jetapp/JetAppPortletFilter.java?rev=1677252&r1=1677251&r2=1677252&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/jetapp/JetAppPortletFilter.java (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/jetapp/JetAppPortletFilter.java Fri May  1 23:10:32 2015
@@ -63,6 +63,7 @@ public class JetAppPortletFilter impleme
         String useAngular = request.getPreferences().getValue("jetapp", null);
         if (useAngular != null && useAngular.equalsIgnoreCase("true")) {
             if (!alreadyContributedAngular(request)) {
+                //response.getWriter().write(ANGULAR.toCharArray());
                 response.getPortletOutputStream().write(ANGULAR.getBytes());
             }
         }

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/portlet.xml?rev=1677252&r1=1677251&r2=1677252&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/portlet.xml (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/portlet.xml Fri May  1 23:10:32 2015
@@ -2765,7 +2765,6 @@
     <portlet-name>MemoryUsageChart</portlet-name>
     <display-name>JVM Memory Usage</display-name>
     <portlet-class>org.apache.jetspeed.jetapp.JetAppChartPortlet</portlet-class>
-    <expiration-cache>0</expiration-cache>
     <supports>
       <mime-type>text/html</mime-type>
       <portlet-mode>VIEW</portlet-mode>
@@ -2794,7 +2793,6 @@
     <portlet-name>PageUsageChart</portlet-name>
     <display-name>Page Usage Chart</display-name>
     <portlet-class>org.apache.jetspeed.jetapp.JetAppChartPortlet</portlet-class>
-    <expiration-cache>0</expiration-cache>
     <supports>
       <mime-type>text/html</mime-type>
       <portlet-mode>VIEW</portlet-mode>
@@ -2823,7 +2821,6 @@
     <portlet-name>UserLoginsChart</portlet-name>
     <display-name>User Logins Chart</display-name>
     <portlet-class>org.apache.jetspeed.jetapp.JetAppChartPortlet</portlet-class>
-    <expiration-cache>0</expiration-cache>
     <supports>
       <mime-type>text/html</mime-type>
       <portlet-mode>VIEW</portlet-mode>
@@ -2852,7 +2849,6 @@
     <portlet-name>CacheUsageChart</portlet-name>
     <display-name>Cache Usage Chart</display-name>
     <portlet-class>org.apache.jetspeed.jetapp.JetAppChartPortlet</portlet-class>
-    <expiration-cache>0</expiration-cache>
     <supports>
       <mime-type>text/html</mime-type>
       <portlet-mode>VIEW</portlet-mode>