Menu
▾
▴
jboss-svn-commits — JBoss SVN commit notifications
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(233) |
Sep
(199) |
Oct
(206) |
Nov
(185) |
Dec
(270) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(232) |
Feb
(426) |
Mar
(623) |
Apr
(592) |
May
(506) |
Jun
(389) |
Jul
(160) |
Aug
(3) |
Sep
(1) |
Oct
(1) |
Nov
(2) |
Dec
(5) |
| 2007 |
Jan
(1) |
Feb
(1) |
Mar
(2) |
Apr
(2) |
May
(4) |
Jun
(2) |
Jul
|
Aug
(3) |
Sep
(5) |
Oct
(9) |
Nov
(6) |
Dec
(6) |
| 2008 |
Jan
(3) |
Feb
|
Mar
(1) |
Apr
(3) |
May
(3) |
Jun
(5) |
Jul
(10) |
Aug
(2) |
Sep
(12) |
Oct
(10) |
Nov
(54) |
Dec
(49) |
| 2009 |
Jan
(19) |
Feb
(13) |
Mar
(20) |
Apr
(24) |
May
(44) |
Jun
(29) |
Jul
(32) |
Aug
(10) |
Sep
(7) |
Oct
(10) |
Nov
(4) |
Dec
(17) |
| 2010 |
Jan
(14) |
Feb
(5) |
Mar
(23) |
Apr
(50) |
May
(31) |
Jun
(9) |
Jul
(5) |
Aug
(4) |
Sep
(7) |
Oct
(5) |
Nov
(2) |
Dec
(3) |
| 2011 |
Jan
(12) |
Feb
(5) |
Mar
(5) |
Apr
(3) |
May
(4) |
Jun
(3) |
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2012 |
Jan
(1) |
Feb
(2) |
Mar
|
Apr
(1) |
May
(1) |
Jun
(2) |
Jul
(4) |
Aug
(1) |
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(2) |
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(3) |
Sep
|
Oct
|
Nov
|
Dec
(1) |
| 2015 |
Jan
|
Feb
|
Mar
(2) |
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <jbo...@li...> - 2006-04-12 20:00:33
|
Author: dam...@jb... Date: 2006-04-12 16:00:30 -0400 (Wed, 12 Apr 2006) New Revision: 3659 Removed: labs/jbosslabs/branches/prod/labs/ Log: Obsolete. |
|
From: <jbo...@li...> - 2006-04-12 19:26:38
|
Author: dam...@jb... Date: 2006-04-12 15:26:34 -0400 (Wed, 12 Apr 2006) New Revision: 3658 Added: labs/jbosslabs/trunk/ Removed: trunk/forge/ Log: Moving forge. Copied: labs/jbosslabs/trunk (from rev 3657, trunk/forge) |
|
From: <jbo...@li...> - 2006-04-12 19:24:12
|
Author: dam...@jb... Date: 2006-04-12 15:24:08 -0400 (Wed, 12 Apr 2006) New Revision: 3657 Added: labs/reportingservices/trunk/ Removed: trunk/labs/reportingservices/reporting-services/ Log: Moving reporting services. Copied: labs/reportingservices/trunk (from rev 3656, trunk/labs/reportingservices/reporting-services) |
|
From: <jbo...@li...> - 2006-04-12 19:23:31
|
Author: dam...@jb... Date: 2006-04-12 15:23:29 -0400 (Wed, 12 Apr 2006) New Revision: 3656 Added: labs/reportingservices/tags/ Log: Moving reporting services. |
|
From: <jbo...@li...> - 2006-04-12 19:23:29
|
Author: dam...@jb... Date: 2006-04-12 15:23:24 -0400 (Wed, 12 Apr 2006) New Revision: 3655 Added: labs/reportingservices/branches/ Log: Moving reporting services. |
|
From: <jbo...@li...> - 2006-04-12 19:23:21
|
Author: dam...@jb... Date: 2006-04-12 15:23:19 -0400 (Wed, 12 Apr 2006) New Revision: 3654 Added: labs/reportingservices/ Log: Moving reporting services. |
|
From: <jbo...@li...> - 2006-04-12 19:18:56
|
Author: aron.gombas
Date: 2006-04-12 15:18:24 -0400 (Wed, 12 Apr 2006)
New Revision: 3653
Added:
labs/kosmos/trunk/src/java/hu/midori/kosmos/server/ServiceResultUpdaterJob.java
labs/kosmos/trunk/src/java/hu/midori/kosmos/server/UpdateableCachedValue.java
labs/kosmos/trunk/web-server/WEB-INF/lib/quartz-1.5.2.jar
Modified:
labs/kosmos/trunk/src/java/hu/midori/kosmos/server/MethodResultCacheInterceptor.java
labs/kosmos/trunk/web-server/WEB-INF/classes/ehcache.xml
labs/kosmos/trunk/web-server/WEB-INF/kosmos-services-servlet.xml
Log:
Initial import of the update scheduler
Modified: labs/kosmos/trunk/src/java/hu/midori/kosmos/server/MethodResultCacheInterceptor.java
===================================================================
--- labs/kosmos/trunk/src/java/hu/midori/kosmos/server/MethodResultCacheInterceptor.java 2006-04-12 19:17:50 UTC (rev 3652)
+++ labs/kosmos/trunk/src/java/hu/midori/kosmos/server/MethodResultCacheInterceptor.java 2006-04-12 19:18:24 UTC (rev 3653)
@@ -26,54 +26,56 @@
* @version $Id$
*/
public class MethodResultCacheInterceptor implements MethodInterceptor {
- private final static Log log = LogFactory.getLog(MethodResultCacheInterceptor.class);
+ private final static Log log = LogFactory.getLog(MethodResultCacheInterceptor.class);
- /** <i>EHCache</i> implementation. */
- private Cache cache;
+ /** <i>EHCache</i> implementation. */
+ private Cache cache;
- public void setCache(Cache cache) {
- this.cache = cache;
- }
+ public void setCache(Cache cache) {
+ this.cache = cache;
+ }
- /** Caches the return value of the intercepted method. */
- public Object invoke(MethodInvocation invocation) throws Throwable {
- log.debug(String.format("Accessing cache \"%s\" [%d items]...", cache.getName(), cache.getSize()));
+ /** Caches the return value of the intercepted method. */
+ public Object invoke(MethodInvocation invocation) throws Throwable {
+ log.debug(String.format("Accessing cache \"%s\" [%d items]...", cache.getName(), cache.getSize()));
- // look-up
- String targetName = invocation.getThis().getClass().getName();
- String methodName = invocation.getMethod().getName();
- Object[] arguments = invocation.getArguments();
- String key = getCacheKey(targetName, methodName, arguments);
- Element element = cache.get(key);
- if(element != null) {
- log.info(String.format("Cache-hit: \"%s\" returned from cache", key));
- return element.getValue();
- }
+ // look-up
+ String targetName = invocation.getThis().getClass().getName();
+ String methodName = invocation.getMethod().getName();
+ Object[] arguments = invocation.getArguments();
+ String key = getCacheKey(targetName, methodName, arguments);
+ Element element = cache.get(key);
+ if(element != null) {
+ log.info(String.format("Cache-hit: \"%s\" returned from cache (%d minutes old)", key, (System.currentTimeMillis() - element.getCreationTime()) / 1000 / 60));
+ UpdateableCachedValue value = (UpdateableCachedValue)element.getValue();
+ return value.getMethodResult();
+ }
- // call target if not found
- log.info(String.format("Cache-miss: reloading \"%s\"...", key));
- Serializable value = (Serializable)invocation.proceed();
- if(value != null) {
- cache.put(new Element(key, value));
- log.debug(String.format("\"%s\" saved to cache", key));
- }
+ // call target if not found
+ log.info(String.format("Cache-miss: reloading \"%s\"...", key));
+ Serializable methodResult = (Serializable)invocation.proceed();
+ if(methodResult != null) {
+ // save invocation information along with the method result
+ cache.put(new Element(key, new UpdateableCachedValue(invocation, methodResult)));
+ log.debug(String.format("\"%s\" saved to cache", key));
+ }
- return value;
- }
+ return methodResult;
+ }
- /**
- * Returns the cache key in the format
- * <code>targetName.methodName.argument0.argument1 ...</code>.
- */
- private String getCacheKey(String targetName, String methodName, Object[] arguments) {
- StringBuffer buffer = new StringBuffer();
+ /**
+ * Returns the cache key in the format
+ * <code>targetName.methodName.argument0.argument1 ...</code>.
+ */
+ private String getCacheKey(String targetName, String methodName, Object[] arguments) {
+ StringBuffer buffer = new StringBuffer();
- buffer.append(targetName).append(".").append(methodName);
- if ((arguments != null) && (arguments.length != 0)) {
- for (int i=0; i<arguments.length; i++)
- buffer.append(".").append(arguments[i]);
- }
+ buffer.append(targetName).append(".").append(methodName);
+ if ((arguments != null) && (arguments.length != 0)) {
+ for (int i=0; i<arguments.length; i++)
+ buffer.append(".").append(arguments[i]);
+ }
- return buffer.toString();
- }
+ return buffer.toString();
+ }
}
Added: labs/kosmos/trunk/src/java/hu/midori/kosmos/server/ServiceResultUpdaterJob.java
===================================================================
--- labs/kosmos/trunk/src/java/hu/midori/kosmos/server/ServiceResultUpdaterJob.java 2006-04-12 19:17:50 UTC (rev 3652)
+++ labs/kosmos/trunk/src/java/hu/midori/kosmos/server/ServiceResultUpdaterJob.java 2006-04-12 19:18:24 UTC (rev 3653)
@@ -0,0 +1,77 @@
+/*
+ * Kosmos.
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+package hu.midori.kosmos.server;
+
+import java.io.Serializable;
+import java.util.Iterator;
+
+import net.sf.ehcache.Cache;
+import net.sf.ehcache.Element;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.quartz.JobExecutionContext;
+import org.quartz.StatefulJob;
+import org.springframework.scheduling.quartz.QuartzJobBean;
+import org.springframework.util.MethodInvoker;
+
+/**
+ * <i>Quartz</i> job for scheduled updates of the content of the cache.
+ * It is stateful to avoid expensive concurrent updates.
+ *
+ * @author <a href="mailto:aro...@mi...">Aron Gombas</a>
+ * @version $Id$
+ */
+public class ServiceResultUpdaterJob extends QuartzJobBean implements StatefulJob {// TODO vagy CacheUpdaterJob
+ private final static Log log = LogFactory.getLog(ServiceResultUpdaterJob.class);
+
+ /** <i>EHCache</i> implementation. */
+ private Cache cache;
+
+ public void setCache(Cache cache) {
+ this.cache = cache;
+ }
+
+ /** Updates the content of the cache, triggered by an external scheduler. */
+ @Override
+ protected void executeInternal(JobExecutionContext executionContext) {
+ log.info("Running scheduled update job...");
+
+ // iterate through the current content of the cache
+ for(Iterator it = cache.getKeys().iterator(); it.hasNext();) {
+ Serializable key = (Serializable)it.next();
+ log.info(String.format("Updating \"%s\"...", key));
+
+ // reinvoke the service method based on the saved information
+ try {
+ UpdateableCachedValue value = (UpdateableCachedValue)cache.get(key).getValue();
+
+ MethodInvoker invoker = new MethodInvoker();
+ invoker.setTargetObject(value.getInvocation().getThis());
+ invoker.setTargetMethod(value.getInvocation().getMethod().getName());
+ invoker.setArguments(value.getInvocation().getArguments());
+ invoker.prepare();
+ Serializable methodResult = (Serializable)invoker.invoke();
+
+ // update cache
+ if(methodResult != null) {
+ // save the unmodified invocation information along with the method result (thread safe)
+ cache.remove(key);
+ cache.put(new Element(key, new UpdateableCachedValue(value.getInvocation(), methodResult)));
+ log.debug(String.format("\"%s\" updated in cache", key));
+ }
+ } catch(Exception ex) {
+ log.error("Unable to reinvoke service method", ex);
+ }
+ }
+
+ log.info("Update job completed.");
+ }
+}
+
+//DOC: ez fuggetlen a user requestek-tol es nincs is szinkronizalva, igy lehet h egyszerre tobb frissites tortenik! (nem kivedheto, hiszen cancel is tortenhet)
+//DOC: service POJO-knak thread safe-nek kell lennie vagy ugy szinkronizalni, h 2 ne mehessen egyszerre, de a user-e legyen az elsobbseg
Added: labs/kosmos/trunk/src/java/hu/midori/kosmos/server/UpdateableCachedValue.java
===================================================================
--- labs/kosmos/trunk/src/java/hu/midori/kosmos/server/UpdateableCachedValue.java 2006-04-12 19:17:50 UTC (rev 3652)
+++ labs/kosmos/trunk/src/java/hu/midori/kosmos/server/UpdateableCachedValue.java 2006-04-12 19:18:24 UTC (rev 3653)
@@ -0,0 +1,33 @@
+package hu.midori.kosmos.server;
+
+import java.io.Serializable;
+
+import org.aopalliance.intercept.MethodInvocation;
+
+/**
+ * Wraps both method invocation and its return value,
+ * so that it can be stored in the cache and can be updated
+ * any time later.
+ *
+ * @author <a href="mailto:aro...@mi...">Aron Gombas</a>
+ * @version $Id$
+ */
+public class UpdateableCachedValue implements Serializable {// TODO maybe "cache" package?
+ /** Invocation information about the method. */
+ private MethodInvocation invocation;
+ /** Return value of the invoked method. */
+ private Serializable methodResult;
+
+ public UpdateableCachedValue(MethodInvocation invocation, Serializable result) {
+ this.invocation = invocation;
+ this.methodResult = result;
+ }
+
+ public MethodInvocation getInvocation() {
+ return invocation;
+ }
+
+ public Serializable getMethodResult() {
+ return methodResult;
+ }
+}
Modified: labs/kosmos/trunk/web-server/WEB-INF/classes/ehcache.xml
===================================================================
--- labs/kosmos/trunk/web-server/WEB-INF/classes/ehcache.xml 2006-04-12 19:17:50 UTC (rev 3652)
+++ labs/kosmos/trunk/web-server/WEB-INF/classes/ehcache.xml 2006-04-12 19:18:24 UTC (rev 3653)
@@ -1,9 +1,10 @@
<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="3600" timeToLiveSeconds="3600" overflowToDisk="true" diskPersistent="true"/>
+ timeToIdleSeconds="14400" timeToLiveSeconds="14400" overflowToDisk="true" diskPersistent="true"/>
<cache name="hu.midori.kosmos.server.cache" maxElementsInMemory="1024" eternal="false"
- timeToIdleSeconds="3600" timeToLiveSeconds="3600" overflowToDisk="true" diskPersistent="true"/>
+ timeToIdleSeconds="14400" timeToLiveSeconds="14400" overflowToDisk="true" diskPersistent="true"/>
</ehcache>
Modified: labs/kosmos/trunk/web-server/WEB-INF/kosmos-services-servlet.xml
===================================================================
--- labs/kosmos/trunk/web-server/WEB-INF/kosmos-services-servlet.xml 2006-04-12 19:17:50 UTC (rev 3652)
+++ labs/kosmos/trunk/web-server/WEB-INF/kosmos-services-servlet.xml 2006-04-12 19:18:24 UTC (rev 3653)
@@ -4,137 +4,161 @@
<beans>
<!-- CC service -->
<bean id="ccService" class="hu.midori.kosmos.server.cc.CcServiceImpl">
- <property name="store" ref="webdavStaticContentStore"/>
+ <property name="store" ref="webdavStaticContentStore"/>
</bean>
<bean id="ccServiceProxy" class="org.springframework.aop.framework.ProxyFactoryBean">
- <property name="targetName" value="ccService"/>
- <property name="interceptorNames">
- <list>
- <value>serviceCachePointCutAdvisor</value>
- </list>
- </property>
+ <property name="targetName" value="ccService"/>
+ <property name="interceptorNames">
+ <list>
+ <value>serviceCachePointCutAdvisor</value>
+ </list>
+ </property>
</bean>
<bean name="/cc-service" class="org.springframework.remoting.caucho.HessianServiceExporter">
- <property name="service" ref="ccServiceProxy"/>
- <property name="serviceInterface" value="hu.midori.kosmos.protocol.CcService"/>
+ <property name="service" ref="ccServiceProxy"/>
+ <property name="serviceInterface" value="hu.midori.kosmos.protocol.CcService"/>
</bean>
<!-- JIRA service -->
<bean id="jiraService" class="hu.midori.kosmos.server.jira.JiraWebCrawlingServiceImpl">
- <property name="store" ref="webdavStaticContentStore"/>
+ <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>
+ <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"/>
+ <property name="service" ref="jiraServiceProxy"/>
+ <property name="serviceInterface" value="hu.midori.kosmos.protocol.JiraService"/>
</bean>
<!-- JIRA SOAP service -->
<bean id="jiraSoapService" class="hu.midori.kosmos.server.jira.JiraSoapServiceImpl">
- <property name="store" ref="webdavStaticContentStore"/>
+ <property name="store" ref="webdavStaticContentStore"/>
</bean>
<bean id="jiraSoapServiceProxy" class="org.springframework.aop.framework.ProxyFactoryBean">
- <property name="targetName" value="jiraSoapService"/>
- <property name="interceptorNames">
- <list>
- <value>serviceCachePointCutAdvisor</value>
- </list>
- </property>
+ <property name="targetName" value="jiraSoapService"/>
+ <property name="interceptorNames">
+ <list>
+ <value>serviceCachePointCutAdvisor</value>
+ </list>
+ </property>
</bean>
<bean name="/jirasoap-service" class="org.springframework.remoting.caucho.HessianServiceExporter">
- <property name="service" ref="jiraSoapServiceProxy"/>
- <property name="serviceInterface" value="hu.midori.kosmos.protocol.JiraService"/>
+ <property name="service" ref="jiraSoapServiceProxy"/>
+ <property name="serviceInterface" value="hu.midori.kosmos.protocol.JiraService"/>
</bean>
<!-- SF service -->
<bean id="sfService" class="hu.midori.kosmos.server.sf.SfServiceImpl">
- <property name="store" ref="webdavStaticContentStore"/>
+ <property name="store" ref="webdavStaticContentStore"/>
</bean>
<bean id="sfServiceProxy" class="org.springframework.aop.framework.ProxyFactoryBean">
- <property name="targetName" value="sfService"/>
- <property name="interceptorNames">
- <list>
- <value>serviceCachePointCutAdvisor</value>
- </list>
- </property>
+ <property name="targetName" value="sfService"/>
+ <property name="interceptorNames">
+ <list>
+ <value>serviceCachePointCutAdvisor</value>
+ </list>
+ </property>
</bean>
<bean name="/sf-service" class="org.springframework.remoting.caucho.HessianServiceExporter">
- <property name="service" ref="sfServiceProxy"/>
- <property name="serviceInterface" value="hu.midori.kosmos.protocol.SfService"/>
+ <property name="service" ref="sfServiceProxy"/>
+ <property name="serviceInterface" value="hu.midori.kosmos.protocol.SfService"/>
</bean>
<!-- SVN service -->
<bean id="svnService" class="hu.midori.kosmos.server.svn.SvnServiceImpl">
- <property name="store" ref="webdavStaticContentStore"/>
+ <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>
+ <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"/>
+ <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"/>
+ <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"/>
+ <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" />
+ <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.CcService.getProjects</value>
- <value>hu.midori.kosmos.protocol.JiraService.getProjects</value>
- <value>hu.midori.kosmos.protocol.SfService.getFileReleases</value>
- <value>hu.midori.kosmos.protocol.SvnService.getRepositories</value>
- </list>
- </property>
+ <property name="advice">
+ <ref local="serviceCacheInterceptor"/>
+ </property>
+ <property name="patterns">
+ <list>
+ <value>hu.midori.kosmos.protocol.CcService.getProjects</value>
+ <value>hu.midori.kosmos.protocol.JiraService.getProjects</value>
+ <value>hu.midori.kosmos.protocol.SfService.getFileReleases</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.SimpleTriggerBean">
+ <property name="jobDetail" ref="serviceResultUpdaterJob"/>
+ <property name="startDelay" value="7200000"/><!-- start and repeat in every 2 hours -->
+ <property name="repeatInterval" value="7200000"/>
+ </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"/>
- -->
+ <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/kosmos/trunk/web-server/WEB-INF/lib/quartz-1.5.2.jar
===================================================================
(Binary files differ)
Property changes on: labs/kosmos/trunk/web-server/WEB-INF/lib/quartz-1.5.2.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
|
Author: aron.gombas
Date: 2006-04-12 15:17:50 -0400 (Wed, 12 Apr 2006)
New Revision: 3652
Modified:
labs/kosmos/trunk/src/java/hu/midori/kosmos/portlet/cc/CcMonitoringPortlet.java
labs/kosmos/trunk/src/java/hu/midori/kosmos/portlet/jira/JiraMonitoringPortlet.java
labs/kosmos/trunk/src/java/hu/midori/kosmos/portlet/sf/SfMonitoringPortlet.java
labs/kosmos/trunk/src/java/hu/midori/kosmos/portlet/svn/SvnMonitoringPortlet.java
labs/kosmos/trunk/web-portlet/pages/includes/back_button.jsp
Log:
Fixed view handled correctly
Modified: labs/kosmos/trunk/src/java/hu/midori/kosmos/portlet/cc/CcMonitoringPortlet.java
===================================================================
--- labs/kosmos/trunk/src/java/hu/midori/kosmos/portlet/cc/CcMonitoringPortlet.java 2006-04-12 19:17:28 UTC (rev 3651)
+++ labs/kosmos/trunk/src/java/hu/midori/kosmos/portlet/cc/CcMonitoringPortlet.java 2006-04-12 19:17:50 UTC (rev 3652)
@@ -32,89 +32,89 @@
* @version $Id$
*/
public class CcMonitoringPortlet extends AbstractKosmosPortlet {
- private final static Log log = LogFactory.getLog(CcMonitoringPortlet.class);
-
- private CcMonitoringConfig monitoringConfig = null;
-
- @Override
- public void init(PortletConfig config) throws PortletException {
- log.info("Initializing...");
- super.init(config);
-
- String monitoredResource = getMonitoredResourceInitParameter(config);
- String serviceUrl = getServiceUrlInitParameter(config);
- List<String> monitoredUrls = getMonitoredUrlsInitParameter(config);
- String fixedView = getFixedViewInitParameter(config);
-
+ private final static Log log = LogFactory.getLog(CcMonitoringPortlet.class);
+
+ private CcMonitoringConfig monitoringConfig = null;
+
+ @Override
+ public void init(PortletConfig config) throws PortletException {
+ log.info("Initializing...");
+ super.init(config);
+
+ String monitoredResource = getMonitoredResourceInitParameter(config);
+ String serviceUrl = getServiceUrlInitParameter(config);
+ List<String> monitoredUrls = getMonitoredUrlsInitParameter(config);
+ String fixedView = getFixedViewInitParameter(config);
+
// save config
monitoringConfig = new CcMonitoringConfig(monitoredResource, serviceUrl, monitoredUrls, fixedView);
+ }
+
+ @Override
+ public void destroy() {
+ log.info("Destroying...");
+ }
+
+ @Override
+ public void doView(RenderRequest request, RenderResponse response) {
+ log.info("Viewing...");
+
+ // connect to web-service
+ CcService service = null;
+ HessianProxyFactory factory = new HessianProxyFactory();
+ try {
+ service = (CcService)factory.create(CcService.class, monitoringConfig.getServiceUrl());
+ } catch (MalformedURLException ex) {
+ log.error("Unable to connect to the service", ex);
+ }
+
+ // get project list if the service was successfully set-up
+ Date timestamp = null;
+ List<CcProject> projects = null;
+ if(service != null) {
+ for(String monitoredDir : monitoringConfig.getMonitoredUrls()) {
+ if(projects == null)
+ projects = service.getProjects(monitoredDir);
+ else
+ projects.addAll(service.getProjects(monitoredDir));
+ }
+ log.debug("CC projects downloaded: " + projects.size());
+
+ timestamp = service.getTimestamp();
+ log.debug("CC timestamp: " + timestamp);
+ }
+
+ // render response
+ getPortletContext().setAttribute("timestamp", timestamp);
getPortletContext().setAttribute("monitoringConfig", monitoringConfig);
- }
-
- @Override
- public void destroy() {
- log.info("Destroying...");
- }
-
- @Override
- public void doView(RenderRequest request, RenderResponse response) {
- log.info("Viewing...");
- // connect to web-service
- CcService service = null;
- HessianProxyFactory factory = new HessianProxyFactory();
- try {
- service = (CcService)factory.create(CcService.class, monitoringConfig.getServiceUrl());
- } catch (MalformedURLException ex) {
- log.error("Unable to connect to the service", ex);
- }
+ String id = request.getParameter("id");
+ if(monitoringConfig.hasFixedView() || (id != null)) {
+ // show details
+ CcProject project = (id != null) ? (CcProject)ModelUtils.findInCollection(projects, id) : projects.get(0);
+ if(project != null) {
+ getPortletContext().setAttribute("project", project);
+ getPortletContext().removeAttribute("projects");
- // get project list if the service was successfully set-up
- Date timestamp = null;
- List<CcProject> projects = null;
- if(service != null) {
- for(String monitoredDir : monitoringConfig.getMonitoredUrls()) {
- if(projects == null)
- projects = service.getProjects(monitoredDir);
- else
- projects.addAll(service.getProjects(monitoredDir));
- }
- log.debug("CC projects downloaded: " + projects.size());
+ renderJsp(request, response, "/pages/cc_monitoring_test_details.jsp", String.format("%s / %s", monitoringConfig.getMonitoredResource(), project.getName()));
+ return;
+ } else {
+ log.error(String.format("Project \"%s\" not found", id));
+ }
+ }
- timestamp = service.getTimestamp();
- log.debug("CC timestamp: " + timestamp);
- }
+ // show the full list
+ getPortletContext().removeAttribute("project");
+ getPortletContext().setAttribute("projects", projects);
- // render response
- getPortletContext().setAttribute("timestamp", timestamp);
- String id = request.getParameter("id");
-
- if(monitoringConfig.hasFixedView() || (id != null)) {
- // show details
- CcProject project = (id != null) ? (CcProject)ModelUtils.findInCollection(projects, id) : projects.get(0);
- if(project != null) {
- getPortletContext().setAttribute("project", project);
- getPortletContext().removeAttribute("projects");
-
- renderJsp(request, response, "/pages/cc_monitoring_test_details.jsp", String.format("%s / %s", monitoringConfig.getMonitoredResource(), project.getName()));
- return;
- } else {
- log.error(String.format("Project \"%s\" not found", id));
- }
- }
+ renderJsp(request, response, "/pages/cc_monitoring.jsp", String.format("%s - %d", monitoringConfig.getMonitoredResource(), projects.size()));
+ }
- // show the full list
- getPortletContext().removeAttribute("project");
- getPortletContext().setAttribute("projects", projects);
-
- renderJsp(request, response, "/pages/cc_monitoring.jsp", String.format("%s - %d", monitoringConfig.getMonitoredResource(), projects.size()));
- }
-
- @Override
- public void doHelp(RenderRequest request, RenderResponse response) {
- log.info("Helping...");
+ @Override
+ public void doHelp(RenderRequest request, RenderResponse response) {
+ log.info("Helping...");
- // render response
- renderJsp(request, response, "/pages/cc_monitoring_help.jsp", monitoringConfig.getMonitoredResource());
- }
+ // render response
+ renderJsp(request, response, "/pages/cc_monitoring_help.jsp", monitoringConfig.getMonitoredResource());
+ }
}
Modified: labs/kosmos/trunk/src/java/hu/midori/kosmos/portlet/jira/JiraMonitoringPortlet.java
===================================================================
--- labs/kosmos/trunk/src/java/hu/midori/kosmos/portlet/jira/JiraMonitoringPortlet.java 2006-04-12 19:17:28 UTC (rev 3651)
+++ labs/kosmos/trunk/src/java/hu/midori/kosmos/portlet/jira/JiraMonitoringPortlet.java 2006-04-12 19:17:50 UTC (rev 3652)
@@ -32,92 +32,92 @@
* @version $Id$
*/
public class JiraMonitoringPortlet extends AbstractKosmosPortlet {
- private final static Log log = LogFactory.getLog(JiraMonitoringPortlet.class);
-
- private JiraMonitoringConfig monitoringConfig = null;
+ private final static Log log = LogFactory.getLog(JiraMonitoringPortlet.class);
- @Override
- public void init(PortletConfig config) throws PortletException {
- log.info("Initializing...");
- super.init(config);
-
- String monitoredResource = getMonitoredResourceInitParameter(config);
- String serviceUrl = getServiceUrlInitParameter(config);
- List<String> monitoredUrls = getMonitoredUrlsInitParameter(config);
- String fixedView = getFixedViewInitParameter(config);
-
+ private JiraMonitoringConfig monitoringConfig = null;
+
+ @Override
+ public void init(PortletConfig config) throws PortletException {
+ log.info("Initializing...");
+ super.init(config);
+
+ String monitoredResource = getMonitoredResourceInitParameter(config);
+ String serviceUrl = getServiceUrlInitParameter(config);
+ List<String> monitoredUrls = getMonitoredUrlsInitParameter(config);
+ String fixedView = getFixedViewInitParameter(config);
+
// save config
monitoringConfig = new JiraMonitoringConfig(monitoredResource, serviceUrl, monitoredUrls, fixedView);
+ }
+
+ @Override
+ public void destroy() {
+ log.info("Destroying...");
+ }
+
+ @Override
+ public void doView(RenderRequest request, RenderResponse response) {
+ log.info("Viewing...");
+
+ // connect to web-service
+ JiraService service = null;
+ HessianProxyFactory factory = new HessianProxyFactory();
+ try {
+ service = (JiraService)factory.create(JiraService.class, monitoringConfig.getServiceUrl());
+ } catch (MalformedURLException ex) {
+ log.error("Unable to connect to the service", ex);
+ }
+
+ // get project list if the service was successfully set-up
+ Date timestamp = null;
+ List<JiraProject> projects = null;
+ if(service != null) {
+ for(String monitoredUrl : monitoringConfig.getMonitoredUrls()) {
+ if(projects == null)
+ projects = service.getProjects(monitoredUrl);
+ else
+ projects.addAll(service.getProjects(monitoredUrl));
+ }
+ log.debug("JIRA projects downloaded: " + projects.size());
+
+ timestamp = service.getTimestamp();
+ log.debug("JIRA timestamp: " + timestamp);
+ }
+
+ // render response
+ getPortletContext().setAttribute("timestamp", timestamp);
getPortletContext().setAttribute("monitoringConfig", monitoringConfig);
- }
-
- @Override
- public void destroy() {
- log.info("Destroying...");
- }
-
- @Override
- public void doView(RenderRequest request, RenderResponse response) {
- log.info("Viewing...");
- // connect to web-service
- JiraService service = null;
- HessianProxyFactory factory = new HessianProxyFactory();
- try {
- service = (JiraService)factory.create(JiraService.class, monitoringConfig.getServiceUrl());
- } catch (MalformedURLException ex) {
- log.error("Unable to connect to the service", ex);
- }
+ String id = request.getParameter("id");
+ if(monitoringConfig.hasFixedView() || (id != null)) {
+ // show details
+ String action = monitoringConfig.hasFixedView() ? monitoringConfig.getFixedView() : request.getParameter("action");
+ String page = action.equals("viewProjectDetails") ? "/pages/jira_monitoring_project_details.jsp" : (action.equals("viewAssigneeDetails") ? "/pages/jira_monitoring_assignee_details.jsp" : "/pages/jira_monitoring_issue_details.jsp");
- // get project list if the service was successfully set-up
- Date timestamp = null;
- List<JiraProject> projects = null;
- if(service != null) {
- for(String monitoredUrl : monitoringConfig.getMonitoredUrls()) {
- if(projects == null)
- projects = service.getProjects(monitoredUrl);
- else
- projects.addAll(service.getProjects(monitoredUrl));
- }
- log.debug("JIRA projects downloaded: " + projects.size());
-
- timestamp = service.getTimestamp();
- log.debug("JIRA timestamp: " + timestamp);
- }
+ JiraProject project = (id != null) ? (JiraProject)ModelUtils.findInCollection(projects, id) : projects.get(0);
+ if(project != null) {
+ getPortletContext().setAttribute("project", project);
+ getPortletContext().removeAttribute("projects");
- // render response
- getPortletContext().setAttribute("timestamp", timestamp);
- String id = request.getParameter("id");
-
- if(monitoringConfig.hasFixedView() || (id != null)) {
- // show details
- String action = monitoringConfig.hasFixedView() ? monitoringConfig.getFixedView() : request.getParameter("action");
- String page = action.equals("viewProjectDetails") ? "/pages/jira_monitoring_project_details.jsp" : (action.equals("viewAssigneeDetails") ? "/pages/jira_monitoring_assignee_details.jsp" : "/pages/jira_monitoring_issue_details.jsp");
-
- JiraProject project = (id != null) ? (JiraProject)ModelUtils.findInCollection(projects, id) : projects.get(0);
- if(project != null) {
- getPortletContext().setAttribute("project", project);
- getPortletContext().removeAttribute("projects");
-
- renderJsp(request, response, page, String.format("%s / %s", monitoringConfig.getMonitoredResource(), project.getName()));
- return;
- } else {
- log.error(String.format("Project \"%s\" not found", id));
- }
- }
-
- // show the full list
- getPortletContext().removeAttribute("project");
- getPortletContext().setAttribute("projects", projects);
-
- renderJsp(request, response, "/pages/jira_monitoring.jsp", String.format("%s - %d", monitoringConfig.getMonitoredResource(), projects.size()));
- }
+ renderJsp(request, response, page, String.format("%s / %s", monitoringConfig.getMonitoredResource(), project.getName()));
+ return;
+ } else {
+ log.error(String.format("Project \"%s\" not found", id));
+ }
+ }
- @Override
- public void doHelp(RenderRequest request, RenderResponse response) {
- log.info("Helping...");
+ // show the full list
+ getPortletContext().removeAttribute("project");
+ getPortletContext().setAttribute("projects", projects);
- // render response
- renderJsp(request, response, "/pages/jira_monitoring_help.jsp", monitoringConfig.getMonitoredResource());
- }
+ renderJsp(request, response, "/pages/jira_monitoring.jsp", String.format("%s - %d", monitoringConfig.getMonitoredResource(), projects.size()));
+ }
+
+ @Override
+ public void doHelp(RenderRequest request, RenderResponse response) {
+ log.info("Helping...");
+
+ // render response
+ renderJsp(request, response, "/pages/jira_monitoring_help.jsp", monitoringConfig.getMonitoredResource());
+ }
}
Modified: labs/kosmos/trunk/src/java/hu/midori/kosmos/portlet/sf/SfMonitoringPortlet.java
===================================================================
--- labs/kosmos/trunk/src/java/hu/midori/kosmos/portlet/sf/SfMonitoringPortlet.java 2006-04-12 19:17:28 UTC (rev 3651)
+++ labs/kosmos/trunk/src/java/hu/midori/kosmos/portlet/sf/SfMonitoringPortlet.java 2006-04-12 19:17:50 UTC (rev 3652)
@@ -31,70 +31,70 @@
* @version $Id$
*/
public class SfMonitoringPortlet extends AbstractKosmosPortlet {
- private final static Log log = LogFactory.getLog(SfMonitoringPortlet.class);
-
- private SfMonitoringConfig monitoringConfig = null;
+ private final static Log log = LogFactory.getLog(SfMonitoringPortlet.class);
- @Override
- public void init(PortletConfig config) throws PortletException {
- log.info("Initializing...");
- super.init(config);
-
- String monitoredResource = getMonitoredResourceInitParameter(config);
- String serviceUrl = getServiceUrlInitParameter(config);
- List<String> monitoredUrls = getMonitoredUrlsInitParameter(config);
-
+ private SfMonitoringConfig monitoringConfig = null;
+
+ @Override
+ public void init(PortletConfig config) throws PortletException {
+ log.info("Initializing...");
+ super.init(config);
+
+ String monitoredResource = getMonitoredResourceInitParameter(config);
+ String serviceUrl = getServiceUrlInitParameter(config);
+ List<String> monitoredUrls = getMonitoredUrlsInitParameter(config);
+
// save config
monitoringConfig = new SfMonitoringConfig(monitoredResource, serviceUrl, monitoredUrls);
- getPortletContext().setAttribute("monitoringConfig", monitoringConfig);
- }
-
- @Override
- public void destroy() {
- log.info("Destroying...");
- }
-
- @Override
- public void doView(RenderRequest request, RenderResponse response) {
- log.info("Viewing...");
+ }
- // connect to web-service
- SfService service = null;
- HessianProxyFactory factory = new HessianProxyFactory();
- try {
- service = (SfService)factory.create(SfService.class, monitoringConfig.getServiceUrl());
- } catch (MalformedURLException ex) {
- log.error("Unable to connect to the service", ex);
- }
+ @Override
+ public void destroy() {
+ log.info("Destroying...");
+ }
- // get file-release list if the service was successfully set-up
- Date timestamp = null;
- List<SfRelease> releases = null;
- if(service != null) {
- for(String monitoredUrl : monitoringConfig.getMonitoredUrls()) {
- if(releases == null)
- releases = service.getFileReleases(monitoredUrl);
- else
- releases.addAll(service.getFileReleases(monitoredUrl));
- }
- log.debug("SF releases downloaded: " + releases.size());
+ @Override
+ public void doView(RenderRequest request, RenderResponse response) {
+ log.info("Viewing...");
- timestamp = service.getTimestamp();
- log.debug("SF timestamp: " + timestamp);
- }
-
- // render response
- getPortletContext().setAttribute("timestamp", timestamp);
- getPortletContext().setAttribute("releases", releases);
+ // connect to web-service
+ SfService service = null;
+ HessianProxyFactory factory = new HessianProxyFactory();
+ try {
+ service = (SfService)factory.create(SfService.class, monitoringConfig.getServiceUrl());
+ } catch (MalformedURLException ex) {
+ log.error("Unable to connect to the service", ex);
+ }
- renderJsp(request, response, "/pages/sf_monitoring.jsp", String.format("%s - %d", monitoringConfig.getMonitoredResource(), releases.size()));
- }
+ // get file-release list if the service was successfully set-up
+ Date timestamp = null;
+ List<SfRelease> releases = null;
+ if(service != null) {
+ for(String monitoredUrl : monitoringConfig.getMonitoredUrls()) {
+ if(releases == null)
+ releases = service.getFileReleases(monitoredUrl);
+ else
+ releases.addAll(service.getFileReleases(monitoredUrl));
+ }
+ log.debug("SF releases downloaded: " + releases.size());
- @Override
- public void doHelp(RenderRequest request, RenderResponse response) {
- log.info("Helping...");
+ timestamp = service.getTimestamp();
+ log.debug("SF timestamp: " + timestamp);
+ }
- // render response
- renderJsp(request, response, "/pages/sf_monitoring_help.jsp", monitoringConfig.getMonitoredResource());
- }
+ // render response
+ getPortletContext().setAttribute("timestamp", timestamp);
+ getPortletContext().setAttribute("monitoringConfig", monitoringConfig);
+ getPortletContext().setAttribute("releases", releases);
+
+ renderJsp(request, response, "/pages/sf_monitoring.jsp", String.format("%s - %d", monitoringConfig.getMonitoredResource(), releases.size()));
+ }
+
+ @Override
+ public void doHelp(RenderRequest request, RenderResponse response) {
+ log.info("Helping...");
+
+ // render response
+ renderJsp(request, response, "/pages/sf_monitoring_help.jsp", monitoringConfig.getMonitoredResource());
+ }
}
Modified: labs/kosmos/trunk/src/java/hu/midori/kosmos/portlet/svn/SvnMonitoringPortlet.java
===================================================================
--- labs/kosmos/trunk/src/java/hu/midori/kosmos/portlet/svn/SvnMonitoringPortlet.java 2006-04-12 19:17:28 UTC (rev 3651)
+++ labs/kosmos/trunk/src/java/hu/midori/kosmos/portlet/svn/SvnMonitoringPortlet.java 2006-04-12 19:17:50 UTC (rev 3652)
@@ -32,92 +32,92 @@
* @version $Id$
*/
public class SvnMonitoringPortlet extends AbstractKosmosPortlet {
- private final static Log log = LogFactory.getLog(SvnMonitoringPortlet.class);
-
- private SvnMonitoringConfig monitoringConfig = null;
+ private final static Log log = LogFactory.getLog(SvnMonitoringPortlet.class);
- @Override
- public void init(PortletConfig config) throws PortletException {
- log.info("Initializing...");
- super.init(config);
+ private SvnMonitoringConfig monitoringConfig = null;
- String monitoredResource = getMonitoredResourceInitParameter(config);
- String serviceUrl = getServiceUrlInitParameter(config);
- List<String> monitoredUrls = getMonitoredUrlsInitParameter(config);
- String fixedView = getFixedViewInitParameter(config);
-
+ @Override
+ public void init(PortletConfig config) throws PortletException {
+ log.info("Initializing...");
+ super.init(config);
+
+ String monitoredResource = getMonitoredResourceInitParameter(config);
+ String serviceUrl = getServiceUrlInitParameter(config);
+ List<String> monitoredUrls = getMonitoredUrlsInitParameter(config);
+ String fixedView = getFixedViewInitParameter(config);
+
// save config
monitoringConfig = new SvnMonitoringConfig(monitoredResource, serviceUrl, monitoredUrls, fixedView);
+ }
+
+ @Override
+ public void destroy() {
+ log.info("Destroying...");
+ }
+
+ @Override
+ public void doView(RenderRequest request, RenderResponse response) {
+ log.info("Viewing...");
+
+ // connect to web-service
+ SvnService service = null;
+ HessianProxyFactory factory = new HessianProxyFactory();
+ try {
+ service = (SvnService)factory.create(SvnService.class, monitoringConfig.getServiceUrl());
+ } catch (MalformedURLException ex) {
+ log.error("Unable to connect to the service", ex);
+ }
+
+ // get repository list if the service was successfully set-up
+ Date timestamp = null;
+ List<SvnRepository> repositories = null;
+ if(service != null) {
+ for(String monitoredUrl : monitoringConfig.getMonitoredUrls()) {
+ if(repositories == null)
+ repositories = service.getRepositories(monitoredUrl);
+ else
+ repositories.addAll(service.getRepositories(monitoredUrl));
+ }
+ log.debug("SVN repositories downloaded: " + repositories.size());
+
+ timestamp = service.getTimestamp();
+ log.debug("SVN timestamp: " + timestamp);
+ }
+
+ // render response
+ getPortletContext().setAttribute("timestamp", timestamp);
getPortletContext().setAttribute("monitoringConfig", monitoringConfig);
- }
-
- @Override
- public void destroy() {
- log.info("Destroying...");
- }
-
- @Override
- public void doView(RenderRequest request, RenderResponse response) {
- log.info("Viewing...");
- // connect to web-service
- SvnService service = null;
- HessianProxyFactory factory = new HessianProxyFactory();
- try {
- service = (SvnService)factory.create(SvnService.class, monitoringConfig.getServiceUrl());
- } catch (MalformedURLException ex) {
- log.error("Unable to connect to the service", ex);
- }
+ String id = request.getParameter("id");
+ if(monitoringConfig.hasFixedView() || (id != null)) {
+ // show details
+ String action = monitoringConfig.hasFixedView() ? monitoringConfig.getFixedView() : request.getParameter("action");
+ String page = action.equals("viewRepositoryDetails") ? "/pages/svn_monitoring_repository_details.jsp" : (action.equals("viewCommitterDetails") ? "/pages/svn_monitoring_committer_details.jsp" : (action.equals("viewRevisionDetails") ? "/pages/svn_monitoring_revision_details.jsp" : "/pages/svn_monitoring_activity_details.jsp"));
- // get repository list if the service was successfully set-up
- Date timestamp = null;
- List<SvnRepository> repositories = null;
- if(service != null) {
- for(String monitoredUrl : monitoringConfig.getMonitoredUrls()) {
- if(repositories == null)
- repositories = service.getRepositories(monitoredUrl);
- else
- repositories.addAll(service.getRepositories(monitoredUrl));
- }
- log.debug("SVN repositories downloaded: " + repositories.size());
+ SvnRepository repository = (id != null) ? (SvnRepository)ModelUtils.findInCollection(repositories, id) : repositories.get(0);
+ if(repository != null) {
+ getPortletContext().setAttribute("repository", repository);
+ getPortletContext().removeAttribute("repositories");
- timestamp = service.getTimestamp();
- log.debug("SVN timestamp: " + timestamp);
- }
+ renderJsp(request, response, page, String.format("%s / %s", monitoringConfig.getMonitoredResource(), repository.getLocation()));
+ return;
+ } else {
+ log.error(String.format("Repository \"%s\" not found", id));
+ }
+ }
- // render response
- String id = request.getParameter("id");
- getPortletContext().setAttribute("timestamp", timestamp);
-
- if(monitoringConfig.hasFixedView() || (id != null)) {
- // show details
- String action = monitoringConfig.hasFixedView() ? monitoringConfig.getFixedView() : request.getParameter("action");
- String page = action.equals("viewRepositoryDetails") ? "/pages/svn_monitoring_repository_details.jsp" : (action.equals("viewCommitterDetails") ? "/pages/svn_monitoring_committer_details.jsp" : (action.equals("viewRevisionDetails") ? "/pages/svn_monitoring_revision_details.jsp" : "/pages/svn_monitoring_activity_details.jsp"));
-
- SvnRepository repository = (id != null) ? (SvnRepository)ModelUtils.findInCollection(repositories, id) : repositories.get(0);
- if(repository != null) {
- getPortletContext().setAttribute("repository", repository);
- getPortletContext().removeAttribute("repositories");
-
- renderJsp(request, response, page, String.format("%s / %s", monitoringConfig.getMonitoredResource(), repository.getLocation()));
- return;
- } else {
- log.error(String.format("Repository \"%s\" not found", id));
- }
- }
-
- // show the full list
- getPortletContext().removeAttribute("repository");
- getPortletContext().setAttribute("repositories", repositories);
-
- renderJsp(request, response, "/pages/svn_monitoring.jsp", String.format("%s - %d", monitoringConfig.getMonitoredResource(), repositories.size()));
- }
+ // show the full list
+ getPortletContext().removeAttribute("repository");
+ getPortletContext().setAttribute("repositories", repositories);
- @Override
- public void doHelp(RenderRequest request, RenderResponse response) {
- log.info("Helping...");
+ renderJsp(request, response, "/pages/svn_monitoring.jsp", String.format("%s - %d", monitoringConfig.getMonitoredResource(), repositories.size()));
+ }
- // render response
- renderJsp(request, response, "/pages/svn_monitoring_help.jsp", monitoringConfig.getMonitoredResource());
- }
+ @Override
+ public void doHelp(RenderRequest request, RenderResponse response) {
+ log.info("Helping...");
+
+ // render response
+ renderJsp(request, response, "/pages/svn_monitoring_help.jsp", monitoringConfig.getMonitoredResource());
+ }
}
Modified: labs/kosmos/trunk/web-portlet/pages/includes/back_button.jsp
===================================================================
--- labs/kosmos/trunk/web-portlet/pages/includes/back_button.jsp 2006-04-12 19:17:28 UTC (rev 3651)
+++ labs/kosmos/trunk/web-portlet/pages/includes/back_button.jsp 2006-04-12 19:17:50 UTC (rev 3652)
@@ -1,10 +1,6 @@
<%-- display a "Back" button only if not in fixed view --%>
<c:if test="${empty monitoringConfig.fixedView}">
-<!-- portlet:defineObjects/ -->
-GOMBNAL MONCONFIG: ${monitoringConfig}<br/>
-GOMBNAL URL: ${monitoringConfig.monitoredUrls}<br/>
-GOMBNAL FIXEDVIEW: ${monitoringConfig.fixedView}
<form action="<portlet:renderURL/>" method="post">
- <input type="submit" class="portlet-form-button" name="submit" value="<fmt:message key="action.back"/>"/>
+ <input type="submit" class="portlet-form-button" name="submit" value="<fmt:message key="action.back"/>"/>
</form>
</c:if>
|
|
From: <jbo...@li...> - 2006-04-12 19:17:37
|
Author: aron.gombas Date: 2006-04-12 15:17:28 -0400 (Wed, 12 Apr 2006) New Revision: 3651 Modified: labs/kosmos/trunk/web-portlet/WEB-INF/portlet.xml Log: Labs URLs updated Modified: labs/kosmos/trunk/web-portlet/WEB-INF/portlet.xml =================================================================== --- labs/kosmos/trunk/web-portlet/WEB-INF/portlet.xml 2006-04-12 19:16:46 UTC (rev 3650) +++ labs/kosmos/trunk/web-portlet/WEB-INF/portlet.xml 2006-04-12 19:17:28 UTC (rev 3651) @@ -4,342 +4,341 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" version="1.0"> <portlet> - <portlet-name>GmfCcMonitoringPortlet</portlet-name> - <portlet-class>hu.midori.kosmos.portlet.cc.CcMonitoringPortlet</portlet-class> - <init-param> - <name>monitored.resource</name> - <value>GMF Builds</value> - </init-param> - <init-param> - <name>service.url</name> - <value>http://localhost:8080/kosmos-server/kosmos-services/cc-service</value> - </init-param> - <init-param> - <name>monitored.urls</name> - <value> - http://gmf-dev.borland.com/cruisecontrol/buildresults/checkout, - http://gmf-dev.borland.com/cruisecontrol/buildresults/nightly - </value> - </init-param> - <supports> - <mime-type>text/html</mime-type> - <portlet-mode>HELP</portlet-mode> - <portlet-mode>VIEW</portlet-mode> - </supports> - <supported-locale>en</supported-locale> - <supported-locale>fr</supported-locale> - <supported-locale>hu</supported-locale> - <supported-locale>pl</supported-locale> - <resource-bundle>hu.midori.kosmos.portlet.cc.cc_monitoring</resource-bundle> - <portlet-info> - <title>CruiseControl Monitoring</title> - </portlet-info> + <portlet-name>GmfCcMonitoringPortlet</portlet-name> + <portlet-class>hu.midori.kosmos.portlet.cc.CcMonitoringPortlet</portlet-class> + <init-param> + <name>monitored.resource</name> + <value>GMF Builds</value> + </init-param> + <init-param> + <name>service.url</name> + <value>http://localhost:8080/kosmos-server/kosmos-services/cc-service</value> + </init-param> + <init-param> + <name>monitored.urls</name> + <value> + http://gmf-dev.borland.com/cruisecontrol/buildresults/checkout, + http://gmf-dev.borland.com/cruisecontrol/buildresults/nightly + </value> + </init-param> + <supports> + <mime-type>text/html</mime-type> + <portlet-mode>HELP</portlet-mode> + <portlet-mode>VIEW</portlet-mode> + </supports> + <supported-locale>en</supported-locale> + <supported-locale>fr</supported-locale> + <supported-locale>hu</supported-locale> + <supported-locale>pl</supported-locale> + <resource-bundle>hu.midori.kosmos.portlet.cc.cc_monitoring</resource-bundle> + <portlet-info> + <title>CruiseControl Monitoring</title> + </portlet-info> </portlet> <portlet> - <portlet-name>JBossCcMonitoringPortlet</portlet-name> - <portlet-class>hu.midori.kosmos.portlet.cc.CcMonitoringPortlet</portlet-class> - <init-param> - <name>monitored.resource</name> - <value>JBoss builds</value> - </init-param> - <init-param> - <name>service.url</name> - <value>http://localhost:8080/kosmos-server/kosmos-services/cc-service</value> - </init-param> - <init-param> - <name>monitored.urls</name> - <value> - http://cruisecontrol.jboss.com/cc/buildresults/jboss-portal-2.0-testsuite, - http://cruisecontrol.jboss.com/cc/buildresults/jboss-portal-2.2-testsuite, - http://cruisecontrol.jboss.com/cc/buildresults/jbosslabs - </value> - </init-param> - <supports> - <mime-type>text/html</mime-type> - <portlet-mode>HELP</portlet-mode> - <portlet-mode>VIEW</portlet-mode> - </supports> - <supported-locale>en</supported-locale> - <supported-locale>fr</supported-locale> - <supported-locale>hu</supported-locale> - <supported-locale>pl</supported-locale> - <resource-bundle>hu.midori.kosmos.portlet.cc.cc_monitoring</resource-bundle> - <portlet-info> - <title>CruiseControl Monitoring</title> - </portlet-info> + <portlet-name>JBossCcMonitoringPortlet</portlet-name> + <portlet-class>hu.midori.kosmos.portlet.cc.CcMonitoringPortlet</portlet-class> + <init-param> + <name>monitored.resource</name> + <value>JBoss builds</value> + </init-param> + <init-param> + <name>service.url</name> + <value>http://localhost:8080/kosmos-server/kosmos-services/cc-service</value> + </init-param> + <init-param> + <name>monitored.urls</name> + <value> + http://cruisecontrol.jboss.com/cc/buildresults/jboss-portal-2.0-testsuite, + http://cruisecontrol.jboss.com/cc/buildresults/jboss-portal-2.2-testsuite, + http://cruisecontrol.jboss.com/cc/buildresults/jbosslabs + </value> + </init-param> + <supports> + <mime-type>text/html</mime-type> + <portlet-mode>HELP</portlet-mode> + <portlet-mode>VIEW</portlet-mode> + </supports> + <supported-locale>en</supported-locale> + <supported-locale>fr</supported-locale> + <supported-locale>hu</supported-locale> + <supported-locale>pl</supported-locale> + <resource-bundle>hu.midori.kosmos.portlet.cc.cc_monitoring</resource-bundle> + <portlet-info> + <title>CruiseControl Monitoring</title> + </portlet-info> </portlet> <!-- <portlet> - <portlet-name>AtlassianJiraMonitoringPortlet</portlet-name> - <portlet-class>hu.midori.kosmos.portlet.jira.JiraMonitoringPortlet</portlet-class> - <init-param> - <name>monitored.resource</name> - <value>Atlassian Issues</value> - </init-param> - <init-param> - <name>service.url</name> - <value>http://localhost:8080/kosmos-server/kosmos-services/jira-service</value> - </init-param> - <init-param> - <name>monitored.urls</name> - <value> - http://jira.atlassian.com/browse/CONF, - http://jira.atlassian.com/browse/JRA - </value> - </init-param> - <supports> - <mime-type>text/html</mime-type> - <portlet-mode>HELP</portlet-mode> - <portlet-mode>VIEW</portlet-mode> - </supports> - <supported-locale>en</supported-locale> - <supported-locale>fr</supported-locale> - <supported-locale>hu</supported-locale> - <supported-locale>pl</supported-locale> - <resource-bundle>hu.midori.kosmos.portlet.jira.jira_monitoring</resource-bundle> - <portlet-info> - <title>JIRA Monitoring</title> - </portlet-info> + <portlet-name>AtlassianJiraMonitoringPortlet</portlet-name> + <portlet-class>hu.midori.kosmos.portlet.jira.JiraMonitoringPortlet</portlet-class> + <init-param> + <name>monitored.resource</name> + <value>Atlassian Issues</value> + </init-param> + <init-param> + <name>service.url</name> + <value>http://localhost:8080/kosmos-server/kosmos-services/jira-service</value> + </init-param> + <init-param> + <name>monitored.urls</name> + <value> + http://jira.atlassian.com/browse/CONF, + http://jira.atlassian.com/browse/JRA + </value> + </init-param> + <supports> + <mime-type>text/html</mime-type> + <portlet-mode>HELP</portlet-mode> + <portlet-mode>VIEW</portlet-mode> + </supports> + <supported-locale>en</supported-locale> + <supported-locale>fr</supported-locale> + <supported-locale>hu</supported-locale> + <supported-locale>pl</supported-locale> + <resource-bundle>hu.midori.kosmos.portlet.jira.jira_monitoring</resource-bundle> + <portlet-info> + <title>JIRA Monitoring</title> + </portlet-info> </portlet> --> <!-- <portlet> - <portlet-name>CodehausJiraMonitoringPortlet</portlet-name> - <portlet-class>hu.midori.kosmos.portlet.jira.JiraMonitoringPortlet</portlet-class> - <init-param> - <name>monitored.resource</name> - <value>Codehaus Issues</value> - </init-param> - <init-param> - <name>service.url</name> - <value>http://localhost:8080/kosmos-server/kosmos-services/jira-service</value> - </init-param> - <init-param> - <name>monitored.urls</name> - <value> - http://jira.codehaus.org/browse/SCM, - http://jira.codehaus.org/browse/XFIRE - </value> - </init-param> - <supports> - <mime-type>text/html</mime-type> - <portlet-mode>HELP</portlet-mode> - <portlet-mode>VIEW</portlet-mode> - </supports> - <supported-locale>en</supported-locale> - <supported-locale>fr</supported-locale> - <supported-locale>hu</supported-locale> - <supported-locale>pl</supported-locale> - <resource-bundle>hu.midori.kosmos.portlet.jira.jira_monitoring</resource-bundle> - <portlet-info> - <title>JIRA Monitoring</title> - </portlet-info> + <portlet-name>CodehausJiraMonitoringPortlet</portlet-name> + <portlet-class>hu.midori.kosmos.portlet.jira.JiraMonitoringPortlet</portlet-class> + <init-param> + <name>monitored.resource</name> + <value>Codehaus Issues</value> + </init-param> + <init-param> + <name>service.url</name> + <value>http://localhost:8080/kosmos-server/kosmos-services/jira-service</value> + </init-param> + <init-param> + <name>monitored.urls</name> + <value> + http://jira.codehaus.org/browse/SCM, + http://jira.codehaus.org/browse/XFIRE + </value> + </init-param> + <supports> + <mime-type>text/html</mime-type> + <portlet-mode>HELP</portlet-mode> + <portlet-mode>VIEW</portlet-mode> + </supports> + <supported-locale>en</supported-locale> + <supported-locale>fr</supported-locale> + <supported-locale>hu</supported-locale> + <supported-locale>pl</supported-locale> + <resource-bundle>hu.midori.kosmos.portlet.jira.jira_monitoring</resource-bundle> + <portlet-info> + <title>JIRA Monitoring</title> + </portlet-info> </portlet> --> <portlet> - <portlet-name>JBossJiraMonitoringPortlet</portlet-name> - <portlet-class>hu.midori.kosmos.portlet.jira.JiraMonitoringPortlet</portlet-class> - <init-param> - <name>monitored.resource</name> - <value>JBoss Issues</value> - </init-param> - <init-param> - <name>service.url</name> - <value>http://localhost:8080/kosmos-server/kosmos-services/jira-service</value> - </init-param> - <init-param> - <name>monitored.urls</name> - <value> - http://jira.jboss.com/jira/browse/JBLAB, - http://jira.jboss.com/jira/browse/JBPORTAL, - http://jira.jboss.com/jira/browse/KOSMOS - </value> - </init-param> - <supports> - <mime-type>text/html</mime-type> - <portlet-mode>HELP</portlet-mode> - <portlet-mode>VIEW</portlet-mode> - </supports> - <supported-locale>en</supported-locale> - <supported-locale>fr</supported-locale> - <supported-locale>hu</supported-locale> - <supported-locale>pl</supported-locale> - <resource-bundle>hu.midori.kosmos.portlet.jira.jira_monitoring</resource-bundle> - <portlet-info> - <title>JIRA Monitoring</title> - </portlet-info> + <portlet-name>JBossJiraMonitoringPortlet</portlet-name> + <portlet-class>hu.midori.kosmos.portlet.jira.JiraMonitoringPortlet</portlet-class> + <init-param> + <name>monitored.resource</name> + <value>JBoss Issues</value> + </init-param> + <init-param> + <name>service.url</name> + <value>http://localhost:8080/kosmos-server/kosmos-services/jira-service</value> + </init-param> + <init-param> + <name>monitored.urls</name> + <value> + http://jira.jboss.com/jira/browse/JBLAB, + http://jira.jboss.com/jira/browse/JBPORTAL, + http://jira.jboss.com/jira/browse/KOSMOS + </value> + </init-param> + <supports> + <mime-type>text/html</mime-type> + <portlet-mode>HELP</portlet-mode> + <portlet-mode>VIEW</portlet-mode> + </supports> + <supported-locale>en</supported-locale> + <supported-locale>fr</supported-locale> + <supported-locale>hu</supported-locale> + <supported-locale>pl</supported-locale> + <resource-bundle>hu.midori.kosmos.portlet.jira.jira_monitoring</resource-bundle> + <portlet-info> + <title>JIRA Monitoring</title> + </portlet-info> </portlet> <portlet> - <portlet-name>JBossJiraSoapMonitoringPortlet</portlet-name> - <portlet-class>hu.midori.kosmos.portlet.jira.JiraMonitoringPortlet</portlet-class> - <init-param> - <name>monitored.resource</name> - <value>Atlassian Issues</value> - </init-param> - <init-param> - <name>service.url</name> - <value>http://localhost:8080/kosmos-server/kosmos-services/jirasoap-service</value> - </init-param> - <init-param> - <name>monitored.urls</name> - <value> - http://soaptester:soa...@ji.../rpc/soap/jirasoapservice-v2?wsdl:Fixed for unreleased versions - </value> - </init-param> - <supports> - <mime-type>text/html</mime-type> - <portlet-mode>HELP</portlet-mode> - <portlet-mode>VIEW</portlet-mode> - </supports> - <supported-locale>en</supported-locale> - <supported-locale>fr</supported-locale> - <supported-locale>hu</supported-locale> - <supported-locale>pl</supported-locale> - <resource-bundle>hu.midori.kosmos.portlet.jira.jira_monitoring</resource-bundle> - <portlet-info> - <title>JIRA Monitoring</title> - </portlet-info> + <portlet-name>JBossJiraSoapMonitoringPortlet</portlet-name> + <portlet-class>hu.midori.kosmos.portlet.jira.JiraMonitoringPortlet</portlet-class> + <init-param> + <name>monitored.resource</name> + <value>Atlassian Issues</value> + </init-param> + <init-param> + <name>service.url</name> + <value>http://localhost:8080/kosmos-server/kosmos-services/jirasoap-service</value> + </init-param> + <init-param> + <name>monitored.urls</name> + <value> + http://soaptester:soa...@ji.../rpc/soap/jirasoapservice-v2?wsdl:Fixed for unreleased versions + </value> + </init-param> + <supports> + <mime-type>text/html</mime-type> + <portlet-mode>HELP</portlet-mode> + <portlet-mode>VIEW</portlet-mode> + </supports> + <supported-locale>en</supported-locale> + <supported-locale>fr</supported-locale> + <supported-locale>hu</supported-locale> + <supported-locale>pl</supported-locale> + <resource-bundle>hu.midori.kosmos.portlet.jira.jira_monitoring</resource-bundle> + <portlet-info> + <title>JIRA Monitoring</title> + </portlet-info> </portlet> <portlet> - <portlet-name>KosmosDependenciesSfMonitoringPortlet</portlet-name> - <portlet-class>hu.midori.kosmos.portlet.sf.SfMonitoringPortlet</portlet-class> - <init-param> - <name>monitored.resource</name> - <value>Kosmos Dependencies</value> - </init-param> - <init-param> - <name>service.url</name> - <value>http://localhost:8080/kosmos-server/kosmos-services/sf-service</value> - </init-param> - <init-param> - <name>monitored.urls</name> - <value> - http://sourceforge.net/projects/cruisecontrol/, - http://sourceforge.net/projects/displaytag/, - http://sourceforge.net/projects/jfreechart/, - http://sourceforge.net/projects/jtidy/, - http://sourceforge.net/projects/saxon/, - http://www.sourceforge.net/projects/springframework - </value> - </init-param> - <supports> - <mime-type>text/html</mime-type> - <portlet-mode>HELP</portlet-mode> - <portlet-mode>VIEW</portlet-mode> - </supports> - <supported-locale>en</supported-locale> - <supported-locale>fr</supported-locale> - <supported-locale>hu</supported-locale> - <supported-locale>pl</supported-locale> - <resource-bundle>hu.midori.kosmos.portlet.sf.sf_monitoring</resource-bundle> - <portlet-info> - <title>SourceForge Monitoring</title> - </portlet-info> + <portlet-name>KosmosDependenciesSfMonitoringPortlet</portlet-name> + <portlet-class>hu.midori.kosmos.portlet.sf.SfMonitoringPortlet</portlet-class> + <init-param> + <name>monitored.resource</name> + <value>Kosmos Dependencies</value> + </init-param> + <init-param> + <name>service.url</name> + <value>http://localhost:8080/kosmos-server/kosmos-services/sf-service</value> + </init-param> + <init-param> + <name>monitored.urls</name> + <value> + http://sourceforge.net/projects/cruisecontrol/, + http://sourceforge.net/projects/displaytag/, + http://sourceforge.net/projects/jfreechart/, + http://sourceforge.net/projects/jtidy/, + http://sourceforge.net/projects/saxon/, + http://www.sourceforge.net/projects/springframework + </value> + </init-param> + <supports> + <mime-type>text/html</mime-type> + <portlet-mode>HELP</portlet-mode> + <portlet-mode>VIEW</portlet-mode> + </supports> + <supported-locale>en</supported-locale> + <supported-locale>fr</supported-locale> + <supported-locale>hu</supported-locale> + <supported-locale>pl</supported-locale> + <resource-bundle>hu.midori.kosmos.portlet.sf.sf_monitoring</resource-bundle> + <portlet-info> + <title>SourceForge Monitoring</title> + </portlet-info> </portlet> <portlet> - <portlet-name>JBossProductsSfMonitoringPortlet</portlet-name> - <portlet-class>hu.midori.kosmos.portlet.sf.SfMonitoringPortlet</portlet-class> - <init-param> - <name>monitored.resource</name> - <value>JBoss Products</value> - </init-param> - <init-param> - <name>service.url</name> - <value>http://localhost:8080/kosmos-server/kosmos-services/sf-service</value> - </init-param> - <init-param> - <name>monitored.urls</name> - <value> - http://sourceforge.net/projects/jboss/ - </value> - </init-param> - <supports> - <mime-type>text/html</mime-type> - <portlet-mode>HELP</portlet-mode> - <portlet-mode>VIEW</portlet-mode> - </supports> - <supported-locale>en</supported-locale> - <supported-locale>fr</supported-locale> - <supported-locale>hu</supported-locale> - <supported-locale>pl</supported-locale> - <resource-bundle>hu.midori.kosmos.portlet.sf.sf_monitoring</resource-bundle> - <portlet-info> - <title>SourceForge Monitoring</title> - </portlet-info> + <portlet-name>JBossProductsSfMonitoringPortlet</portlet-name> + <portlet-class>hu.midori.kosmos.portlet.sf.SfMonitoringPortlet</portlet-class> + <init-param> + <name>monitored.resource</name> + <value>JBoss Products</value> + </init-param> + <init-param> + <name>service.url</name> + <value>http://localhost:8080/kosmos-server/kosmos-services/sf-service</value> + </init-param> + <init-param> + <name>monitored.urls</name> + <value> + http://sourceforge.net/projects/jboss/ + </value> + </init-param> + <supports> + <mime-type>text/html</mime-type> + <portlet-mode>HELP</portlet-mode> + <portlet-mode>VIEW</portlet-mode> + </supports> + <supported-locale>en</supported-locale> + <supported-locale>fr</supported-locale> + <supported-locale>hu</supported-locale> + <supported-locale>pl</supported-locale> + <resource-bundle>hu.midori.kosmos.portlet.sf.sf_monitoring</resource-bundle> + <portlet-info> + <title>SourceForge Monitoring</title> + </portlet-info> </portlet> <portlet> - <portlet-name>KosmosToolsSfMonitoringPortlet</portlet-name> - <portlet-class>hu.midori.kosmos.portlet.sf.SfMonitoringPortlet</portlet-class> - <init-param> - <name>monitored.resource</name> - <value>Kosmos Development Tools</value> - </init-param> - <init-param> - <name>service.url</name> - <value>http://localhost:8080/kosmos-server/kosmos-services/sf-service</value> - </init-param> - <init-param> - <name>monitored.urls</name> - <value> - http://sourceforge.net/projects/docbook - </value> - </init-param> - <supports> - <mime-type>text/html</mime-type> - <portlet-mode>HELP</portlet-mode> - <portlet-mode>VIEW</portlet-mode> - </supports> - <supported-locale>en</supported-locale> - <supported-locale>fr</supported-locale> - <supported-locale>hu</supported-locale> - <supported-locale>pl</supported-locale> - <resource-bundle>hu.midori.kosmos.portlet.sf.sf_monitoring</resource-bundle> - <portlet-info> - <title>SourceForge Monitoring</title> - </portlet-info> + <portlet-name>KosmosToolsSfMonitoringPortlet</portlet-name> + <portlet-class>hu.midori.kosmos.portlet.sf.SfMonitoringPortlet</portlet-class> + <init-param> + <name>monitored.resource</name> + <value>Kosmos Development Tools</value> + </init-param> + <init-param> + <name>service.url</name> + <value>http://localhost:8080/kosmos-server/kosmos-services/sf-service</value> + </init-param> + <init-param> + <name>monitored.urls</name> + <value> + http://sourceforge.net/projects/docbook + </value> + </init-param> + <supports> + <mime-type>text/html</mime-type> + <portlet-mode>HELP</portlet-mode> + <portlet-mode>VIEW</portlet-mode> + </supports> + <supported-locale>en</supported-locale> + <supported-locale>fr</supported-locale> + <supported-locale>hu</supported-locale> + <supported-locale>pl</supported-locale> + <resource-bundle>hu.midori.kosmos.portlet.sf.sf_monitoring</resource-bundle> + <portlet-info> + <title>SourceForge Monitoring</title> + </portlet-info> </portlet> <portlet> - <portlet-name>JBossSvnMonitoringPortlet</portlet-name> - <portlet-class>hu.midori.kosmos.portlet.svn.SvnMonitoringPortlet</portlet-class> - <init-param> - <name>monitored.resource</name> - <value>JBoss Labs Subversion</value> - </init-param> - <init-param> - <name>service.url</name> - <value>http://localhost:8080/kosmos-server/kosmos-services/svn-service</value> - </init-param> - <init-param> - <name>monitored.urls</name> - <value> - http://anonsvn.labs.jboss.com/trunk/labs/jbossportal/, - http://anonsvn.labs.jboss.com/trunk/labs/kosmos/, - http://anonsvn.labs.jboss.com/trunk/labs/portletswap/, - http://anonsvn.labs.jboss.com/trunk/labs/shotoku/ - </value> - </init-param> - <supports> - <mime-type>text/html</mime-type> - <portlet-mode>HELP</portlet-mode> - <portlet-mode>VIEW</portlet-mode> - </supports> - <supported-locale>en</supported-locale> - <supported-locale>fr</supported-locale> - <supported-locale>hu</supported-locale> - <supported-locale>pl</supported-locale> - <resource-bundle>hu.midori.kosmos.portlet.svn.svn_monitoring</resource-bundle> - <portlet-info> - <title>Subversion Monitoring</title> - </portlet-info> + <portlet-name>JBossSvnMonitoringPortlet</portlet-name> + <portlet-class>hu.midori.kosmos.portlet.svn.SvnMonitoringPortlet</portlet-class> + <init-param> + <name>monitored.resource</name> + <value>JBoss Labs Subversion</value> + </init-param> + <init-param> + <name>service.url</name> + <value>http://localhost:8080/kosmos-server/kosmos-services/svn-service</value> + </init-param> + <init-param> + <name>monitored.urls</name> + <value> + http://anonsvn.labs.jboss.com/labs/jbossrules/trunk/, + http://anonsvn.labs.jboss.com/labs/kosmos/trunk/, + http://anonsvn.labs.jboss.com/labs/shotoku/trunk/ + </value> + </init-param> + <supports> + <mime-type>text/html</mime-type> + <portlet-mode>HELP</portlet-mode> + <portlet-mode>VIEW</portlet-mode> + </supports> + <supported-locale>en</supported-locale> + <supported-locale>fr</supported-locale> + <supported-locale>hu</supported-locale> + <supported-locale>pl</supported-locale> + <resource-bundle>hu.midori.kosmos.portlet.svn.svn_monitoring</resource-bundle> + <portlet-info> + <title>Subversion Monitoring</title> + </portlet-info> </portlet> </portlet-app> |
|
From: <jbo...@li...> - 2006-04-12 19:16:52
|
Author: aron.gombas Date: 2006-04-12 15:16:46 -0400 (Wed, 12 Apr 2006) New Revision: 3650 Modified: labs/kosmos/trunk/build-distro.xml Log: Minor fix Modified: labs/kosmos/trunk/build-distro.xml =================================================================== --- labs/kosmos/trunk/build-distro.xml 2006-04-12 19:16:20 UTC (rev 3649) +++ labs/kosmos/trunk/build-distro.xml 2006-04-12 19:16:46 UTC (rev 3650) @@ -4,6 +4,7 @@ Distributable under LGPL license. See terms of license at gnu.org. +--> <!-- $Id$ --> <project basedir="." default="dist" name="Kosmos Distro"> <description>Kosmos Distro Packages build-file</description> |
|
From: <jbo...@li...> - 2006-04-12 19:16:29
|
Author: aron.gombas Date: 2006-04-12 15:16:20 -0400 (Wed, 12 Apr 2006) New Revision: 3649 Modified: labs/kosmos/trunk/xdocs/others/welcome.txt Log: Labs URLs updated Modified: labs/kosmos/trunk/xdocs/others/welcome.txt =================================================================== --- labs/kosmos/trunk/xdocs/others/welcome.txt 2006-04-12 19:15:52 UTC (rev 3648) +++ labs/kosmos/trunk/xdocs/others/welcome.txt 2006-04-12 19:16:20 UTC (rev 3649) @@ -11,9 +11,9 @@ -Subversion repository: https://svn.labs.jboss.com/trunk/labs/kosmos/ +Subversion repository: https://svn.labs.jboss.com/labs/kosmos -Anonymous Subversion repository: http://anonsvn.labs.jboss.com/trunk/labs/kosmos +Anonymous Subversion repository: http://anonsvn.labs.jboss.com/labs/kosmos Bug reports: http://jira.jboss.com/jira/browse/KOSMOS |
|
From: <jbo...@li...> - 2006-04-12 19:16:15
|
Author: aron.gombas Date: 2006-04-12 15:15:52 -0400 (Wed, 12 Apr 2006) New Revision: 3648 Added: labs/kosmos/trunk/xdocs/reference/images/kosmos_server_architecture.png labs/kosmos/trunk/xdocs/reference/images/kosmos_simple_deployment.png Removed: labs/kosmos/trunk/xdocs/reference/images/kosmos_deployment.png Log: Diagram images updated Deleted: labs/kosmos/trunk/xdocs/reference/images/kosmos_deployment.png =================================================================== (Binary files differ) Added: labs/kosmos/trunk/xdocs/reference/images/kosmos_server_architecture.png =================================================================== (Binary files differ) Property changes on: labs/kosmos/trunk/xdocs/reference/images/kosmos_server_architecture.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: labs/kosmos/trunk/xdocs/reference/images/kosmos_simple_deployment.png =================================================================== (Binary files differ) Property changes on: labs/kosmos/trunk/xdocs/reference/images/kosmos_simple_deployment.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream |
|
From: <jbo...@li...> - 2006-04-12 19:14:56
|
Author: aron.gombas Date: 2006-04-12 15:14:43 -0400 (Wed, 12 Apr 2006) New Revision: 3646 Added: labs/kosmos/trunk/etc/kosmos_server_architecture.odg labs/kosmos/trunk/etc/kosmos_simple_deployment.odg Log: ODG files added Added: labs/kosmos/trunk/etc/kosmos_server_architecture.odg =================================================================== (Binary files differ) Property changes on: labs/kosmos/trunk/etc/kosmos_server_architecture.odg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: labs/kosmos/trunk/etc/kosmos_simple_deployment.odg =================================================================== (Binary files differ) Property changes on: labs/kosmos/trunk/etc/kosmos_simple_deployment.odg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream |
|
From: <jbo...@li...> - 2006-04-12 18:53:04
|
Author: aron.gombas Date: 2006-04-12 14:53:01 -0400 (Wed, 12 Apr 2006) New Revision: 3645 Removed: labs/kosmos/trunk/aaa.txt Modified: labs/kosmos/trunk/ Log: Dummy file removed Property changes on: labs/kosmos/trunk ___________________________________________________________________ Name: svn:ignore + dist-* .* Deleted: labs/kosmos/trunk/aaa.txt =================================================================== --- labs/kosmos/trunk/aaa.txt 2006-04-12 17:58:25 UTC (rev 3644) +++ labs/kosmos/trunk/aaa.txt 2006-04-12 18:53:01 UTC (rev 3645) @@ -1 +0,0 @@ -lkdfjdslkjflksdjf \ No newline at end of file |
|
From: <jbo...@li...> - 2006-04-12 17:59:59
|
Author: szimano Date: 2006-04-12 13:58:25 -0400 (Wed, 12 Apr 2006) New Revision: 3644 Modified: trunk/forge/portal-extensions/forge-theme/jbossForgeLayout.war/layouts/jbossForge.jsp trunk/forge/portal-extensions/forge-timetracker/src/web/WEB-INF/jsp/normal.jsp Log: better way of generating login href Modified: trunk/forge/portal-extensions/forge-theme/jbossForgeLayout.war/layouts/jbossForge.jsp =================================================================== --- trunk/forge/portal-extensions/forge-theme/jbossForgeLayout.war/layouts/jbossForge.jsp 2006-04-12 17:12:11 UTC (rev 3643) +++ trunk/forge/portal-extensions/forge-theme/jbossForgeLayout.war/layouts/jbossForge.jsp 2006-04-12 17:58:25 UTC (rev 3644) @@ -47,7 +47,7 @@ <div class="brand_FED" id="container"> <div id="TopLogo"> - <img src="http://jboss.com/themes/jbosstheme/img/logo.gif" alt="JBoss - The Professional Open Source Company"> + <img src="http://jboss.com/themes/jbosstheme/img/logo.gif" alt="JBoss - The Professional Open Source Company" /> </div> <div id="TopMenu"> <table cellpadding="0" cellspacing="0"> @@ -62,11 +62,15 @@ <div id="ControlMenu"> <form id="TopSearch" action="http://www.jboss.com/search.jsp"> <ul> - <li><a href="<% if (request.getRequestURI().contains("/authsec")) { - out.print(request.getRequestURI()); + <li><a href="<% + + String url = request.getRequestURL().append((request.getQueryString().length() > 0) ? "?" + request.getQueryString() : "").toString(); + + if (url.contains("/authsec") || url.contains("/auth")) { + out.print(url); } else { - out.print(request.getRequestURI().replace("/portal","/portal/authsec")); + out.print(url.replace("/portal","/portal/authsec")); }%>">Login</a></li> <li><a href="http://www.jboss.com/index.html?op=checkage&module=user">Register</a></li> @@ -102,7 +106,7 @@ <div id="jbfPageFooter"> <div id="Copyright"> - JBoss is a registered trademark and servicemark of JBoss Inc. 2002-2005 JBoss Inc. All rights reserved.<br> + JBoss is a registered trademark and servicemark of JBoss Inc. 2002-2005 JBoss Inc. All rights reserved.<br /> Theme made by <a href="http://mamut.net.pl">Szimano</a> </div> </div> Modified: trunk/forge/portal-extensions/forge-timetracker/src/web/WEB-INF/jsp/normal.jsp =================================================================== --- trunk/forge/portal-extensions/forge-timetracker/src/web/WEB-INF/jsp/normal.jsp 2006-04-12 17:12:11 UTC (rev 3643) +++ trunk/forge/portal-extensions/forge-timetracker/src/web/WEB-INF/jsp/normal.jsp 2006-04-12 17:58:25 UTC (rev 3644) @@ -9,7 +9,7 @@ <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %> <%@ page isELIgnored ="false" %> <portlet:defineObjects/> -<h2>TimeTrackerService Chart</h2> +<h2>TimeTrackerService Chart ze źdźbłem</h2> <div id="TimeTracker"> <n:iterate ctx="chart"> <a href="${n:out("chart.url")}">Plik</a><br /> |
|
From: <jbo...@li...> - 2006-04-12 17:12:17
|
Author: dam...@jb... Date: 2006-04-12 13:12:11 -0400 (Wed, 12 Apr 2006) New Revision: 3643 Removed: .DS_Store Log: Stupid macs. Deleted: .DS_Store =================================================================== --- .DS_Store 2006-04-12 17:11:37 UTC (rev 3642) +++ .DS_Store 2006-04-12 17:12:11 UTC (rev 3643) @@ -1,3 +0,0 @@ - - - \ No newline at end of file |
|
From: <jbo...@li...> - 2006-04-12 17:11:45
|
Author: dam...@jb... Date: 2006-04-12 13:11:37 -0400 (Wed, 12 Apr 2006) New Revision: 3642 Added: labs/servicepacks/trunk/servicepacks/ Removed: servicepacks/ Log: Creating location to hold service pack proof of concept. Copied: labs/servicepacks/trunk/servicepacks (from rev 3641, servicepacks) |
|
From: <jbo...@li...> - 2006-04-12 17:11:28
|
Author: dam...@jb... Date: 2006-04-12 13:11:24 -0400 (Wed, 12 Apr 2006) New Revision: 3641 Added: labs/servicepacks/trunk/scripts/ Removed: scripts/ Log: Creating location to hold service pack proof of concept. Copied: labs/servicepacks/trunk/scripts (from rev 3640, scripts) |
|
From: <jbo...@li...> - 2006-04-12 17:07:56
|
Author: dam...@jb... Date: 2006-04-12 13:07:46 -0400 (Wed, 12 Apr 2006) New Revision: 3640 Added: labs/servicepacks/trunk/ Log: Creating location to hold service pack proof of concept. |
|
From: <jbo...@li...> - 2006-04-12 17:07:40
|
Author: dam...@jb... Date: 2006-04-12 13:07:38 -0400 (Wed, 12 Apr 2006) New Revision: 3639 Added: labs/servicepacks/tags/ Log: Creating location to hold service pack proof of concept. |
|
From: <jbo...@li...> - 2006-04-12 17:07:38
|
Author: dam...@jb... Date: 2006-04-12 13:07:33 -0400 (Wed, 12 Apr 2006) New Revision: 3638 Added: labs/servicepacks/branches/ Log: Creating location to hold service pack proof of concept. |
|
From: <jbo...@li...> - 2006-04-12 17:07:11
|
Author: dam...@jb... Date: 2006-04-12 13:07:09 -0400 (Wed, 12 Apr 2006) New Revision: 3637 Added: labs/servicepacks/ Log: Creating location to hold service pack proof of concept. |
|
From: <jbo...@li...> - 2006-04-12 17:00:14
|
Author: dam...@jb... Date: 2006-04-12 13:00:03 -0400 (Wed, 12 Apr 2006) New Revision: 3636 Removed: tags/ Log: Obsolete. |
|
From: <jbo...@li...> - 2006-04-12 16:59:42
|
Author: dam...@jb... Date: 2006-04-12 12:59:38 -0400 (Wed, 12 Apr 2006) New Revision: 3635 Added: labs/jbosslabs/tags/Labs-Portal-2.0-ComTheme-PreWiki2.2Backport/ Removed: tags/forge/Labs-Portal-2.0-ComTheme-PreWiki2.2Backport/ Log: Moving forge. Copied: labs/jbosslabs/tags/Labs-Portal-2.0-ComTheme-PreWiki2.2Backport (from rev 3634, tags/forge/Labs-Portal-2.0-ComTheme-PreWiki2.2Backport) |
|
From: <jbo...@li...> - 2006-04-12 16:59:29
|
Author: dam...@jb... Date: 2006-04-12 12:59:20 -0400 (Wed, 12 Apr 2006) New Revision: 3634 Added: labs/jbosslabs/tags/Labs-Portal-2.0-ComTheme-03.28.06/ Removed: tags/forge/Labs-Portal-2.0-ComTheme-03.28.06/ Log: Moving forge. Copied: labs/jbosslabs/tags/Labs-Portal-2.0-ComTheme-03.28.06 (from rev 3633, tags/forge/Labs-Portal-2.0-ComTheme-03.28.06) |
550 messages has been excluded from this view by a project administrator.
![http://jboss.com/themes/jbosstheme/img/logo.gif"](http://jboss.com/themes/jbosstheme/img/logo.gif"){kind=link}