embjopr-commits October 2010

embjopr-commits@lists.jboss.org

1 participants
5 discussions

EMBJOPR SVN: r994 - in branches/AdminConsole_EAP_5_1: core and 1 other directories.

by embjopr-commits＠lists.jboss.org

Author: ips Date: 2010-10-26 13:06:28 -0400 (Tue, 26 Oct 2010) New Revision: 994 Modified: branches/AdminConsole_EAP_5_1/core/pom.xml branches/AdminConsole_EAP_5_1/jbas5/pom.xml branches/AdminConsole_EAP_5_1/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: branches/AdminConsole_EAP_5_1/core/pom.xml =================================================================== --- branches/AdminConsole_EAP_5_1/core/pom.xml 2010-10-26 17:06:20 UTC (rev 993) +++ branches/AdminConsole_EAP_5_1/core/pom.xml 2010-10-26 17:06:28 UTC (rev 994) @@ -23,7 +23,7 @@ <parent> <groupId>org.jboss.jopr</groupId> <artifactId>jopr-embedded-parent</artifactId> - <version>1.3.4.SP2</version> + <version>1.3.5-SNAPSHOT</version> </parent> <groupId>org.jboss.jopr</groupId> @@ -35,9 +35,9 @@ </description> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/tags/EmbJopr_1_3_4_SP2/core</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/tags/EmbJopr_1_3_4_SP2/core</developerConnection> - <url>http://fisheye.jboss.org/browse/EMBJOPR/tags/EmbJopr_1_3_4_SP2/core</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/branches/AdminConsole_EAP_...</connection> + <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/core/</url> </scm> <properties> Modified: branches/AdminConsole_EAP_5_1/jbas5/pom.xml =================================================================== --- branches/AdminConsole_EAP_5_1/jbas5/pom.xml 2010-10-26 17:06:20 UTC (rev 993) +++ branches/AdminConsole_EAP_5_1/jbas5/pom.xml 2010-10-26 17:06:28 UTC (rev 994) @@ -5,7 +5,7 @@ <parent> <groupId>org.jboss.jopr</groupId> <artifactId>jopr-embedded-parent</artifactId> - <version>1.3.4.SP2</version> + <version>1.3.5-SNAPSHOT</version> </parent> <groupId>org.jboss.jopr</groupId> @@ -14,9 +14,9 @@ <name>JBoss AS/EAP 5.x Administration Console</name> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/tags/EmbJopr_1_3_4_SP2/jbas5</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/tags/EmbJopr_1_3_4_SP2/jbas5</developerConnection> - <url>http://fisheye.jboss.org/browse/EMBJOPR/tags/EmbJopr_1_3_4_SP2/jbas5</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/branches/AdminConsole_EAP_...</connection> + <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/jbas5/</url> </scm> <properties> Modified: branches/AdminConsole_EAP_5_1/pom.xml =================================================================== --- branches/AdminConsole_EAP_5_1/pom.xml 2010-10-26 17:06:20 UTC (rev 993) +++ branches/AdminConsole_EAP_5_1/pom.xml 2010-10-26 17:06:28 UTC (rev 994) @@ -31,7 +31,7 @@ <groupId>org.jboss.jopr</groupId> <artifactId>jopr-embedded-parent</artifactId> - <version>1.3.4.SP2</version> + <version>1.3.5-SNAPSHOT</version> <packaging>pom</packaging> <name>Embedded Jopr</name> <description>a web application that provides administration and monitoring of the app server instance to which it is deployed</description> @@ -43,9 +43,9 @@ </organization> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/tags/EmbJopr_1_3_4_SP2</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/tags/EmbJopr_1_3_4_SP2</developerConnection> - <url>http://fisheye.jboss.org/browse/EMBJOPR/tags/EmbJopr_1_3_4_SP2</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/branches/AdminConsole_EAP_...</connection> + <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>

13 years, 5 months

1
0
0 / 0

EMBJOPR SVN: r993 - tags.

by embjopr-commits＠lists.jboss.org

Author: ips Date: 2010-10-26 13:06:20 -0400 (Tue, 26 Oct 2010) New Revision: 993 Added: tags/EmbJopr_1_3_4_SP2/ Log: [maven-release-plugin] copy for tag EmbJopr_1_3_4_SP2 Copied: tags/EmbJopr_1_3_4_SP2 (from rev 992, branches/AdminConsole_EAP_5_1)

13 years, 5 months

1
0
0 / 0

EMBJOPR SVN: r992 - in branches/AdminConsole_EAP_5_1: core and 1 other directories.

by embjopr-commits＠lists.jboss.org

Author: ips Date: 2010-10-26 13:06:05 -0400 (Tue, 26 Oct 2010) New Revision: 992 Modified: branches/AdminConsole_EAP_5_1/core/pom.xml branches/AdminConsole_EAP_5_1/jbas5/pom.xml branches/AdminConsole_EAP_5_1/pom.xml Log: [maven-release-plugin] prepare release EmbJopr_1_3_4_SP2 Modified: branches/AdminConsole_EAP_5_1/core/pom.xml =================================================================== --- branches/AdminConsole_EAP_5_1/core/pom.xml 2010-10-25 17:52:04 UTC (rev 991) +++ branches/AdminConsole_EAP_5_1/core/pom.xml 2010-10-26 17:06:05 UTC (rev 992) @@ -23,7 +23,7 @@ <parent> <groupId>org.jboss.jopr</groupId> <artifactId>jopr-embedded-parent</artifactId> - <version>1.3.5-SNAPSHOT</version> + <version>1.3.4.SP2</version> </parent> <groupId>org.jboss.jopr</groupId> @@ -35,9 +35,9 @@ </description> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/branches/AdminConsole_EAP_...</connection> - <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/core/</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/tags/EmbJopr_1_3_4_SP2/core</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/tags/EmbJopr_1_3_4_SP2/core</developerConnection> + <url>http://fisheye.jboss.org/browse/EMBJOPR/tags/EmbJopr_1_3_4_SP2/core</url> </scm> <properties> Modified: branches/AdminConsole_EAP_5_1/jbas5/pom.xml =================================================================== --- branches/AdminConsole_EAP_5_1/jbas5/pom.xml 2010-10-25 17:52:04 UTC (rev 991) +++ branches/AdminConsole_EAP_5_1/jbas5/pom.xml 2010-10-26 17:06:05 UTC (rev 992) @@ -5,7 +5,7 @@ <parent> <groupId>org.jboss.jopr</groupId> <artifactId>jopr-embedded-parent</artifactId> - <version>1.3.5-SNAPSHOT</version> + <version>1.3.4.SP2</version> </parent> <groupId>org.jboss.jopr</groupId> @@ -14,9 +14,9 @@ <name>JBoss AS/EAP 5.x Administration Console</name> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/branches/AdminConsole_EAP_...</connection> - <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/jbas5/</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/tags/EmbJopr_1_3_4_SP2/jbas5</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/tags/EmbJopr_1_3_4_SP2/jbas5</developerConnection> + <url>http://fisheye.jboss.org/browse/EMBJOPR/tags/EmbJopr_1_3_4_SP2/jbas5</url> </scm> <properties> Modified: branches/AdminConsole_EAP_5_1/pom.xml =================================================================== --- branches/AdminConsole_EAP_5_1/pom.xml 2010-10-25 17:52:04 UTC (rev 991) +++ branches/AdminConsole_EAP_5_1/pom.xml 2010-10-26 17:06:05 UTC (rev 992) @@ -17,9 +17,7 @@ ~ License along with this program; if not, write to the Free Software ~ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -33,7 +31,7 @@ <groupId>org.jboss.jopr</groupId> <artifactId>jopr-embedded-parent</artifactId> - <version>1.3.5-SNAPSHOT</version> + <version>1.3.4.SP2</version> <packaging>pom</packaging> <name>Embedded Jopr</name> <description>a web application that provides administration and monitoring of the app server instance to which it is deployed</description> @@ -45,9 +43,9 @@ </organization> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/branches/AdminConsole_EAP_...</connection> - <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> + <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/tags/EmbJopr_1_3_4_SP2</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/tags/EmbJopr_1_3_4_SP2</developerConnection> + <url>http://fisheye.jboss.org/browse/EMBJOPR/tags/EmbJopr_1_3_4_SP2</url> </scm> <issueManagement>

13 years, 5 months

1
0
0 / 0

EMBJOPR SVN: r991 - branches/AdminConsole_EAP_5_1/core/src/main/java/org/jboss/on/embedded/ui.

by embjopr-commits＠lists.jboss.org

Author: ips Date: 2010-10-25 13:52:04 -0400 (Mon, 25 Oct 2010) New Revision: 991 Modified: branches/AdminConsole_EAP_5_1/core/src/main/java/org/jboss/on/embedded/ui/BootstrapAction.java Log: fix bug that caused plugins to fail to deploy if the plugin jars were symlinks (https://jira.jboss.org/browse/JBPAPP-5276 / https://jira.jboss.org/browse/EMBJOPR-342) Modified: branches/AdminConsole_EAP_5_1/core/src/main/java/org/jboss/on/embedded/ui/BootstrapAction.java =================================================================== --- branches/AdminConsole_EAP_5_1/core/src/main/java/org/jboss/on/embedded/ui/BootstrapAction.java 2010-10-25 17:34:31 UTC (rev 990) +++ branches/AdminConsole_EAP_5_1/core/src/main/java/org/jboss/on/embedded/ui/BootstrapAction.java 2010-10-25 17:52:04 UTC (rev 991) @@ -1,6 +1,6 @@ /* * Embedded Jopr Project - * Copyright (C) 2006-2009 Red Hat, Inc. + * Copyright (C) 2006-2010 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -22,6 +22,7 @@ import java.io.File; import java.io.FileInputStream; import java.net.MalformedURLException; +import java.net.URI; import java.net.URL; import java.util.Collection; import java.util.Set; @@ -237,13 +238,41 @@ { if (pluginString.endsWith(".jar")) { - URL pluginUrl = servletContext.getResource(pluginString); + URL pluginUrl = getResource(pluginString); pluginFinder.addUrl(pluginUrl); } } return pluginFinder; } + private static URL getResource(String resourcePath) { + ServletContext servletContext = ServletLifecycle.getServletContext(); + // NOTE: We use getRealPath() rather than getResource(), because getResource() returns null if the + // plugin jar is a symlink, which will be the case for RPM-based EAP installs. However, we fall back + // to getResource() if getRealPath() returns null, which might be the case if the admin console WAR + // was deployed as a file, rather than a directory. + String filePath = servletContext.getRealPath(resourcePath); + URL url; + try { + if (filePath != null) { + File file = new File(filePath); + URI uri = file.toURI(); + url = uri.toURL(); + } else { + url = servletContext.getResource(resourcePath); + if (url == null) { + throw new IllegalStateException("Failed to convert plugin jar resource path [" + resourcePath + + "] to URL."); + } + } + } + catch (MalformedURLException e) { + throw new IllegalStateException("Failed to convert plugin jar resource path [" + resourcePath + + "] to URL.", e); + } + return url; + } + private static void configureMockScenarioLoader() { LOG.trace("Configuring Mock Scenario Loader...");

13 years, 6 months

1
0
0 / 0

EMBJOPR SVN: r990 - trunk/core/src/main/java/org/jboss/on/embedded/ui.

by embjopr-commits＠lists.jboss.org

Author: ips Date: 2010-10-25 13:34:31 -0400 (Mon, 25 Oct 2010) New Revision: 990 Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/BootstrapAction.java Log: fix bug that caused plugins to fail to deploy if the plugin jars are symlinks (https://jira.jboss.org/browse/EMBJOPR-342) Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/BootstrapAction.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/ui/BootstrapAction.java 2010-09-23 21:11:17 UTC (rev 989) +++ trunk/core/src/main/java/org/jboss/on/embedded/ui/BootstrapAction.java 2010-10-25 17:34:31 UTC (rev 990) @@ -22,6 +22,7 @@ import java.io.File; import java.io.FileInputStream; import java.net.MalformedURLException; +import java.net.URI; import java.net.URL; import java.util.Collection; import java.util.Set; @@ -262,11 +263,30 @@ private static URL getResource(String resourcePath) { FacesContext facesContext = FacesContext.getCurrentInstance(); ExternalContext externalContext = facesContext.getExternalContext(); + // NOTE: We use getRealPath() rather than getResource(), because getResource() returns null if the + // plugin jar is a symlink, which will be the case for RPM-based EAP installs. However, we fall back + // to getResource() if getRealPath() returns null, which might be the case if the admin console WAR + // was deployed as a file, rather than a directory. + String filePath = externalContext.getRealPath(resourcePath); + URL url; try { - return externalContext.getResource(resourcePath); - } catch (MalformedURLException e) { - throw new IllegalStateException(e); + if (filePath != null) { + File file = new File(filePath); + URI uri = file.toURI(); + url = uri.toURL(); + } else { + url = externalContext.getResource(resourcePath); + if (url == null) { + throw new IllegalStateException("Failed to convert plugin jar resource path [" + resourcePath + + "] to URL."); + } + } } + catch (MalformedURLException e) { + throw new IllegalStateException("Failed to convert plugin jar resource path [" + resourcePath + + "] to URL.", e); + } + return url; } private static void configureMockScenarioLoader()

13 years, 6 months

1
0
0 / 0

← Newer
1
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

embjopr-commits October 2010