[jboss-svn-commits] JBL Code SVN: r15130 - in labs/jbosslabs/trunk/stats-server/sources: binaries and 6 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Sep 14 16:36:54 EDT 2007
Author: wrzep
Date: 2007-09-14 16:36:54 -0400 (Fri, 14 Sep 2007)
New Revision: 15130
Added:
labs/jbosslabs/trunk/stats-server/sources/binaries/mysql/
labs/jbosslabs/trunk/stats-server/sources/binaries/mysql/mysql-connector-java-5.0.5-bin.jar
Modified:
labs/jbosslabs/trunk/stats-server/sources/maven.xml
labs/jbosslabs/trunk/stats-server/sources/metrics/common/src/java/org/jboss/labs/metrics/common/Constants.java
labs/jbosslabs/trunk/stats-server/sources/metrics/maven.xml
labs/jbosslabs/trunk/stats-server/sources/metrics/service/project.properties
labs/jbosslabs/trunk/stats-server/sources/metrics/service/src/app/META-INF/jboss-service.xml
labs/jbosslabs/trunk/stats-server/sources/metrics/service/src/java/org/jboss/labs/metrics/service/impl/ScoresServiceImpl.java
labs/jbosslabs/trunk/stats-server/sources/project.xml
Log:
JBLAB-891
service build/deployment fixes
Added: labs/jbosslabs/trunk/stats-server/sources/binaries/mysql/mysql-connector-java-5.0.5-bin.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/stats-server/sources/binaries/mysql/mysql-connector-java-5.0.5-bin.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: labs/jbosslabs/trunk/stats-server/sources/maven.xml
===================================================================
--- labs/jbosslabs/trunk/stats-server/sources/maven.xml 2007-09-14 20:25:36 UTC (rev 15129)
+++ labs/jbosslabs/trunk/stats-server/sources/maven.xml 2007-09-14 20:36:54 UTC (rev 15130)
@@ -30,6 +30,12 @@
<ant:fileset dir="binaries/as/to-copy"/>
</ant:copy>
<echo>
+Installing MySQL driver.</echo>
+ <ant:copy todir="${local.server.dir}/server/default/lib" overwrite="true">
+ <ant:fileset dir="binaries/mysql"/>
+ </ant:copy>
+ <echo>
+
JBoss AS 4.2.1.GA is now installed.
Now you can run the build with "maven all" and later start the server with:
Modified: labs/jbosslabs/trunk/stats-server/sources/metrics/common/src/java/org/jboss/labs/metrics/common/Constants.java
===================================================================
--- labs/jbosslabs/trunk/stats-server/sources/metrics/common/src/java/org/jboss/labs/metrics/common/Constants.java 2007-09-14 20:25:36 UTC (rev 15129)
+++ labs/jbosslabs/trunk/stats-server/sources/metrics/common/src/java/org/jboss/labs/metrics/common/Constants.java 2007-09-14 20:36:54 UTC (rev 15130)
@@ -4,49 +4,44 @@
* @author Pawel Wrzeszcz
*/
public class Constants {
-
+
public static final int MAX_ATTEMPTS = 10;
-
- public static final String JMM_SCORES_SERVICE = "jmm:service=JMMService";
-
- public static final String JMM_SERVICE_ADDRESS = "service:jmx:rmi://localhost";
-
- public static final String STATUS_LOCAL_SERVICE = "ScoresService/local";
- //"java:/ScoresService/local";
- public static final String STATUS_REMOTE_SERVICE = "ScoresService/remote";
- //"java:/ScoresService/remote";
-
- public static final String DAILY_SCORES_UPDATER = "DailyScoresUpdater/local";
- public static final String DB_SERVICE = "ScoresDBService/local";
+ public static final int SCORES_UPDATE_INTERVAL_DEFAULT
+ = 24*60; /* minutes */
+ /* By default perform update every 24 hours */
- public static final String PROJECT_DETAILS_ACTION = "viewProjectDetails";
+ public static final int FIRST_UPDATE_INTERVAL_DEFAULT = 1;/* minutes */
+ /* By default perform first update after 1 minute */
- public static final String COLUMN_DETAILS_ACTION = "viewColumnDetails";
+ /* By default start at midnight */
+ public static final int UPDATE_START_HOUR_DEFAULT = 0;
- public static final long DEFAULT_PLUGIN_VALUE = 0;
-
- public static final long PLUGIN_DEFAULT_MIN_VALUE = Long.MIN_VALUE;
+ public static final int UPDATE_START_MINUTE_DEFAULT = 0;
public static final long CACHE_INTERVAL = 3*60*1000; /* milliseconds */
- /* Check for new scores every 3 minutes */
-
- public static final int SCORES_UPDATE_INTERVAL_DEFAULT
- = 24*60; /* minutes */
- /* By default perform update every 24 hours */
+ /* Check for new scores every 3 minutes */
- public static final int FIRST_UPDATE_INTERVAL_DEFAULT = 1;/* minutes */
- /* By default perform first update after 1 minute */
+ public static final String STATUS_LOCAL_SERVICE = "ScoresService/local";
+ //"java:/ScoresService/local";
+ public static final String STATUS_REMOTE_SERVICE = "ScoresService/remote";
+ //"java:/ScoresService/remote";
- /* By default start at midnight */
- public static final int UPDATE_START_HOUR_DEFAULT = 0;
+ public static final String METRICS_SCORES_SERVICE = "metrics:service=MetricService";
- public static final int UPDATE_START_MINUTE_DEFAULT = 0;
+ public static final String METICS_SERVICE_ADDRESS = "service:jmx:rmi://localhost";
+ public static final String DAILY_SCORES_UPDATER = "DailyScoresUpdater/local";
+ public static final String DB_SERVICE = "ScoresDBService/local";
+
+ public static final long DEFAULT_PLUGIN_VALUE = 0;
+
+ public static final long PLUGIN_DEFAULT_MIN_VALUE = Long.MIN_VALUE;
+
/**
* This class cannot be instatiated.
*/
private Constants() {};
-
+
}
Modified: labs/jbosslabs/trunk/stats-server/sources/metrics/maven.xml
===================================================================
--- labs/jbosslabs/trunk/stats-server/sources/metrics/maven.xml 2007-09-14 20:25:36 UTC (rev 15129)
+++ labs/jbosslabs/trunk/stats-server/sources/metrics/maven.xml 2007-09-14 20:36:54 UTC (rev 15130)
@@ -6,8 +6,8 @@
<project xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:u="jelly:util" xmlns:maven="jelly:maven">
<!-- Default war-project goals -->
- <goal name="all">
- <attainGoal name="clean" />
+ <goal name="all">
+ <attainGoal name="clean" />
<attainGoal name="build" />
<attainGoal name="deploy" />
</goal>
Modified: labs/jbosslabs/trunk/stats-server/sources/metrics/service/project.properties
===================================================================
--- labs/jbosslabs/trunk/stats-server/sources/metrics/service/project.properties 2007-09-14 20:25:36 UTC (rev 15129)
+++ labs/jbosslabs/trunk/stats-server/sources/metrics/service/project.properties 2007-09-14 20:36:54 UTC (rev 15130)
@@ -5,7 +5,7 @@
maven.ejb.includes=**/service/**,**/META-INF/**
maven.jar.override=on
-maven.jar.metrics-common=common/target/metrics-common.jar
+maven.jar.metrics-common=${stats.root.dir}/metrics/common/target/metrics-common.jar
metrics.service.final.name=metrics-service.ejb3
metrics.common.final.name=metrics-common.jar
Modified: labs/jbosslabs/trunk/stats-server/sources/metrics/service/src/app/META-INF/jboss-service.xml
===================================================================
--- labs/jbosslabs/trunk/stats-server/sources/metrics/service/src/app/META-INF/jboss-service.xml 2007-09-14 20:25:36 UTC (rev 15129)
+++ labs/jbosslabs/trunk/stats-server/sources/metrics/service/src/app/META-INF/jboss-service.xml 2007-09-14 20:36:54 UTC (rev 15130)
@@ -1,22 +1,36 @@
- <!-- Proxy factory for MyService that will call invoke(Invocation mi) on the target service -->
- <mbean code="org.jboss.invocation.jrmp.server.JRMPProxyFactory"
- name="jboss.jmx:type=adaptor,name=JMMService,protocol=jrmp,service=proxyFactory">
- <!-- Use the standard JRMPInvoker from conf/jboss-service.xml -->
- <depends optional-attribute-name="InvokerName">jboss:service=invoker,type=jrmp</depends>
- <!-- The target MBean -->
- <depends optional-attribute-name="TargetName">jmm:service=JMMService</depends>
- <!-- Where to bind the proxy factory -->
- <attribute name="JndiName">JMMService</attribute>
- <!-- Invoke invoke(Invocation mi) operation instead of the target method -->
- <attribute name="InvokeTargetMethod">false</attribute>
- <!-- MyService interface -->
- <attribute name="ExportedInterfaces">org.jboss.forge.jmm.common.protocol.ScoresService</attribute>
- <attribute name="ClientInterceptors">
- <interceptors>
- <interceptor>org.jboss.proxy.ClientMethodInterceptor</interceptor>
- <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
- <interceptor>org.jboss.jmx.connector.invoker.client.InvokerAdaptorClientInterceptor</interceptor>
- <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
- </interceptors>
- </attribute>
- </mbean>
\ No newline at end of file
+<!-- Proxy factory for MetricsService that will call invoke(Invocation mi) on the target service -->
+<mbean code="org.jboss.invocation.jrmp.server.JRMPProxyFactory"
+ name="jboss.jmx:type=adaptor,name=MetricsService,protocol=jrmp,service=proxyFactory">
+ <!-- Use the standard JRMPInvoker from conf/jboss-service.xml -->
+ <depends optional-attribute-name="InvokerName">
+ jboss:service=invoker,type=jrmp
+ </depends>
+ <!-- The target MBean -->
+ <depends optional-attribute-name="TargetName">
+ metrics:service=MetricsService
+ </depends>
+ <!-- Where to bind the proxy factory -->
+ <attribute name="JndiName">MetricsService</attribute>
+ <!-- Invoke invoke(Invocation mi) operation instead of the target method -->
+ <attribute name="InvokeTargetMethod">false</attribute>
+ <!-- MyService interface -->
+ <attribute name="ExportedInterfaces">
+ org.jboss.labs.metrics.common.protocol.ScoresService
+ </attribute>
+ <attribute name="ClientInterceptors">
+ <interceptors>
+ <interceptor>
+ org.jboss.proxy.ClientMethodInterceptor
+ </interceptor>
+ <interceptor>
+ org.jboss.proxy.SecurityInterceptor
+ </interceptor>
+ <interceptor>
+ org.jboss.jmx.connector.invoker.client.InvokerAdaptorClientInterceptor
+ </interceptor>
+ <interceptor>
+ org.jboss.invocation.InvokerInterceptor
+ </interceptor>
+ </interceptors>
+ </attribute>
+</mbean>
\ No newline at end of file
Modified: labs/jbosslabs/trunk/stats-server/sources/metrics/service/src/java/org/jboss/labs/metrics/service/impl/ScoresServiceImpl.java
===================================================================
--- labs/jbosslabs/trunk/stats-server/sources/metrics/service/src/java/org/jboss/labs/metrics/service/impl/ScoresServiceImpl.java 2007-09-14 20:25:36 UTC (rev 15129)
+++ labs/jbosslabs/trunk/stats-server/sources/metrics/service/src/java/org/jboss/labs/metrics/service/impl/ScoresServiceImpl.java 2007-09-14 20:36:54 UTC (rev 15130)
@@ -60,7 +60,7 @@
* @author Pawel Wrzeszcz (pawel.wrzeszcz [at] gmail.com)
*/
- at Service(objectName=Constants.JMM_SCORES_SERVICE)
+ at Service(objectName=Constants.METRICS_SCORES_SERVICE)
@Management(ScoresService.class)
public class ScoresServiceImpl implements ScoresService {
@@ -213,7 +213,7 @@
log.info("JMM service started.");
- Tools.startJMXService(Constants.JMM_SERVICE_ADDRESS);
+ Tools.startJMXService(Constants.METICS_SERVICE_ADDRESS);
log.info("Connector server for JMM started.");
}
Modified: labs/jbosslabs/trunk/stats-server/sources/project.xml
===================================================================
--- labs/jbosslabs/trunk/stats-server/sources/project.xml 2007-09-14 20:25:36 UTC (rev 15129)
+++ labs/jbosslabs/trunk/stats-server/sources/project.xml 2007-09-14 20:36:54 UTC (rev 15130)
@@ -5,6 +5,7 @@
See terms of license at gnu.org.
-->
<project>
+ <pomVersion>3</pomVersion>
<id>labs-stats-server</id>
<name>JBoss Labs Statistics Server</name>
</project>
More information about the jboss-svn-commits
mailing list