EMBJOPR SVN: r1052 - branches/AdminConsole_EAP_5_1.
by embjopr-commits＠lists.jboss.org
Author: nstefan
Date: 2012-06-21 15:46:01 -0400 (Thu, 21 Jun 2012)
New Revision: 1052
Modified:
branches/AdminConsole_EAP_5_1/pom.xml
Log:
Test commit
Modified: branches/AdminConsole_EAP_5_1/pom.xml
===================================================================
--- branches/AdminConsole_EAP_5_1/pom.xml 2012-06-21 19:33:09 UTC (rev 1051)
+++ branches/AdminConsole_EAP_5_1/pom.xml 2012-06-21 19:46:01 UTC (rev 1052)
@@ -47,6 +47,7 @@
<developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/branches/AdminConsole_EAP_5_1/</developerConnection>
<url>http://fisheye.jboss.org/browse/EMBJOPR/branches/AdminConsole_EAP_5_1/</url>
</scm>
+
<issueManagement>
<system>jira</system>
12 years, 8 months
- 1
- 0
EMBJOPR SVN: r1050 - trunk/core/src/main/java/org/jboss/on/embedded/ui.
by embjopr-commits＠lists.jboss.org
Author: ips
Date: 2012-06-18 14:36:34 -0400 (Mon, 18 Jun 2012)
New Revision: 1050
Modified:
trunk/core/src/main/java/org/jboss/on/embedded/ui/SummaryAction.java
Log:
This is a fix for https://issues.jboss.org/browse/EMBJOPR-360. We do it in this method, because we know by the time the method is called, one or more Facelets pages have been compiled, and the problematic Facelets code that disables defaultUseCaches is only executed once when com.sun.facelets.compiler.Compiler.initialize() is called when the first Facelets page from this webapp is about to be compiled.
Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/SummaryAction.java
===================================================================
--- trunk/core/src/main/java/org/jboss/on/embedded/ui/SummaryAction.java 2012-06-18 18:31:53 UTC (rev 1049)
+++ trunk/core/src/main/java/org/jboss/on/embedded/ui/SummaryAction.java 2012-06-18 18:36:34 UTC (rev 1050)
@@ -19,6 +19,8 @@
*/
package org.jboss.on.embedded.ui;
+import java.net.URL;
+import java.net.URLConnection;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -28,6 +30,8 @@
import javax.faces.context.FacesContext;
import javax.faces.event.ValueChangeEvent;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.jetbrains.annotations.NotNull;
import org.jboss.seam.ScopeType;
@@ -68,6 +72,8 @@
@Name("summaryAction")
@Scope(ScopeType.EVENT)
public class SummaryAction {
+ private static final Log log = LogFactory.getLog(SummaryAction.class);
+
@In
private transient FacesMessages facesMessages;
@@ -117,12 +123,21 @@
private String resourceTypeFilter;
+ private static boolean defaultUseCachesEnabled;
+
/**
* determines which summary page should be displayed, based on the current navigation node
*
* @return an outcome indicating which summary page to display.
*/
public String view() {
+ // This is a fix for https://issues.jboss.org/browse/EMBJOPR-360. We do it in this method, because we know by
+ // the time the method is called, one or more Facelets pages have been compiled, and the problematic Facelets
+ // code that disables defaultUseCaches is only executed once when
+ // com.sun.facelets.compiler.Compiler.initialize() is called when the first Facelets page from this webapp is
+ // about to be compiled.
+ enableDefaultUseCaches();
+
// TODO could consider renaming this getCurrentNavigationNode()
JONTreeNode selectedNode = navigationAction.getSelectedNode();
return selectedNode.getSummaryActionOutcome(this).getOutcome();
@@ -310,4 +325,21 @@
}
FacesContext.getCurrentInstance().renderResponse();
}
+
+ private static void enableDefaultUseCaches() {
+ if (!defaultUseCachesEnabled) {
+ try {
+ // The below URL is arbitrary - it just needs to be a valid URL that we can use to create a
+ // URLConnection.
+ URL url = new URL("http://foo.bar/");
+ URLConnection urlConnection = url.openConnection();
+ urlConnection.setDefaultUseCaches(true);
+ log.debug("Enabled defaultUseCaches for URLConnections (see https://issues.jboss.org/browse/EMBJOPR-360).");
+ } catch (Exception e) {
+ log.error("Failed to enable defaultUseCaches for URLConnections (see https://issues.jboss.org/browse/EMBJOPR-360).", e);
+ } finally {
+ defaultUseCachesEnabled = true;
+ }
+ }
+ }
}
12 years, 9 months
- 1
- 0
EMBJOPR SVN: r1049 - branches/AdminConsole_EAP_5_1/core/src/main/java/org/jboss/on/embedded/ui.
by embjopr-commits＠lists.jboss.org
Author: ips
Date: 2012-06-18 14:31:53 -0400 (Mon, 18 Jun 2012)
New Revision: 1049
Modified:
branches/AdminConsole_EAP_5_1/core/src/main/java/org/jboss/on/embedded/ui/SummaryAction.java
Log:
This is a fix for https://issues.jboss.org/browse/EMBJOPR-360. We do it in this method, because we know by the time the method is called, one or more Facelets pages have been compiled, and the problematic Facelets code that disables defaultUseCaches is only executed once when com.sun.facelets.compiler.Compiler.initialize() is called when the first Facelets page from this webapp is about to be compiled.
Modified: branches/AdminConsole_EAP_5_1/core/src/main/java/org/jboss/on/embedded/ui/SummaryAction.java
===================================================================
--- branches/AdminConsole_EAP_5_1/core/src/main/java/org/jboss/on/embedded/ui/SummaryAction.java 2012-05-18 14:58:56 UTC (rev 1048)
+++ branches/AdminConsole_EAP_5_1/core/src/main/java/org/jboss/on/embedded/ui/SummaryAction.java 2012-06-18 18:31:53 UTC (rev 1049)
@@ -19,6 +19,8 @@
*/
package org.jboss.on.embedded.ui;
+import java.net.URL;
+import java.net.URLConnection;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -28,6 +30,8 @@
import javax.faces.context.FacesContext;
import javax.faces.event.ValueChangeEvent;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.jetbrains.annotations.NotNull;
import org.rhq.core.domain.measurement.Availability;
import org.rhq.core.domain.measurement.DataType;
@@ -68,6 +72,8 @@
@Scope(ScopeType.EVENT)
public class SummaryAction
{
+ private static final Log log = LogFactory.getLog(SummaryAction.class);
+
@In
private transient FacesMessages facesMessages;
@@ -117,6 +123,8 @@
private String resourceTypeFilter;
+ private static boolean defaultUseCachesEnabled;
+
/**
* determines which summary page should be displayed, based on the current navigation node
*
@@ -124,6 +132,13 @@
*/
public String view()
{
+ // This is a fix for https://issues.jboss.org/browse/EMBJOPR-360. We do it in this method, because we know by
+ // the time the method is called, one or more Facelets pages have been compiled, and the problematic Facelets
+ // code that disables defaultUseCaches is only executed once when
+ // com.sun.facelets.compiler.Compiler.initialize() is called when the first Facelets page from this webapp is
+ // about to be compiled.
+ enableDefaultUseCaches();
+
// TODO could consider renaming this getCurrentNavigationNode()
JONTreeNode selectedNode = navigationAction.getSelectedNode();
return selectedNode.getSummaryActionOutcome(this).getOutcome();
@@ -343,4 +358,21 @@
}
FacesContext.getCurrentInstance().renderResponse();
}
+
+ private static void enableDefaultUseCaches() {
+ if (!defaultUseCachesEnabled) {
+ try {
+ // The below URL is arbitrary - it just needs to be a valid URL that we can use to create a
+ // URLConnection.
+ URL url = new URL("http://foo.bar/");
+ URLConnection urlConnection = url.openConnection();
+ urlConnection.setDefaultUseCaches(true);
+ log.debug("Enabled defaultUseCaches for URLConnections (see https://issues.jboss.org/browse/EMBJOPR-360).");
+ } catch (Exception e) {
+ log.error("Failed to enable defaultUseCaches for URLConnections (see https://issues.jboss.org/browse/EMBJOPR-360).", e);
+ } finally {
+ defaultUseCachesEnabled = true;
+ }
+ }
+ }
}
12 years, 9 months
- 1
- 0
- ← Newer
- 1
- Older →