April 2010 - embjopr-commits - Jboss List Archives

EMBJOPR SVN: r921 - branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jmsDestinations.

by embjopr-commits＠lists.jboss.org

Author: ozizka(a)redhat.com Date: 2010-04-08 17:16:07 -0400 (Thu, 08 Apr 2010) New Revision: 921 Modified: branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jmsDestinations/ Log: * jmsDest ignore my test file Property changes on: branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jmsDestinations ___________________________________________________________________ Name: svn:ignore + JMSXtest.java

16 years

1
0
0 / 0

EMBJOPR SVN: r920 - branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/src/main/resources.

by embjopr-commits＠lists.jboss.org

Author: ozizka(a)redhat.com Date: 2010-04-08 17:15:33 -0400 (Thu, 08 Apr 2010) New Revision: 920 Modified: branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/src/main/resources/labels--common.properties branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/src/main/resources/labels-jopr-2.4.0-SNAPSHOT.properties Log: * Fixed "Resource Adapto/er (RAR)s" Modified: branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/src/main/resources/labels--common.properties =================================================================== --- branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/src/main/resources/labels--common.properties 2010-04-08 21:02:45 UTC (rev 919) +++ branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/src/main/resources/labels--common.properties 2010-04-08 21:15:33 UTC (rev 920) @@ -1,7 +1,10 @@ +## Most web-app strings are defined in: +## RHQ-git/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml + ## System properties to configure this testsuite. SYSPROP_DEPLOY_DIR = jsfunit.deploy.dir SYSPROP_TESTDATA_DIR = jsfunit.testdata Modified: branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/src/main/resources/labels-jopr-2.4.0-SNAPSHOT.properties =================================================================== --- branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/src/main/resources/labels-jopr-2.4.0-SNAPSHOT.properties 2010-04-08 21:02:45 UTC (rev 919) +++ branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/src/main/resources/labels-jopr-2.4.0-SNAPSHOT.properties 2010-04-08 21:15:33 UTC (rev 920) @@ -7,7 +7,7 @@ NAV_SAR = JBoss Service (SAR)s NAV_MC = MC Beans NAV_PAR = PARs -NAV_RAR = Resource Adaptor (RAR)s +NAV_RAR = Resource Adapter (RAR)s NAV_WAR = Web Application (WAR)s NAV_EMB_WAR = Embedded Web Application (WAR)s NAV_EMB_RAR = Embedded Resource Adapter (RAR)s

16 years

1
0
0 / 0

EMBJOPR SVN: r919 - branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jmsDestinations.

by embjopr-commits＠lists.jboss.org

Author: ozizka(a)redhat.com Date: 2010-04-08 17:02:45 -0400 (Thu, 08 Apr 2010) New Revision: 919 Modified: branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jmsDestinations/JMSOperationsTest.java Log: * Added creation of HtmlElementNotFoundEx in JMS tests. Modified: branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jmsDestinations/JMSOperationsTest.java =================================================================== --- branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jmsDestinations/JMSOperationsTest.java 2010-04-08 21:01:34 UTC (rev 918) +++ branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jmsDestinations/JMSOperationsTest.java 2010-04-08 21:02:45 UTC (rev 919) @@ -1883,7 +1883,11 @@ ContentTableRow destinationRow = ejtt.getTabMenu().getTabContentBox(). findLinkRowInDataTableUsingPagination(jndiName); - assertNotNull("Row containing '" + jndiName + "' was not found in the table", destinationRow); + if( null == destinationRow ){ + String err = "Row containing '" + jndiName + "' was not found in the table."; + new HtmlElementNotFoundException(err, this); + fail( err ); + } String actualStatus = destinationRow.getCellTextByColumnName(STATUS); assertEquals("The status of the destination is not correct: ", expectedStatus, actualStatus);

16 years

1
0
0 / 0

EMBJOPR SVN: r918 - branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util.

by embjopr-commits＠lists.jboss.org

Author: ozizka(a)redhat.com Date: 2010-04-08 17:01:34 -0400 (Thu, 08 Apr 2010) New Revision: 918 Modified: branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java Log: * Workaround for HTMLUnit XPath bug - this time for the table headers in JMS tests. Modified: branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java =================================================================== --- branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java 2010-04-08 17:36:56 UTC (rev 917) +++ branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java 2010-04-08 21:01:34 UTC (rev 918) @@ -1232,7 +1232,8 @@ if( 0 == element.getRowCount() ) return null; - String xPath = ".//tr[.//*[contains(string(), '"+text+"')]]"; + //String xPath = ".//tr[.//*[contains(string(), '"+text+"')]]"; + String xPath = ".//*[ name() = 'tr' and .//*[contains(string(), '"+text+"')]]"; HtmlTableRow elm = (HtmlTableRow) element.getFirstByXPath(xPath); if( null == elm ) return null; @@ -1250,7 +1251,8 @@ if( 0 == element.getRowCount() ) return null; - String xPath = ".//tr[.//a[normalize-space()='"+linkLabel+"']]"; + //String xPath = ".//tr[.//a[normalize-space()='"+linkLabel+"']]"; + String xPath = ".//*[ name() = 'tr' and .//a[normalize-space()='"+linkLabel+"']]"; HtmlTableRow elm = (HtmlTableRow) element.getFirstByXPath(xPath); if( null == elm ) return null; @@ -1326,7 +1328,11 @@ // Get all TH from the first THEAD row that contains TH. //String xPath = "./thead/tr[th and position()=1]/th"; - String xPath = ".//tr[th and position()=1]/th"; + /// Workaround for HTMLUnit's buggy XPath. + //String xPath = ".//*[ name() = 'tr' and th and position()=1]/*[name()='th']"; + //String xPath = ".//*[ name() = 'tr' and *[name()='th'] and position()=1]/*[name()='th']"; + String xPath = ".//*[ name() = 'tr' and *[name()='th'] ]/*[name()='th']"; + //String xPath = "./thead/*[ name() = 'tr' and *[name()='th'] and position()=1]/*[name()='th']"; List<HtmlTableHeaderCell> colHeaders = (List<HtmlTableHeaderCell>) this.element.getByXPath(xPath); if( 0 == colHeaders.size() ){

16 years

1
0
0 / 0

EMBJOPR SVN: r917 - branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util.

by embjopr-commits＠lists.jboss.org

Author: ozizka(a)redhat.com Date: 2010-04-08 13:36:56 -0400 (Thu, 08 Apr 2010) New Revision: 917 Modified: branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java Log: * Workaround for HTMLUnit XPath bug - this time for the "Next" button in JMS tests. Modified: branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java =================================================================== --- branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java 2010-04-08 17:35:37 UTC (rev 916) +++ branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java 2010-04-08 17:36:56 UTC (rev 917) @@ -1071,8 +1071,11 @@ currentPage++ < 20 // Pagination is not rendered if not needed. && null != getTabMenu().getTabContentBox().getPagination().findPageContols() + // Check that there is a "Next" button + && null != getTabMenu().getTabContentBox().getPagination().getGoSpan("Next") // goNext() returns true if there's a next page to go. && getTabMenu().getTabContentBox().getPagination().goNext() + ); return row; @@ -1831,6 +1834,7 @@ // So if their number is the same, return null, which means List allElems = div.getByXPath("*"); List scriptElems = div.getByXPath("script"); + log.debug("Page controls: all / script elements: "+allElems+" / "+scriptElems);/// if( allElems.size() == scriptElems.size() ) return null; @@ -1882,11 +1886,11 @@ } protected HtmlSpan getGoSpan( String spanLabel ) throws HtmlElementNotFoundException { - String xPath = ".//span[normalize-space() = '"+spanLabel+"']"; + String xPath = ".//*[name()='span' and normalize-space() = '"+spanLabel+"']"; HtmlSpan span = getPageContols().getFirstByXPath(xPath); if( null == span ) throw new HtmlElementNotFoundException( - "Span with '"+spanLabel+"' not found using XPath '"+xPath+"'"); + "Span with '"+spanLabel+"' not found using XPath '"+xPath+"'", currentTest); return span; } @@ -1895,7 +1899,7 @@ HtmlElement td = getPageContols().getFirstByXPath(xPath); if( null == td ) throw new HtmlElementNotFoundException( - "Page number "+pageNumber+" not found. Try 1 - "+this.getPageCount()); + "Page number "+pageNumber+" not found. Try 1 - "+this.getPageCount(), currentTest); return (HtmlTableCell) td; } @@ -1913,7 +1917,8 @@ return !"".equals( ((HtmlTableCell)goSpan.getParentNode()).getOnClickAttribute() ); } - /** Clicks the "Next" link of the pagination controls. + /** + * Clicks the "Next" link of the pagination controls. * @returns true if the "Next" link will not bring us to a new page (has no onClick handler). */ public boolean goNext() throws IOException, HtmlElementNotFoundException{

16 years

1
0
0 / 0

EMBJOPR SVN: r916 - branches/EmbJopr-1.4.0-SN-EAP5/jsfunit.

by embjopr-commits＠lists.jboss.org

Author: ozizka(a)redhat.com Date: 2010-04-08 13:35:37 -0400 (Thu, 08 Apr 2010) New Revision: 916 Modified: branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/pom.xml Log: * POM: Message counters enabling moved from a profile to the <build> Modified: branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/pom.xml =================================================================== --- branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/pom.xml 2010-04-08 15:21:57 UTC (rev 915) +++ branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/pom.xml 2010-04-08 17:35:37 UTC (rev 916) @@ -466,7 +466,7 @@ <build><plugins> <plugin> <artifactId>maven-antrun-plugin</artifactId> - <executions> <execution> <phase>pre-integration-test</phase> <goals><goal>run</goal></goals> <configuration> <tasks> + <executions> <execution> <id>enable-msg-cnt-ant</id> <phase>pre-integration-test</phase> <goals><goal>run</goal></goals> <configuration> <tasks> <echo> *** Enabling message counters... *** </echo> <replace file="${JBOSS_HOME}/server/default/deploy/messaging/messaging-service.xml" token="attribute name="EnableMessageCounters">false" value="attribute name="EnableMessageCounters">true"/> <replace file="${JBOSS_HOME}/server/standard/deploy/messaging/messaging-service.xml" token="attribute name="EnableMessageCounters">false" value="attribute name="EnableMessageCounters">true"/> @@ -755,7 +755,7 @@ <build> <plugins> <plugin> <artifactId>maven-antrun-plugin</artifactId> - <executions> <execution> <phase>pre-integration-test</phase> <goals><goal>run</goal></goals> <configuration> <tasks> + <executions> <execution> <id>debug-wait</id> <phase>pre-integration-test</phase> <goals><goal>run</goal></goals> <configuration> <tasks> <echo> *** Waiting for debugger connection at port :4000 ... *** </echo> </tasks> </configuration> </execution> </executions> </plugin> @@ -1124,9 +1124,17 @@ </tasks></configuration> <goals><goal>run</goal></goals> </execution> + + <execution> <id>enable-msg-cnt-ant</id> <phase>pre-integration-test</phase> <goals><goal>run</goal></goals> <configuration> <tasks> + <echo> *** Enabling message counters... *** </echo> + <replace file="${JBOSS_HOME}/server/default/deploy/messaging/messaging-service.xml" token="attribute name="EnableMessageCounters">false" value="attribute name="EnableMessageCounters">true"/> + <replace file="${JBOSS_HOME}/server/standard/deploy/messaging/messaging-service.xml" token="attribute name="EnableMessageCounters">false" value="attribute name="EnableMessageCounters">true"/> + <replace file="${JBOSS_HOME}/server/all/deploy/messaging/messaging-service.xml" token="attribute name="EnableMessageCounters">false" value="attribute name="EnableMessageCounters">true"/> + </tasks> </configuration> </execution> + </executions> </plugin> - <plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <version>2.0.2</version> @@ -1134,7 +1142,7 @@ <source>1.6</source> <target>1.6</target> </configuration> - </plugin> + </plugin> </plugins> </build>

16 years

1
0
0 / 0

EMBJOPR SVN: r915 - branches/EmbJopr-1.4.0-SN-EAP5/jsfunit.

by embjopr-commits＠lists.jboss.org

Author: ozizka(a)redhat.com Date: 2010-04-08 11:21:57 -0400 (Thu, 08 Apr 2010) New Revision: 915 Modified: branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/pom.xml Log: * POM: Replacer plugin replaced with replace Ant task. Modified: branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/pom.xml =================================================================== --- branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/pom.xml 2010-04-08 13:28:58 UTC (rev 914) +++ branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/pom.xml 2010-04-08 15:21:57 UTC (rev 915) @@ -460,41 +460,20 @@  <profile> <id>enable-message-counters-as5</id> - <activation> <property><name>msgcnt</name></property> </activation> + <activation> + <activeByDefault>true</activeByDefault> + </activation> <build><plugins> - <plugin> - <groupId>bakersoftware</groupId> - <artifactId>maven-replacer-plugin</artifactId> - <version>0.0.9</version> - <executions> - <execution><id>mrp1</id> - <phase>initialize</phase><goals><goal>replace</goal></goals> - <configuration> - <file>${JBOSS_HOME}/server/default/deploy/messaging/messaging-service.xml</file> - <token>attribute name="EnableMessageCounters">false</token> - <value>attribute name="EnableMessageCounters">true</value> - </configuration> - </execution> - <execution><id>mrp2</id> - <phase>initialize</phase><goals><goal>replace</goal></goals> - <configuration> - <file>${JBOSS_HOME}/server/standard/deploy/messaging/messaging-service.xml</file> - <token>attribute name="EnableMessageCounters">false</token> - <value>attribute name="EnableMessageCounters">true</value> - </configuration> - </execution> - <execution><id>mrp3</id> - <phase>initialize</phase><goals><goal>replace</goal></goals> - <configuration> - <file>${JBOSS_HOME}/server/all/deploy/messaging/messaging-service.xml</file> - <token>attribute name="EnableMessageCounters">false</token> - <value>attribute name="EnableMessageCounters">true</value> - </configuration> - </execution> - </executions> + <plugin> <artifactId>maven-antrun-plugin</artifactId> + <executions> <execution> <phase>pre-integration-test</phase> <goals><goal>run</goal></goals> <configuration> <tasks> + <echo> *** Enabling message counters... *** </echo> + <replace file="${JBOSS_HOME}/server/default/deploy/messaging/messaging-service.xml" token="attribute name="EnableMessageCounters">false" value="attribute name="EnableMessageCounters">true"/> + <replace file="${JBOSS_HOME}/server/standard/deploy/messaging/messaging-service.xml" token="attribute name="EnableMessageCounters">false" value="attribute name="EnableMessageCounters">true"/> + <replace file="${JBOSS_HOME}/server/all/deploy/messaging/messaging-service.xml" token="attribute name="EnableMessageCounters">false" value="attribute name="EnableMessageCounters">true"/> + </tasks> </configuration> </execution> </executions> </plugin> - + </plugins></build> </profile>

16 years

1
0
0 / 0

EMBJOPR SVN: r914 - branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/src/main/resources.

by embjopr-commits＠lists.jboss.org

Author: ozizka(a)redhat.com Date: 2010-04-08 09:28:58 -0400 (Thu, 08 Apr 2010) New Revision: 914 Modified: branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/src/main/resources/labels-jopr-2.4.0-SNAPSHOT.properties Log: * Fixed "Embedded Resource Adapter (RAR)" for Jopr 2.4.0 Modified: branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/src/main/resources/labels-jopr-2.4.0-SNAPSHOT.properties =================================================================== --- branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/src/main/resources/labels-jopr-2.4.0-SNAPSHOT.properties 2010-04-08 12:27:59 UTC (rev 913) +++ branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/src/main/resources/labels-jopr-2.4.0-SNAPSHOT.properties 2010-04-08 13:28:58 UTC (rev 914) @@ -10,4 +10,4 @@ NAV_RAR = Resource Adaptor (RAR)s NAV_WAR = Web Application (WAR)s NAV_EMB_WAR = Embedded Web Application (WAR)s -NAV_EMB_RAR = Embedded Resource Adaptor (RAR)s +NAV_EMB_RAR = Embedded Resource Adapter (RAR)s

16 years

1
0
0 / 0

EMBJOPR SVN: r913 - branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connfactories.

by embjopr-commits＠lists.jboss.org

Author: ozizka(a)redhat.com Date: 2010-04-08 08:27:59 -0400 (Thu, 08 Apr 2010) New Revision: 913 Modified: branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connfactories/ConnFactoryMetricsTest.java Log: * ConnFactory test fixed - statistics criteria relaxed. Modified: branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connfactories/ConnFactoryMetricsTest.java =================================================================== --- branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connfactories/ConnFactoryMetricsTest.java 2010-04-07 14:54:52 UTC (rev 912) +++ branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connfactories/ConnFactoryMetricsTest.java 2010-04-08 12:27:59 UTC (rev 913) @@ -238,8 +238,8 @@ // Set up the expected values Map<String, String> expectedMetrics = new LinkedHashMap<String, String>(); expectedMetrics.put(AVAILABLE_CONNECTION_COUNT, "14"); - expectedMetrics.put(CONNECTION_COUNT, REGEX_PREFIX+"(6|7|8)"); - expectedMetrics.put(CONNECTION_CREATED_COUNT, "6"); + expectedMetrics.put(CONNECTION_COUNT, REGEX_PREFIX + "(6|7|8)"); + expectedMetrics.put(CONNECTION_CREATED_COUNT, REGEX_PREFIX + "(6|7|8)"); expectedMetrics.put(CONNECTION_DESTROYED_COUNT, "0"); expectedMetrics.put(IN_USE_CONNECTION_COUNT, "6"); //expectedMetrics.put(MAX_CONNECTIONS_IN_USE_COUNT, "6"); // Was causing transient failures (sometimes old connections were counted). @@ -328,7 +328,7 @@ // Set up the expected values Map<String, String> expectedMetrics = new LinkedHashMap<String, String>(); expectedMetrics.put(AVAILABLE_CONNECTION_COUNT, "12"); - expectedMetrics.put(CONNECTION_COUNT, "10"); + expectedMetrics.put(CONNECTION_COUNT, REGEX_PREFIX + "1[01]"); expectedMetrics.put(CONNECTION_CREATED_COUNT, "10"); expectedMetrics.put(CONNECTION_DESTROYED_COUNT, "0"); expectedMetrics.put(IN_USE_CONNECTION_COUNT, "8");

16 years

1
0
0 / 0

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

by embjopr-commits＠lists.jboss.org

Author: ips Date: 2010-04-07 10:54:52 -0400 (Wed, 07 Apr 2010) New Revision: 912 Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/BootstrapAction.java Log: replace usages of Seam's ServletLifecycle class with JSF APIs 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-04-07 00:06:55 UTC (rev 911) +++ trunk/core/src/main/java/org/jboss/on/embedded/ui/BootstrapAction.java 2010-04-07 14:54:52 UTC (rev 912) @@ -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 @@ -30,7 +30,8 @@ import java.util.logging.Level; import java.util.logging.Logger; -import javax.servlet.ServletContext; +import javax.faces.context.ExternalContext; +import javax.faces.context.FacesContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -48,7 +49,6 @@ import org.jboss.seam.annotations.Observer; import org.jboss.seam.annotations.Scope; import org.jboss.seam.annotations.Startup; -import org.jboss.seam.contexts.ServletLifecycle; import org.jboss.seam.security.Identity; import org.jboss.on.embedded.EmbeddedInventoryEventListener; @@ -167,13 +167,17 @@ version = this.getClass().getPackage().getImplementationVersion(); if (version == null) { - ServletContext servletContext = ServletLifecycle.getServletContext(); - String manifestPath = servletContext.getRealPath("/META-INF/MANIFEST.MF"); - Manifest manifest = new Manifest(new FileInputStream(manifestPath)); - version = (String)manifest.getMainAttributes().get(Attributes.Name.IMPLEMENTATION_VERSION); - if (version == null) - { - throw new IllegalStateException(Attributes.Name.IMPLEMENTATION_VERSION + " attribute is not set in WAR's manifest."); + String manifestPath = getRealPath("/META-INF/MANIFEST.MF"); + FileInputStream inputStream = new FileInputStream(manifestPath); + try { + Manifest manifest = new Manifest(inputStream); + version = (String)manifest.getMainAttributes().get(Attributes.Name.IMPLEMENTATION_VERSION); + if (version == null) + { + throw new IllegalStateException(Attributes.Name.IMPLEMENTATION_VERSION + " attribute is not set in WAR's manifest."); + } + } finally { + inputStream.close(); } } } @@ -184,6 +188,12 @@ return version; } + private String getRealPath(String webAppPath) { + FacesContext facesContext = FacesContext.getCurrentInstance(); + ExternalContext externalContext = facesContext.getExternalContext(); + return externalContext.getRealPath(webAppPath); + } + private static void reconfigureJdkLogging() { try @@ -225,20 +235,35 @@ private static SimplePluginFinder createPluginFinder() throws MalformedURLException { - ServletContext servletContext = ServletLifecycle.getServletContext(); SimplePluginFinder pluginFinder = new SimplePluginFinder(); - Set<String> pluginStringSet = servletContext.getResourcePaths("/plugins/"); - for (String pluginString : pluginStringSet) + Set<String> pluginResourcePaths = getResourcePaths("/plugins/"); + for (String pluginResourcePath : pluginResourcePaths) { - if (pluginString.endsWith(".jar")) + if (pluginResourcePath.endsWith(".jar")) { - URL pluginUrl = servletContext.getResource(pluginString); + URL pluginUrl = getResource(pluginResourcePath); pluginFinder.addUrl(pluginUrl); } } return pluginFinder; } + private static Set<String> getResourcePaths(String webAppPath) { + FacesContext facesContext = FacesContext.getCurrentInstance(); + ExternalContext externalContext = facesContext.getExternalContext(); + return externalContext.getResourcePaths(webAppPath); + } + + private static URL getResource(String resourcePath) { + FacesContext facesContext = FacesContext.getCurrentInstance(); + ExternalContext externalContext = facesContext.getExternalContext(); + try { + return externalContext.getResource(resourcePath); + } catch (MalformedURLException e) { + throw new IllegalStateException(e); + } + } + private static void configureMockScenarioLoader() { LOG.trace("Configuring Mock Scenario Loader...");

16 years

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

embjopr-commits April 2010