[jboss-svn-commits] JBL Code SVN: r12626 - in labs/jbosslabs/trunk/stats-server/kosmos: conf/server and 1 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Fri Jun 15 14:09:47 EDT 2007 

Author: wrzep
Date: 2007-06-15 14:09:47 -0400 (Fri, 15 Jun 2007)
New Revision: 12626

Added:
   labs/jbosslabs/trunk/stats-server/kosmos/conf/server/classes/ehcache.template.xml
   labs/jbosslabs/trunk/stats-server/kosmos/conf/server/kosmos-services-servlet.template.xml
   labs/jbosslabs/trunk/stats-server/kosmos/kosmos.properties.sample
Removed:
   labs/jbosslabs/trunk/stats-server/kosmos/conf/server/classes/ehcache.xml.sample
   labs/jbosslabs/trunk/stats-server/kosmos/conf/server/kosmos-services-servlet.xml.sample
Modified:
   labs/jbosslabs/trunk/stats-server/kosmos/
   labs/jbosslabs/trunk/stats-server/kosmos/maven.xml
Log:
JBLAB-868



Property changes on: labs/jbosslabs/trunk/stats-server/kosmos
___________________________________________________________________
Name: svn:ignore
   - build.properties
target



   + build.properties
target
kosmos.properties



Added: labs/jbosslabs/trunk/stats-server/kosmos/conf/server/classes/ehcache.template.xml
===================================================================
--- labs/jbosslabs/trunk/stats-server/kosmos/conf/server/classes/ehcache.template.xml	                        (rev 0)
+++ labs/jbosslabs/trunk/stats-server/kosmos/conf/server/classes/ehcache.template.xml	2007-06-15 18:09:47 UTC (rev 12626)
@@ -0,0 +1,10 @@
+<ehcache>
+  <diskStore path="java.io.tmpdir"/>
+
+  <!-- durations need to be longer than the "repeatInterval" property of the "serviceResultUpdateTrigger" bean -->
+  <defaultCache name="hu.midori.kosmos.server.defaultCache" maxElementsInMemory="#{kosmos.cache.maxelements}" eternal="false"
+	  timeToIdleSeconds="#{kosmos.cache.timeout.seconds}" timeToLiveSeconds="#{kosmos.cache.timeout.seconds}" overflowToDisk="true" diskPersistent="true"/>
+
+  <cache name="hu.midori.kosmos.server.cache" maxElementsInMemory="#{kosmos.cache.maxelements}" eternal="false"
+	  timeToIdleSeconds="#{kosmos.cache.timeout.seconds}" timeToLiveSeconds="#{kosmos.cache.timeout.seconds}" overflowToDisk="true" diskPersistent="true"/>
+</ehcache>

Deleted: labs/jbosslabs/trunk/stats-server/kosmos/conf/server/classes/ehcache.xml.sample
===================================================================
--- labs/jbosslabs/trunk/stats-server/kosmos/conf/server/classes/ehcache.xml.sample	2007-06-15 17:35:27 UTC (rev 12625)
+++ labs/jbosslabs/trunk/stats-server/kosmos/conf/server/classes/ehcache.xml.sample	2007-06-15 18:09:47 UTC (rev 12626)
@@ -1,10 +0,0 @@
-<ehcache>
-  <diskStore path="java.io.tmpdir"/>
-
-  <!-- durations need to set longer than the "repeatInterval" property of the "serviceResultUpdateTrigger" bean -->
-  <defaultCache name="hu.midori.kosmos.server.defaultCache" maxElementsInMemory="1024" eternal="false"
-	  timeToIdleSeconds="180000" timeToLiveSeconds="18000" overflowToDisk="true" diskPersistent="true"/>
-
-  <cache name="hu.midori.kosmos.server.cache" maxElementsInMemory="1024" eternal="false"
-	  timeToIdleSeconds="180000" timeToLiveSeconds="180000" overflowToDisk="true" diskPersistent="true"/>
-</ehcache>

Added: labs/jbosslabs/trunk/stats-server/kosmos/conf/server/kosmos-services-servlet.template.xml
===================================================================
--- labs/jbosslabs/trunk/stats-server/kosmos/conf/server/kosmos-services-servlet.template.xml	                        (rev 0)
+++ labs/jbosslabs/trunk/stats-server/kosmos/conf/server/kosmos-services-servlet.template.xml	2007-06-15 18:09:47 UTC (rev 12626)
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+
+<beans>
+
+  <!-- JIRA service -->
+  <bean id="jiraService" class="hu.midori.kosmos.server.jira.JiraWebCrawlingServiceImpl">
+	<property name="store" ref="webdavStaticContentStore"/>
+  </bean>
+
+  <bean id="jiraServiceProxy" class="org.springframework.aop.framework.ProxyFactoryBean">
+	<property name="targetName" value="jiraService"/>
+	<property name="interceptorNames">
+	  <list>
+		<value>serviceCachePointCutAdvisor</value>
+	  </list>
+	</property>
+  </bean>
+
+  <bean name="/jira-service" class="org.springframework.remoting.caucho.HessianServiceExporter">
+	<property name="service" ref="jiraServiceProxy"/>
+	<property name="serviceInterface" value="hu.midori.kosmos.protocol.JiraService"/>
+  </bean>
+
+  <!-- SVN service -->
+  <bean id="svnService" class="hu.midori.kosmos.server.svn.SvnServiceImpl">
+	<property name="store" ref="webdavStaticContentStore"/>
+  </bean>
+
+  <bean id="svnServiceProxy" class="org.springframework.aop.framework.ProxyFactoryBean">
+	<property name="targetName" value="svnService"/>
+	<property name="interceptorNames">
+	  <list>
+		<value>serviceCachePointCutAdvisor</value>
+	  </list>
+	</property>
+  </bean>
+
+  <bean name="/svn-service" class="org.springframework.remoting.caucho.HessianServiceExporter">
+	<property name="service" ref="svnServiceProxy"/>
+	<property name="serviceInterface" value="hu.midori.kosmos.protocol.SvnService"/>
+  </bean>
+
+ <!-- Service result POJO cache -->
+  <bean id="cacheManager" class="org.springframework.cache.ehcache.EhCacheManagerFactoryBean">
+	<property name="configLocation" value="classpath:ehcache.xml"/>
+  </bean>
+
+  <bean id="serviceResultCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean">
+	<property name="cacheManager" ref="cacheManager"/>
+	<property name="cacheName" value="hu.midori.kosmos.server.cache"/>
+  </bean>
+
+  <!-- Service result cache interceptor -->
+  <bean id="serviceCacheInterceptor" class="hu.midori.kosmos.server.MethodResultCacheInterceptor">
+	<property name="cache" ref="serviceResultCache" />
+  </bean>
+
+  <bean id="serviceCachePointCutAdvisor" class="org.springframework.aop.support.RegexpMethodPointcutAdvisor">
+	<property name="advice">
+	  <ref local="serviceCacheInterceptor"/>
+	</property>
+	<property name="patterns">
+	  <list>
+		<value>hu.midori.kosmos.protocol.JiraService.getProjects</value>
+		<value>hu.midori.kosmos.protocol.SvnService.getRepositories</value>
+	  </list>
+	</property>
+  </bean>
+
+  <!-- Service result update scheduler -->
+  <bean name="serviceResultUpdaterJob" class="org.springframework.scheduling.quartz.JobDetailBean">
+	<property name="jobClass" value="hu.midori.kosmos.server.ServiceResultUpdaterJob"/>
+	<property name="jobDataAsMap">
+	  <map>
+		<entry key="cache" value-ref="serviceResultCache"/>
+	  </map>
+	</property>
+  </bean>
+
+  <bean id="serviceResultUpdateTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">
+	<property name="jobDetail" ref="serviceResultUpdaterJob"/>
+	<property name="cronExpression" value="#{kosmos.cache.update.cronexpr}"/>
+  </bean>
+
+  <bean class="org.springframework.scheduling.quartz.SchedulerFactoryBean">
+	<property name="triggers">
+	  <list>
+		<ref bean="serviceResultUpdateTrigger"/>
+	  </list>
+	</property>
+  </bean>
+
+  <!-- WebDAV static content store -->
+  <bean id="webdavStaticContentStore" class="hu.midori.kosmos.server.store.WebdavStaticContentStore">
+	<property name="webdavUrl" value="#{kosmos.webdav.url}"/><!-- Both HTTP and HTTPS protocol can be used here. -->
+	<property name="webdavUser" value="#{kosmos.webdav.user}"/>
+	<property name="webdavPassword" value="#{kosmos.webdav.password}"/>
+	<!--
+	  This URL will be used as base URL for the generated images.
+	  If you don't specify anything here, the value of "webdavUrl"
+	  will be used. Uncomment this, if you want to override that.
+
+	  <property name="clientUrl" value="http://myserver/my-webdav/kosmos-images"/>
+	-->
+  </bean>
+
+</beans>

Deleted: labs/jbosslabs/trunk/stats-server/kosmos/conf/server/kosmos-services-servlet.xml.sample
===================================================================
--- labs/jbosslabs/trunk/stats-server/kosmos/conf/server/kosmos-services-servlet.xml.sample	2007-06-15 17:35:27 UTC (rev 12625)
+++ labs/jbosslabs/trunk/stats-server/kosmos/conf/server/kosmos-services-servlet.xml.sample	2007-06-15 18:09:47 UTC (rev 12626)
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-
-<beans>
-
-  <!-- JIRA service -->
-  <bean id="jiraService" class="hu.midori.kosmos.server.jira.JiraWebCrawlingServiceImpl">
-	<property name="store" ref="webdavStaticContentStore"/>
-  </bean>
-
-  <bean id="jiraServiceProxy" class="org.springframework.aop.framework.ProxyFactoryBean">
-	<property name="targetName" value="jiraService"/>
-	<property name="interceptorNames">
-	  <list>
-		<value>serviceCachePointCutAdvisor</value>
-	  </list>
-	</property>
-  </bean>
-
-  <bean name="/jira-service" class="org.springframework.remoting.caucho.HessianServiceExporter">
-	<property name="service" ref="jiraServiceProxy"/>
-	<property name="serviceInterface" value="hu.midori.kosmos.protocol.JiraService"/>
-  </bean>
-
-  <!-- SVN service -->
-  <bean id="svnService" class="hu.midori.kosmos.server.svn.SvnServiceImpl">
-	<property name="store" ref="webdavStaticContentStore"/>
-  </bean>
-
-  <bean id="svnServiceProxy" class="org.springframework.aop.framework.ProxyFactoryBean">
-	<property name="targetName" value="svnService"/>
-	<property name="interceptorNames">
-	  <list>
-		<value>serviceCachePointCutAdvisor</value>
-	  </list>
-	</property>
-  </bean>
-
-  <bean name="/svn-service" class="org.springframework.remoting.caucho.HessianServiceExporter">
-	<property name="service" ref="svnServiceProxy"/>
-	<property name="serviceInterface" value="hu.midori.kosmos.protocol.SvnService"/>
-  </bean>
-
- <!-- Service result POJO cache -->
-  <bean id="cacheManager" class="org.springframework.cache.ehcache.EhCacheManagerFactoryBean">
-	<property name="configLocation" value="classpath:ehcache.xml"/>
-  </bean>
-
-  <bean id="serviceResultCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean">
-	<property name="cacheManager" ref="cacheManager"/>
-	<property name="cacheName" value="hu.midori.kosmos.server.cache"/>
-  </bean>
-
-  <!-- Service result cache interceptor -->
-  <bean id="serviceCacheInterceptor" class="hu.midori.kosmos.server.MethodResultCacheInterceptor">
-	<property name="cache" ref="serviceResultCache" />
-  </bean>
-
-  <bean id="serviceCachePointCutAdvisor" class="org.springframework.aop.support.RegexpMethodPointcutAdvisor">
-	<property name="advice">
-	  <ref local="serviceCacheInterceptor"/>
-	</property>
-	<property name="patterns">
-	  <list>
-		<value>hu.midori.kosmos.protocol.JiraService.getProjects</value>
-		<value>hu.midori.kosmos.protocol.SvnService.getRepositories</value>
-	  </list>
-	</property>
-  </bean>
-
-  <!-- Service result update scheduler -->
-  <bean name="serviceResultUpdaterJob" class="org.springframework.scheduling.quartz.JobDetailBean">
-	<property name="jobClass" value="hu.midori.kosmos.server.ServiceResultUpdaterJob"/>
-	<property name="jobDataAsMap">
-	  <map>
-		<entry key="cache" value-ref="serviceResultCache"/>
-	  </map>
-	</property>
-  </bean>
-
-  <bean id="serviceResultUpdateTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">
-	<property name="jobDetail" ref="serviceResultUpdaterJob"/>
-	<property name="cronExpression" value="0 0 0 * * ?"/> <!-- update at midnight -->
-  </bean>
-
-  <bean class="org.springframework.scheduling.quartz.SchedulerFactoryBean">
-	<property name="triggers">
-	  <list>
-		<ref bean="serviceResultUpdateTrigger"/>
-	  </list>
-	</property>
-  </bean>
-
-  <!-- WebDAV static content store -->
-  <bean id="webdavStaticContentStore" class="hu.midori.kosmos.server.store.WebdavStaticContentStore">
-	<property name="webdavUrl" value="http://localhost:8080/slide/files"/><!-- Both HTTP and HTTPS protocol can be used here. -->
-	<property name="webdavUser" value=""/>
-	<property name="webdavPassword" value=""/>
-	<!--
-	  This URL will be used as base URL for the generated images.
-	  If you don't specify anything here, the value of "webdavUrl"
-	  will be used. Uncomment this, if you want to override that.
-
-	  <property name="clientUrl" value="http://myserver/my-webdav/kosmos-images"/>
-	-->
-  </bean>
-
-</beans>

Added: labs/jbosslabs/trunk/stats-server/kosmos/kosmos.properties.sample
===================================================================
--- labs/jbosslabs/trunk/stats-server/kosmos/kosmos.properties.sample	                        (rev 0)
+++ labs/jbosslabs/trunk/stats-server/kosmos/kosmos.properties.sample	2007-06-15 18:09:47 UTC (rev 12626)
@@ -0,0 +1,12 @@
+# ehcache
+# timeout (a bit more than 2 days)
+kosmos.cache.timeout.seconds=180000
+kosmos.cache.maxelements=1024
+
+# auto-update (cron expression)
+kosmos.cache.update.cronexpr=0 0 0 * * ?
+
+# webdav
+kosmos.webdav.url=http://localhost:8080/slide/files
+kosmos.webdav.user=
+kosmos.webdav.password=
\ No newline at end of file

Modified: labs/jbosslabs/trunk/stats-server/kosmos/maven.xml
===================================================================
--- labs/jbosslabs/trunk/stats-server/kosmos/maven.xml	2007-06-15 17:35:27 UTC (rev 12625)
+++ labs/jbosslabs/trunk/stats-server/kosmos/maven.xml	2007-06-15 18:09:47 UTC (rev 12626)
@@ -4,21 +4,42 @@
   See terms of license at gnu.org. 
  -->
 <project xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:u="jelly:util">
+
     <goal name="all">
     		<attainGoal name="clean"/>
+    		<attainGoal name="build"/>
     		<attainGoal name="deploy"/>
     </goal>
     
     <goal name="clean">
  		<ant:delete dir="${local.deploy.dir}/kosmos-server.war" />
+ 		<ant:delete dir="target"/>
     </goal>
+    
+    <goal name="build">
+    
+    	<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"/>
+  			<ant:replacefilter token="#{kosmos.cache.maxelements}" property="kosmos.cache.maxelements"/>
+		</ant:replace>
+		
+		<ant:copy tofile="conf/server/kosmos-services-servlet.xml" file="conf/server/kosmos-services-servlet.template.xml" overwrite="true"/>
+		<ant:replace file="conf/server/kosmos-services-servlet.xml" propertyFile="kosmos.properties">
+  			<ant:replacefilter token="#{kosmos.cache.update.cronexpr}" property="kosmos.cache.update.cronexpr"/>
+  			<ant:replacefilter token="#{kosmos.webdav.url}" property="kosmos.webdav.url"/>
+  			<ant:replacefilter token="#{kosmos.webdav.user}" property="kosmos.webdav.user"/>  		
+  			<ant:replacefilter token="#{kosmos.webdav.password}" property="kosmos.webdav.password"/>  			
+		</ant:replace>
+		
+    </goal>
 
 	<goal name="deploy">
 		<ant:unzip src="to-copy/kosmos-server.war" dest="target/kosmos-server.war" overwrite="true" />
 		
 		<!-- Copying configuration files -->
 		<ant:copy todir="target/kosmos-server.war/WEB-INF" overwrite="true">
-		    <ant:fileset dir="conf/server" excludes="**/*.sample">
+		    <ant:fileset dir="conf/server" excludes="**/*.template.xml">
 				<ant:filename name="**/*" />
 		    </ant:fileset>
 		</ant:copy>

More information about the jboss-svn-commits mailing list