[jboss-svn-commits] JBL Code SVN: r35564 - in labs/jbosslabs/labs-3.0-build/integration/sbs/reports: trunk and 5 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Oct 19 08:23:49 EDT 2010
Author: lkrzyzanek
Date: 2010-10-19 08:23:49 -0400 (Tue, 19 Oct 2010)
New Revision: 35564
Added:
labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/
labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/java/org/
labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/plugin/plugin.xml
labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/plugin/resources/templates/admin/
labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/plugin/schema.xml
labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/plugin/spring.xml
labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/plugin/struts.xml
labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/resources/plugin_i18n.properties
Removed:
labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/plugin/plugin.xml
labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/plugin/struts.xml
labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/resources/plugin_i18n.properties
Modified:
labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/java/org/jboss/community/sbs/plugin/reports/dao/DbRedHatUsersDAOImpl.java
Log:
Fixed CREATE_SNAPSHOT
Copied: labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk (from rev 35557, labs/jbosslabs/labs-3.0-build/integration/sbs-reports/trunk)
Property changes on: labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk
___________________________________________________________________
Name: svn:ignore
+ target
.classpath
.project
.settings
Copied: labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/java/org (from rev 35562, labs/jbosslabs/labs-3.0-build/integration/sbs-reports/trunk/src/main/java/org)
Modified: labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/java/org/jboss/community/sbs/plugin/reports/dao/DbRedHatUsersDAOImpl.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-reports/trunk/src/main/java/org/jboss/community/sbs/plugin/reports/dao/DbRedHatUsersDAOImpl.java 2010-10-19 11:56:57 UTC (rev 35562)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/java/org/jboss/community/sbs/plugin/reports/dao/DbRedHatUsersDAOImpl.java 2010-10-19 12:23:49 UTC (rev 35564)
@@ -43,7 +43,7 @@
private static final String SELECT_REDHAT_USERS_COUNTS = "SELECT created, count(userID) FROM reportsRedHatUsers GROUP BY created";
- private static final String CREATE_SNAPSHOT = "INSERT usersRedHat SELECT DISTINCT u.userId, ? "
+ private static final String CREATE_SNAPSHOT = "INSERT reportsRedHatUsers SELECT DISTINCT u.userId, ? "
+ "FROM jiveUser u LEFT JOIN jiveUserProfile uphd ON u.userID=uphd.userID LEFT JOIN jiveUserProfile upld ON u.userID=upld.userID and upld.fieldID=5005 "
+ "WHERE uphd.fieldID=10 and uphd.value is not null and now() > STR_TO_DATE(uphd.value,'%m/%d/%Y') and (upld.value is null or now() <= STR_TO_DATE(upld.value,'%m/%d/%Y'))";
Deleted: labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/plugin/plugin.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-reports/trunk/src/main/plugin/plugin.xml 2010-10-19 07:34:28 UTC (rev 35557)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/plugin/plugin.xml 2010-10-19 12:23:49 UTC (rev 35564)
@@ -1,10 +0,0 @@
-<plugin xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://www.jivesoftware.com/schemas/clearspace/1_1/plugin.xsd">
- <name>script-console</name>
- <description>JBoss Community Reports</description>
- <author>JBoss Community</author>
- <version>1.0.0</version>
- <minServerVersion>4.5.0</minServerVersion>
-
-
-</plugin>
Copied: labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/plugin/plugin.xml (from rev 35562, labs/jbosslabs/labs-3.0-build/integration/sbs-reports/trunk/src/main/plugin/plugin.xml)
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/plugin/plugin.xml (rev 0)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/plugin/plugin.xml 2010-10-19 12:23:49 UTC (rev 35564)
@@ -0,0 +1,26 @@
+<plugin xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://www.jivesoftware.com/schemas/clearspace/1_1/plugin.xsd">
+ <name>reports</name>
+ <description>JBoss Community Reports</description>
+ <author>JBoss Community</author>
+ <version>1.0.0</version>
+ <minServerVersion>4.5.0</minServerVersion>
+
+ <databaseKey>reports</databaseKey>
+ <databaseVersion>1</databaseVersion>
+
+ <components>
+ <component id="admin-console">
+ <tab id="reports">
+ <section id="reports-jbossreports" name="plugin.reports.admin.tab.name"
+ description="plugin.reports.admin.tab.description">
+
+ <item id="reports-jbossreports-rhusers" name="plugin.reports.admin.rhusers.name"
+ url="redhat-users.jspa" description="plugin.reports.admin.rhusers.description" />
+
+ </section>
+ </tab>
+ </component>
+ </components>
+
+</plugin>
Copied: labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/plugin/resources/templates/admin (from rev 35562, labs/jbosslabs/labs-3.0-build/integration/sbs-reports/trunk/src/main/plugin/resources/templates/admin)
Copied: labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/plugin/schema.xml (from rev 35562, labs/jbosslabs/labs-3.0-build/integration/sbs-reports/trunk/src/main/plugin/schema.xml)
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/plugin/schema.xml (rev 0)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/plugin/schema.xml 2010-10-19 12:23:49 UTC (rev 35564)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema name="reports">
+ <table name="reportsRedHatUsers" description="Snapshot of Red Hat users">
+ <column name="userID" type="bigint" nullable="false" description="User ID" />
+ <column name="created" type="bigint" nullable="false" description="Time when snapshot is created" />
+ <index type="primary" name="reportsRHUsers_pk" column="userID,created" />
+ </table>
+</schema>
Copied: labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/plugin/spring.xml (from rev 35562, labs/jbosslabs/labs-3.0-build/integration/sbs-reports/trunk/src/main/plugin/spring.xml)
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/plugin/spring.xml (rev 0)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/plugin/spring.xml 2010-10-19 12:23:49 UTC (rev 35564)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xsi:schemaLocation="
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd"
+ default-autowire="no" default-init-method="init" default-destroy-method="destroy">
+
+ <bean id="redHatUsersDAO" class="org.jboss.community.sbs.plugin.reports.dao.DbRedHatUsersDAOImpl">
+ <property name="dataSource">
+ <util:property-path path="dataSourceFactory.dataSource" />
+ </property>
+ </bean>
+
+</beans>
Deleted: labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/plugin/struts.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-reports/trunk/src/main/plugin/struts.xml 2010-10-19 07:34:28 UTC (rev 35557)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/plugin/struts.xml 2010-10-19 12:23:49 UTC (rev 35564)
@@ -1,7 +0,0 @@
-<!DOCTYPE struts PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN" "http://struts.apache.org/dtds/struts-2.0.dtd">
-<struts>
- <package name="script-console-actions" namespace="/admin"
- extends="community-admin-default">
-
- </package>
-</struts>
Copied: labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/plugin/struts.xml (from rev 35562, labs/jbosslabs/labs-3.0-build/integration/sbs-reports/trunk/src/main/plugin/struts.xml)
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/plugin/struts.xml (rev 0)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/plugin/struts.xml 2010-10-19 12:23:49 UTC (rev 35564)
@@ -0,0 +1,19 @@
+<!DOCTYPE struts PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN" "http://struts.apache.org/dtds/struts-2.0.dtd">
+<struts>
+ <package name="jbossreports-actions" namespace="/admin" extends="community-admin-default">
+
+ <action name="redhat-users" class="org.jboss.community.sbs.plugin.reports.struts.AdminRHUsersAction" method="input">
+ <result name="input" type="freemarker">
+ /plugins/reports/resources/templates/admin/rhusers.ftl
+ </result>
+ </action>
+
+ <action name="redhat-users-create-snapshot" class="org.jboss.community.sbs.plugin.reports.struts.AdminRHUsersAction"
+ method="execute">
+ <result name="input" type="freemarker">
+ /plugins/reports/resources/templates/admin/rhusers.ftl
+ </result>
+ </action>
+
+ </package>
+</struts>
Deleted: labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/resources/plugin_i18n.properties
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-reports/trunk/src/main/resources/plugin_i18n.properties 2010-10-19 07:34:28 UTC (rev 35557)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/resources/plugin_i18n.properties 2010-10-19 12:23:49 UTC (rev 35564)
@@ -1,9 +0,0 @@
-plugin.script-console.admin.console.name=Scripting Console
-plugin.script-console.admin.console.description=Execute your scripts in Jive SBS administration console
-
-plugin.script-console.admin.console.scriptcontent=Script content
-plugin.script-console.admin.console.submit=Execute
-
-plugin.script-console.admin.console.text.sucess=Script successfuly executed. See the result.
-plugin.script-console.admin.console.text.error.common=Error occur during execution. See the result.
-plugin.script-console.admin.console.text.error.nosuchmethod=Script must contain at least function run(ctx).
\ No newline at end of file
Copied: labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/resources/plugin_i18n.properties (from rev 35562, labs/jbosslabs/labs-3.0-build/integration/sbs-reports/trunk/src/main/resources/plugin_i18n.properties)
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/resources/plugin_i18n.properties (rev 0)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/resources/plugin_i18n.properties 2010-10-19 12:23:49 UTC (rev 35564)
@@ -0,0 +1,7 @@
+plugin.reports.admin.tab.name=Custom
+plugin.reports.admin.tab.description=Customized reports for JBoss Community
+
+plugin.reports.admin.rhusers.name=Red Hat Users
+plugin.reports.admin.rhusers.description=List of Red Hat Users snapshots
+plugin.reports.admin.rhusers.submit=Create Snapshot
+plugin.reports.admin.rhusers.text.created=Snapshot successfuly created
\ No newline at end of file
More information about the jboss-svn-commits
mailing list