[jboss-svn-commits] JBL Code SVN: r21544 - in labs/jbosslabs/branches/stats-prod: binaries/as-portal/to-copy/server/default/deploy/jbossweb-tomcat55.sar and 11 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Aug 14 09:52:44 EDT 2008
Author: wrzep
Date: 2008-08-14 09:52:44 -0400 (Thu, 14 Aug 2008)
New Revision: 21544
Added:
labs/jbosslabs/branches/stats-prod/configuration/to-copy/server/default/deploy/jboss-portal.sar/conf/
labs/jbosslabs/branches/stats-prod/configuration/to-copy/server/default/deploy/jboss-portal.sar/conf/data/
labs/jbosslabs/branches/stats-prod/configuration/to-copy/server/default/deploy/jboss-portal.sar/conf/data/default-object.xml
labs/jbosslabs/branches/stats-prod/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/
labs/jbosslabs/branches/stats-prod/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/
labs/jbosslabs/branches/stats-prod/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/jboss-web.xml
Removed:
labs/jbosslabs/branches/stats-prod/binaries/as-portal/to-copy/server/default/deploy/jbossweb-tomcat55.sar/ROOT.war/
labs/jbosslabs/branches/stats-prod/binaries/as-portal/to-copy/server/default/deploy/jmx-console.war/
labs/jbosslabs/branches/stats-prod/configuration/to-copy/server/default/deploy/jboss-portal.sar/conf/data/
labs/jbosslabs/branches/stats-prod/configuration/to-copy/server/default/deploy/jboss-portal.sar/conf/data/default-object.xml
labs/jbosslabs/branches/stats-prod/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/
labs/jbosslabs/branches/stats-prod/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/jboss-web.xml
labs/jbosslabs/branches/stats-prod/configuration/to-copy/server/default/deploy/jmx-console.war/
labs/jbosslabs/branches/stats-prod/index/src/main/webapp/WEB-INF/jboss-web.xml
Modified:
labs/jbosslabs/branches/stats-prod/index/src/main/webapp/WEB-INF/index-object.xml
labs/jbosslabs/branches/stats-prod/index/src/main/webapp/main.jsp
labs/jbosslabs/branches/stats-prod/kosmos/conf/portlet/WEB-INF/kosmos-object.xml
labs/jbosslabs/branches/stats-prod/kosmos/maven.xml
labs/jbosslabs/branches/stats-prod/kosmos/src/java/hu/midori/kosmos/server/AbstractKosmosService.java
Log:
svn merge -r 21512:21543 https://svn.jboss.org/repos/labs/labs/jbosslabs/branches/stats-qa
Copied: labs/jbosslabs/branches/stats-prod/configuration/to-copy/server/default/deploy/jboss-portal.sar/conf (from rev 21543, labs/jbosslabs/branches/stats-qa/configuration/to-copy/server/default/deploy/jboss-portal.sar/conf)
Copied: labs/jbosslabs/branches/stats-prod/configuration/to-copy/server/default/deploy/jboss-portal.sar/conf/data (from rev 21543, labs/jbosslabs/branches/stats-qa/configuration/to-copy/server/default/deploy/jboss-portal.sar/conf/data)
Deleted: labs/jbosslabs/branches/stats-prod/configuration/to-copy/server/default/deploy/jboss-portal.sar/conf/data/default-object.xml
===================================================================
--- labs/jbosslabs/branches/stats-qa/configuration/to-copy/server/default/deploy/jboss-portal.sar/conf/data/default-object.xml 2008-08-14 13:43:55 UTC (rev 21543)
+++ labs/jbosslabs/branches/stats-prod/configuration/to-copy/server/default/deploy/jboss-portal.sar/conf/data/default-object.xml 2008-08-14 13:52:44 UTC (rev 21544)
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<deployments>
- <deployment>
- <parent-ref/>
- <if-exists>keep</if-exists>
- <portal>
- <portal-name>default</portal-name>
- <properties>
- <!--
- | Set the layout for the default portal, see also portal-layouts.xml.
- -->
- <property>
- <name>layout.id</name>
- <value>generic</value>
- </property>
- <!--
- | Set the theme for the default portal, see also portal-themes.xml.
- -->
- <property>
- <name>theme.id</name>
- <value>Nphalanx</value>
- </property>
- <!--
- | Set the default render set name (used by the render tag in layouts), see also portal-renderSet.xml
- -->
- <property>
- <name>theme.renderSetId</name>
- <value>divRenderer</value>
- </property>
- <!--
- | Set the default strategy name (used by the strategy interceptor), see also portal-strategies.xml
- -->
- <property>
- <name>layout.strategyId</name>
- <value>maximizedRegion</value>
- </property>
- <!--
- | The default page name, if the property is not explicited then the default page name is "default"
- -->
- <property>
- <name>portal.defaultObjectName</name>
- <value>default</value>
- </property>
- </properties>
- <supported-modes>
- <mode>view</mode>
- <mode>edit</mode>
- <mode>help</mode>
- </supported-modes>
- <supported-window-states>
- <window-state>normal</window-state>
- <window-state>minimized</window-state>
- <window-state>maximized</window-state>
- </supported-window-states>
-
- </portal>
- </deployment>
-
-
-</deployments>
Copied: labs/jbosslabs/branches/stats-prod/configuration/to-copy/server/default/deploy/jboss-portal.sar/conf/data/default-object.xml (from rev 21543, labs/jbosslabs/branches/stats-qa/configuration/to-copy/server/default/deploy/jboss-portal.sar/conf/data/default-object.xml)
===================================================================
--- labs/jbosslabs/branches/stats-prod/configuration/to-copy/server/default/deploy/jboss-portal.sar/conf/data/default-object.xml (rev 0)
+++ labs/jbosslabs/branches/stats-prod/configuration/to-copy/server/default/deploy/jboss-portal.sar/conf/data/default-object.xml 2008-08-14 13:52:44 UTC (rev 21544)
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deployments>
+ <deployment>
+ <parent-ref/>
+ <if-exists>keep</if-exists>
+ <portal>
+ <portal-name>default</portal-name>
+ <properties>
+ <!--
+ | Set the layout for the default portal, see also portal-layouts.xml.
+ -->
+ <property>
+ <name>layout.id</name>
+ <value>generic</value>
+ </property>
+ <!--
+ | Set the theme for the default portal, see also portal-themes.xml.
+ -->
+ <property>
+ <name>theme.id</name>
+ <value>Nphalanx</value>
+ </property>
+ <!--
+ | Set the default render set name (used by the render tag in layouts), see also portal-renderSet.xml
+ -->
+ <property>
+ <name>theme.renderSetId</name>
+ <value>divRenderer</value>
+ </property>
+ <!--
+ | Set the default strategy name (used by the strategy interceptor), see also portal-strategies.xml
+ -->
+ <property>
+ <name>layout.strategyId</name>
+ <value>maximizedRegion</value>
+ </property>
+ <!--
+ | The default page name, if the property is not explicited then the default page name is "default"
+ -->
+ <property>
+ <name>portal.defaultObjectName</name>
+ <value>default</value>
+ </property>
+ </properties>
+ <supported-modes>
+ <mode>view</mode>
+ <mode>edit</mode>
+ <mode>help</mode>
+ </supported-modes>
+ <supported-window-states>
+ <window-state>normal</window-state>
+ <window-state>minimized</window-state>
+ <window-state>maximized</window-state>
+ </supported-window-states>
+
+ </portal>
+ </deployment>
+
+
+</deployments>
Copied: labs/jbosslabs/branches/stats-prod/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war (from rev 21543, labs/jbosslabs/branches/stats-qa/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war)
Copied: labs/jbosslabs/branches/stats-prod/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF (from rev 21543, labs/jbosslabs/branches/stats-qa/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF)
Deleted: labs/jbosslabs/branches/stats-prod/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/jboss-web.xml
===================================================================
--- labs/jbosslabs/branches/stats-qa/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/jboss-web.xml 2008-08-14 13:43:55 UTC (rev 21543)
+++ labs/jbosslabs/branches/stats-prod/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/jboss-web.xml 2008-08-14 13:52:44 UTC (rev 21544)
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<jboss-web>
- <security-domain>java:jaas/portal</security-domain>
- <context-root>/</context-root>
- <replication-config>
- <replication-trigger>SET_AND_GET</replication-trigger>
- <replication-type>SYNC</replication-type>
- </replication-config>
- <resource-ref>
- <res-ref-name>jdbc/PortalDS</res-ref-name>
- <jndi-name>java:PortalDS</jndi-name>
- </resource-ref>
-</jboss-web>
Copied: labs/jbosslabs/branches/stats-prod/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/jboss-web.xml (from rev 21543, labs/jbosslabs/branches/stats-qa/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/jboss-web.xml)
===================================================================
--- labs/jbosslabs/branches/stats-prod/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/jboss-web.xml (rev 0)
+++ labs/jbosslabs/branches/stats-prod/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/jboss-web.xml 2008-08-14 13:52:44 UTC (rev 21544)
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<jboss-web>
+ <security-domain>java:jaas/portal</security-domain>
+ <context-root>/</context-root>
+ <replication-config>
+ <replication-trigger>SET_AND_GET</replication-trigger>
+ <replication-type>SYNC</replication-type>
+ </replication-config>
+ <resource-ref>
+ <res-ref-name>jdbc/PortalDS</res-ref-name>
+ <jndi-name>java:PortalDS</jndi-name>
+ </resource-ref>
+</jboss-web>
Modified: labs/jbosslabs/branches/stats-prod/index/src/main/webapp/WEB-INF/index-object.xml
===================================================================
--- labs/jbosslabs/branches/stats-prod/index/src/main/webapp/WEB-INF/index-object.xml 2008-08-14 13:43:55 UTC (rev 21543)
+++ labs/jbosslabs/branches/stats-prod/index/src/main/webapp/WEB-INF/index-object.xml 2008-08-14 13:52:44 UTC (rev 21544)
@@ -6,7 +6,7 @@
<parent-ref>default</parent-ref>
<properties/>
<page>
- <page-name>index</page-name>
+ <page-name>default</page-name>
<properties>
<property>
<name>theme.id</name>
Deleted: labs/jbosslabs/branches/stats-prod/index/src/main/webapp/WEB-INF/jboss-web.xml
===================================================================
--- labs/jbosslabs/branches/stats-prod/index/src/main/webapp/WEB-INF/jboss-web.xml 2008-08-14 13:43:55 UTC (rev 21543)
+++ labs/jbosslabs/branches/stats-prod/index/src/main/webapp/WEB-INF/jboss-web.xml 2008-08-14 13:52:44 UTC (rev 21544)
@@ -1,4 +0,0 @@
-<?xml version="1.0"?>
-<jboss-web>
- <context-root/>
-</jboss-web>
Modified: labs/jbosslabs/branches/stats-prod/index/src/main/webapp/main.jsp
===================================================================
--- labs/jbosslabs/branches/stats-prod/index/src/main/webapp/main.jsp 2008-08-14 13:43:55 UTC (rev 21543)
+++ labs/jbosslabs/branches/stats-prod/index/src/main/webapp/main.jsp 2008-08-14 13:52:44 UTC (rev 21544)
@@ -1,6 +1,6 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<ul>
- <li><a href="/portal/portal/default/jira">JIRA Statistics</a></li>
- <li><a href="/portal/portal/default/svn">Subversion Repository Statistics</a></li>
+ <li><a href="/portal/jira">JIRA Statistics</a></li>
+ <li><a href="/portal/svn">Subversion Repository Statistics</a></li>
</ul>
\ No newline at end of file
Modified: labs/jbosslabs/branches/stats-prod/kosmos/conf/portlet/WEB-INF/kosmos-object.xml
===================================================================
--- labs/jbosslabs/branches/stats-prod/kosmos/conf/portlet/WEB-INF/kosmos-object.xml 2008-08-14 13:43:55 UTC (rev 21543)
+++ labs/jbosslabs/branches/stats-prod/kosmos/conf/portlet/WEB-INF/kosmos-object.xml 2008-08-14 13:52:44 UTC (rev 21544)
@@ -1,56 +1,136 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Configuration for JBoss Portal 2.2 -->
-<deployments>
- <deployment>
- <if-exists>overwrite</if-exists>
- <parent-ref>default</parent-ref>
- <properties/>
- <page>
- <page-name>jira</page-name>
+<deployments>
+ <deployment>
+ <parent-ref/>
+ <if-exists>keep</if-exists>
+ <portal>
+ <portal-name>jira</portal-name>
+ <properties>
+ <!--
+ | Set the layout for the default portal, see also portal-layouts.xml.
+ -->
+ <property>
+ <name>layout.id</name>
+ <value>generic</value>
+ </property>
+ <!--
+ | Set the theme for the default portal, see also portal-themes.xml.
+ -->
+ <property>
+ <name>theme.id</name>
+ <value>Nphalanx</value>
+ </property>
+ <!--
+ | Set the default render set name (used by the render tag in layouts), see also portal-renderSet.xml
+ -->
+ <property>
+ <name>theme.renderSetId</name>
+ <value>divRenderer</value>
+ </property>
+ <!--
+ | Set the default strategy name (used by the strategy interceptor), see also portal-strategies.xml
+ -->
+ <property>
+ <name>layout.strategyId</name>
+ <value>maximizedRegion</value>
+ </property>
+ <!--
+ | The default page name, if the property is not explicited then the default page name is "default"
+ -->
+ <property>
+ <name>portal.defaultObjectName</name>
+ <value>default</value>
+ </property>
+ </properties>
+ <supported-modes>
+ <mode>view</mode>
+ <mode>edit</mode>
+ <mode>help</mode>
+ </supported-modes>
+ <supported-window-states>
+ <window-state>normal</window-state>
+ <window-state>minimized</window-state>
+ <window-state>maximized</window-state>
+ </supported-window-states>
+ <page>
+ <page-name>default</page-name>
<properties>
<property>
- <name>theme.id</name>
- <value>org</value>
- </property>
+ <name>theme.id</name>
+ <value>org</value>
+ </property>
</properties>
- <window>
- <window-name>JBossJiraMonitoring</window-name>
- <instance-ref>JBossJiraMonitoringPortletInstance</instance-ref>
- <region>center</region>
- <height>1</height>
- </window>
- </page>
- </deployment>
-
- <deployment>
- <if-exists>overwrite</if-exists>
- <parent-ref>default</parent-ref>
- <properties/>
- <page>
- <page-name>svn</page-name>
- <properties>
- <property>
- <name>theme.id</name>
- <value>org</value>
- </property>
- </properties>
<window>
- <window-name>JBossSvnMonitoringPortlet</window-name>
- <instance-ref>JBossSvnMonitoringPortletInstance</instance-ref>
+ <window-name>JBossJiraMonitoring</window-name>
+ <instance-ref>JBossJiraMonitoringPortletInstance</instance-ref>
<region>center</region>
<height>1</height>
</window>
</page>
+ </portal>
</deployment>
-
- <!--
+
<deployment>
- <if-exists>overwrite</if-exists>
- <parent-ref>default</parent-ref>
- <properties/>
- <page>
- <page-name>SourceForge</page-name>
- <properties/>
+ <parent-ref/>
+ <if-exists>keep</if-exists>
+ <portal>
+ <portal-name>svn</portal-name>
+ <properties>
+ <!--
+ | Set the layout for the default portal, see also portal-layouts.xml.
+ -->
+ <property>
+ <name>layout.id</name>
+ <value>generic</value>
+ </property>
+ <!--
+ | Set the theme for the default portal, see also portal-themes.xml.
+ -->
+ <property>
+ <name>theme.id</name>
+ <value>Nphalanx</value>
+ </property>
+ <!--
+ | Set the default render set name (used by the render tag in layouts), see also portal-renderSet.xml
+ -->
+ <property>
+ <name>theme.renderSetId</name>
+ <value>divRenderer</value>
+ </property>
+ <!--
+ | Set the default strategy name (used by the strategy interceptor), see also portal-strategies.xml
+ -->
+ <property>
+ <name>layout.strategyId</name>
+ <value>maximizedRegion</value>
+ </property>
+ <!--
+ | The default page name, if the property is not explicited then the default page name is "default"
+ -->
+ <property>
+ <name>portal.defaultObjectName</name>
+ <value>default</value>
+ </property>
+ </properties>
+ <supported-modes>
+ <mode>view</mode>
+ <mode>edit</mode>
+ <mode>help</mode>
+ </supported-modes>
+ <supported-window-states>
+ <window-state>normal</window-state>
+ <window-state>minimized</window-state>
+ <window-state>maximized</window-state>
+ </supported-window-states>
+ <page>
+ <page-name>default</page-name>
+ <properties>
+ <property>
+ <name>theme.id</name>
+ <value>org</value>
+ </property>
+ </properties>
<window>
<window-name>JBossSvnMonitoringPortlet</window-name>
<instance-ref>JBossSvnMonitoringPortletInstance</instance-ref>
@@ -58,8 +138,8 @@
<height>1</height>
</window>
</page>
+ </portal>
</deployment>
- -->
<deployment>
<if-exists>overwrite</if-exists>
@@ -72,14 +152,6 @@
<deployment>
<if-exists>overwrite</if-exists>
<instance>
- <instance-name>JBossProductsSfMonitoringPortletInstance</instance-name>
- <component-ref>kosmos-portal.JBossProductsSfMonitoringPortlet</component-ref>
- </instance>
- </deployment>
-
- <deployment>
- <if-exists>overwrite</if-exists>
- <instance>
<instance-name>JBossSvnMonitoringPortletInstance</instance-name>
<component-ref>kosmos-portal.JBossSvnMonitoringPortlet</component-ref>
</instance>
Modified: labs/jbosslabs/branches/stats-prod/kosmos/maven.xml
===================================================================
--- labs/jbosslabs/branches/stats-prod/kosmos/maven.xml 2008-08-14 13:43:55 UTC (rev 21543)
+++ labs/jbosslabs/branches/stats-prod/kosmos/maven.xml 2008-08-14 13:52:44 UTC (rev 21544)
@@ -10,6 +10,14 @@
<attainGoal name="build"/>
<attainGoal name="deploy"/>
</goal>
+
+ <!-- Convenience goal that lets you reload portlet configuration (for example change monitored projects) without restarting the server -->
+ <goal name="all-portlet">
+ <ant:delete dir="${local.deploy.dir}/kosmos-portlet.war" />
+ <ant:delete dir="target"/>
+ <attainGoal name="build-portlet"/>
+ <attainGoal name="deploy-portlet"/>
+ </goal>
<goal name="clean">
<ant:delete dir="${local.deploy.dir}/kosmos-server.war" />
@@ -18,10 +26,12 @@
</goal>
<goal name="build">
-
<attainGoal name="java:compile" />
-
- <!-- Fill server templates -->
+ <attainGoal name="build-server"/>
+ <attainGoal name="build-portlet"/>
+ </goal>
+
+ <goal name="build-server">
<ant:copy tofile="conf/server/classes/ehcache.xml" file="conf/server/classes/ehcache.template.xml" overwrite="true"/>
<ant:replace file="conf/server/classes/ehcache.xml" propertyFile="kosmos.properties">
<ant:replacefilter token="#{kosmos.cache.timeout.seconds}" property="kosmos.cache.timeout.seconds"/>
@@ -35,15 +45,15 @@
<ant:replacefilter token="#{kosmos.webdav.user}" property="kosmos.webdav.user"/>
<ant:replacefilter token="#{kosmos.webdav.password}" property="kosmos.webdav.password"/>
</ant:replace>
-
- <!-- Fill portlet templates -->
+ </goal>
+
+ <goal name="build-portlet">
<ant:copy tofile="conf/portlet/WEB-INF/portlet.xml" file="conf/portlet/WEB-INF/portlet.template.xml" overwrite="true"/>
<ant:replace file="conf/portlet/WEB-INF/portlet.xml" propertyFile="kosmos.properties">
<ant:replacefilter token="#{kosmos.server.url}" property="kosmos.server.url"/>
</ant:replace>
-
- </goal>
-
+ </goal>
+
<goal name="deploy">
<attainGoal name="deploy-server"/>
<attainGoal name="deploy-portlet"/>
Modified: labs/jbosslabs/branches/stats-prod/kosmos/src/java/hu/midori/kosmos/server/AbstractKosmosService.java
===================================================================
--- labs/jbosslabs/branches/stats-prod/kosmos/src/java/hu/midori/kosmos/server/AbstractKosmosService.java 2008-08-14 13:43:55 UTC (rev 21543)
+++ labs/jbosslabs/branches/stats-prod/kosmos/src/java/hu/midori/kosmos/server/AbstractKosmosService.java 2008-08-14 13:52:44 UTC (rev 21544)
@@ -6,6 +6,7 @@
*/
package hu.midori.kosmos.server;
+import hu.midori.kosmos.model.ScmRepositoryChange;
import hu.midori.kosmos.model.util.ZoomableImageLocator;
import hu.midori.kosmos.server.store.StaticContentStore;
import hu.midori.kosmos.server.util.ChartUtils;
@@ -181,8 +182,8 @@
int i = 0;
for (Object object : data) {
- ret.add(data.get(i)); // Hope all passed lists perform get(i) in O(1)
- i++;
+ ret.add(object);
+ i++;
if (i == MAX_LIST_SIZE)
return ret;
}
More information about the jboss-svn-commits
mailing list