Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

initial spike of ARIES-1038 so that blueprint-noosgi can be easily used ... #2

Closed
wants to merge 3 commits into from

3 participants

@jstrachan

...inside a servlet engine without an OSGi environment; but booting up all the META-INF/blueprint.xml files and performing the DI on everything using blueprint-noosgi

@pires

This is just a mirror. They will never merge anything from here :-1:

@asfgit asfgit referenced this pull request from a commit
@bosschaert bosschaert [ARIES-1167] Transaction itests failures
Patch applied on behalf of Grzegorz Grzybek with many thanks.
This closes pull request #2. 



git-svn-id: https://svn.apache.org/repos/asf/aries/trunk@1583301 13f79535-47bb-0310-9956-ffa450edef68
9d6a9cc
@bosschaert

Apologies, that comment referenced the wrong pull request. It closes #7 instead. So much for the manual steps in getting this back into SVN :(

@bosschaert

Is this pull request still relevant or can it be closed?

@jstrachan

I guess it can be closed as the underlying issue is fixed https://issues.apache.org/jira/browse/ARIES-1038

@jstrachan jstrachan closed this
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Mar 26, 2013
  1. @jstrachan

    improvement for ARIES-1038 to avoid the ServletContext.getResourcePat…

    jstrachan authored
    …hs as we should only really use the classpath to avoid errors in tomcat6
  2. @jstrachan
  3. @jstrachan
This page is out of date. Refresh to see the latest.
View
6 blueprint/blueprint-sample-war/pom.xml
@@ -47,6 +47,12 @@
<dependencies>
<dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <version>1.2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.web</artifactId>
<version>${blueprint.web.version}</version>
View
1  blueprint/blueprint-web/pom.xml
@@ -63,6 +63,7 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.5_spec</artifactId>
<version>1.2</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
View
3  blueprint/blueprint-web/src/main/java/org/apache/aries/blueprint/web/BlueprintContextListener.java
@@ -45,8 +45,7 @@ public void contextInitialized(ServletContextEvent event) {
if (location == null) {
location = DEFAULT_LOCATION;
}
- Set<URL> resourcePathSet = servletContext.getResourcePaths(location);
- List<URL> resourcePaths = new ArrayList<URL>(resourcePathSet);
+ List<URL> resourcePaths = new ArrayList<URL>();
ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
try {
Enumeration<URL> resources = classLoader.getResources(location);
Something went wrong with that request. Please try again.