[jboss-svn-commits] JBL Code SVN: r14910 - in labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets: src/java/org/jboss/forge/kosmos and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Sep 6 07:15:11 EDT 2007
Author: wrzep
Date: 2007-09-06 07:15:11 -0400 (Thu, 06 Sep 2007)
New Revision: 14910
Added:
labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/jira/DummyKosmosJiraDescriptor.java
labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/svn/DummyKosmosSvnDescriptor.java
Modified:
labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/project.xml
labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/KosmosPreferences.java
labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/jira/LabsKosmosJiraDescriptor.java
labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/jira/LabsKosmosJiraWatcher.java
labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/svn/LabsKosmosSvnDescriptor.java
labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/svn/LabsKosmosSvnWatcher.java
labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/web/WEB-INF/jboss-portlet.xml
Log:
JBLAB-874
tx timeout ex fixed
Modified: labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/project.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/project.xml 2007-09-06 07:06:28 UTC (rev 14909)
+++ labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/project.xml 2007-09-06 11:15:11 UTC (rev 14910)
@@ -10,117 +10,119 @@
<id>forge-kosmos-portlets</id>
<name>Forge kosmos</name>
<dependencies>
-
+
<dependency>
- <groupId>jboss-forge</groupId>
- <artifactId>forge-common</artifactId>
- <version>1.0</version>
+ <groupId>jboss-forge</groupId>
+ <artifactId>forge-common</artifactId>
+ <version>1.0</version>
</dependency>
- <dependency>
- <groupId>quartz</groupId>
- <artifactId>quartz</artifactId>
- <version>1.5.2</version>
- </dependency>
+ <dependency>
+ <groupId>quartz</groupId>
+ <artifactId>quartz</artifactId>
+ <version>1.5.2</version>
+ </dependency>
- <dependency>
- <groupId>com.lowagie</groupId>
- <artifactId>itext</artifactId>
- <version>1.4</version>
- </dependency>
-
- <dependency>
- <groupId>kosmos</groupId>
- <artifactId>kosmos-portlet</artifactId>
- <version>1.0</version>
- <jar>kosmos-portlet.jar</jar>
- </dependency>
+ <dependency>
+ <groupId>com.lowagie</groupId>
+ <artifactId>itext</artifactId>
+ <version>1.4</version>
+ </dependency>
- <dependency>
- <groupId>hessian</groupId>
- <artifactId>hessian</artifactId>
- <version>3.0.1</version>
- <jar>hessian-3.0.13.jar</jar>
- </dependency>
-
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.1</version>
- </dependency>
-
- <dependency>
- <groupId>taglibs</groupId>
- <artifactId>standard</artifactId>
- <version>1.0</version>
- <jar>standard.jar</jar>
- <properties>
- <war.bundle>true</war.bundle>
- <war.manifest.classpath>true</war.manifest.classpath>
- </properties>
- </dependency>
-
- <dependency>
- <groupId>jstl</groupId>
- <artifactId>jstl</artifactId>
- <version>1.1.2</version>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>
-
- <dependency>
- <groupId>displaytag</groupId>
- <artifactId>displaytag</artifactId>
- <version>1.1</version>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>
-
- <dependency>
- <groupId>jaxb</groupId>
- <artifactId>JAXB2</artifactId>
- <version>2.0</version>
- <jar>jaxb-api.jar</jar>
- </dependency>
-
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>javax.servlet</artifactId>
- <version>1.0</version>
- <jar>javax.servlet.jar</jar>
- </dependency>
-
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>javax.servlet.jsp</artifactId>
- <version>1.0</version>
- <jar>javax.servlet.jsp.jar</jar>
- </dependency>
-
+ <dependency>
+ <groupId>kosmos</groupId>
+ <artifactId>kosmos-portlet</artifactId>
+ <version>1.0</version>
+ <jar>kosmos-portlet.jar</jar>
+ </dependency>
-
- <dependency>
- <groupId>shotoku-cache</groupId>
- <artifactId>shotoku-cache</artifactId>
- <jar>shotoku-cache.jar</jar>
- </dependency>
-
- <dependency>
- <groupId>jboss-cache</groupId>
- <artifactId>jboss-cache</artifactId>
- <jar>jboss-cache.jar</jar>
- </dependency>
-
- <dependency>
- <groupId>jgroups</groupId>
- <artifactId>jgroups</artifactId>
- <jar>jgroups.jar</jar>
- </dependency>
+ <dependency>
+
+ <groupId>hessian</groupId>
+
+ <artifactId>hessian</artifactId>
+
+ <version>3.0.1</version>
+ <jar>hessian-3.0.13.jar</jar>
+
+ </dependency>
- </dependencies>
-
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>taglibs</groupId>
+ <artifactId>standard</artifactId>
+ <version>1.0</version>
+ <jar>standard.jar</jar>
+ <properties>
+ <war.bundle>true</war.bundle>
+ <war.manifest.classpath>true</war.manifest.classpath>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>jstl</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.1.2</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>displaytag</groupId>
+ <artifactId>displaytag</artifactId>
+ <version>1.1</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>jaxb</groupId>
+ <artifactId>JAXB2</artifactId>
+ <version>2.0</version>
+ <jar>jaxb-api.jar</jar>
+ </dependency>
+
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>javax.servlet</artifactId>
+ <version>1.0</version>
+ <jar>javax.servlet.jar</jar>
+ </dependency>
+
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>javax.servlet.jsp</artifactId>
+ <version>1.0</version>
+ <jar>javax.servlet.jsp.jar</jar>
+ </dependency>
+
+ <dependency>
+ <groupId>shotoku-cache</groupId>
+ <artifactId>shotoku-cache</artifactId>
+ <jar>shotoku-cache.jar</jar>
+ </dependency>
+
+ <dependency>
+ <groupId>jboss-cache</groupId>
+ <artifactId>jboss-cache</artifactId>
+ <jar>jboss-cache.jar</jar>
+ </dependency>
+
+ <dependency>
+ <groupId>jgroups</groupId>
+ <artifactId>jgroups</artifactId>
+ <jar>jgroups.jar</jar>
+ </dependency>
+
+ </dependencies>
+
<build>
<sourceDirectory>src/java</sourceDirectory>
</build>
Modified: labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/KosmosPreferences.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/KosmosPreferences.java 2007-09-06 07:06:28 UTC (rev 14909)
+++ labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/KosmosPreferences.java 2007-09-06 11:15:11 UTC (rev 14910)
@@ -23,7 +23,6 @@
import java.util.Enumeration;
import java.util.HashSet;
-import java.util.Map;
import java.util.Set;
import javax.portlet.PortletPreferences;
Added: labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/jira/DummyKosmosJiraDescriptor.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/jira/DummyKosmosJiraDescriptor.java (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/jira/DummyKosmosJiraDescriptor.java 2007-09-06 11:15:11 UTC (rev 14910)
@@ -0,0 +1,40 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.forge.kosmos.jira;
+
+import javax.portlet.PortletContext;
+
+/**
+ * @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org)
+ */
+
+public class DummyKosmosJiraDescriptor extends LabsKosmosJiraDescriptor {
+
+ @Override
+ public boolean fillContext(PortletContext portletContext) {
+
+ portletContext.setAttribute("jiraStatsAvailable", false);
+
+ return false;
+ }
+}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/jira/LabsKosmosJiraDescriptor.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/jira/LabsKosmosJiraDescriptor.java 2007-09-06 07:06:28 UTC (rev 14909)
+++ labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/jira/LabsKosmosJiraDescriptor.java 2007-09-06 11:15:11 UTC (rev 14910)
@@ -48,7 +48,11 @@
private JiraProject jiraProject;
private Date timestamp;
-
+ /**
+ * Empty constructor for {@link DummyKosmosJiraDescriptor}
+ */
+ public LabsKosmosJiraDescriptor() {}
+
public LabsKosmosJiraDescriptor(String projectId, String serviceUrl) throws KosmosException {
JiraService service = getService(serviceUrl + JIRA_SERVICE);
Modified: labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/jira/LabsKosmosJiraWatcher.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/jira/LabsKosmosJiraWatcher.java 2007-09-06 07:06:28 UTC (rev 14909)
+++ labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/jira/LabsKosmosJiraWatcher.java 2007-09-06 11:15:11 UTC (rev 14910)
@@ -39,12 +39,16 @@
protected final static Logger log = Logger.getLogger(LabsKosmosJiraWatcher.class);
public ValueInit<? extends LabsKosmosJiraDescriptor> init(Pair<String,String> key) {
+
try {
return ValueInit.realValue(getDesc(key));
} catch (Exception e) {
log.warn("Unable to init", e);
return ValueInit.realValue(null);
}
+
+ // Replace the above code with the following line to use non-blocking loading for jira stats.
+ // return ValueInit.dummyValue(new DummyKosmosJiraDescriptor());
}
protected ValueChange<LabsKosmosJiraDescriptor> update(Pair<String,String> key, LabsKosmosJiraDescriptor currentObject,
Added: labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/svn/DummyKosmosSvnDescriptor.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/svn/DummyKosmosSvnDescriptor.java (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/svn/DummyKosmosSvnDescriptor.java 2007-09-06 11:15:11 UTC (rev 14910)
@@ -0,0 +1,40 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.forge.kosmos.svn;
+
+import javax.portlet.PortletContext;
+
+/**
+ * @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org)
+ */
+
+public class DummyKosmosSvnDescriptor extends LabsKosmosSvnDescriptor {
+
+ @Override
+ public boolean fillContext(PortletContext portletContext) {
+
+ portletContext.setAttribute("svnStatsAvailable", false);
+
+ return false;
+ }
+}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/svn/LabsKosmosSvnDescriptor.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/svn/LabsKosmosSvnDescriptor.java 2007-09-06 07:06:28 UTC (rev 14909)
+++ labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/svn/LabsKosmosSvnDescriptor.java 2007-09-06 11:15:11 UTC (rev 14910)
@@ -53,6 +53,11 @@
private SvnRepository repository;
private Date timestamp;
+
+ /**
+ * Empty constructor for {@link DummyKosmosSvnDescriptor}
+ */
+ public LabsKosmosSvnDescriptor() {};
public LabsKosmosSvnDescriptor(String projectId, String serviceUrl) throws KosmosException {
Modified: labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/svn/LabsKosmosSvnWatcher.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/svn/LabsKosmosSvnWatcher.java 2007-09-06 07:06:28 UTC (rev 14909)
+++ labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/svn/LabsKosmosSvnWatcher.java 2007-09-06 11:15:11 UTC (rev 14910)
@@ -39,12 +39,8 @@
protected final static Logger log = Logger.getLogger(LabsKosmosSvnWatcher.class);
public ValueInit<? extends LabsKosmosSvnDescriptor> init(Pair<String,String> key) {
- try {
- return ValueInit.realValue(getDesc(key));
- } catch (KosmosException e) {
- log.warn("Unable to init", e);
- return ValueInit.realValue(null);
- }
+
+ return ValueInit.dummyValue(new DummyKosmosSvnDescriptor());
}
protected ValueChange<LabsKosmosSvnDescriptor> update(Pair<String,String> key, LabsKosmosSvnDescriptor currentObject,
Modified: labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/web/WEB-INF/jboss-portlet.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/web/WEB-INF/jboss-portlet.xml 2007-09-06 07:06:28 UTC (rev 14909)
+++ labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/web/WEB-INF/jboss-portlet.xml 2007-09-06 11:15:11 UTC (rev 14910)
@@ -3,7 +3,7 @@
<portlet>
<portlet-name>MetricsPortlet</portlet-name>
<transaction>
- <trans-attribute>Required</trans-attribute>
+ <trans-attribute>Required</trans-attribute>
</transaction>
</portlet>
More information about the jboss-svn-commits
mailing list