Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Closed
wants to merge 3 commits into from
Closed

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2e874cc
improvement for ARIES-1038 to avoid the ServletContext.getResourcePat…
jstrachan Mar 26, 2013
beb8cb7
improvement for ARIES-1038 - the servlet API should be provided
jstrachan Mar 26, 2013
168f80b
improvement for ARIES-1038 - the servlet API should be provided
jstrachan Mar 26, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions blueprint/blueprint-sample-war/pom.xml
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -46,6 +46,12 @@
</properties> </properties>


<dependencies> <dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.5_spec</artifactId>
<version>1.2</version>
<scope>provided</scope>
</dependency>
<dependency> <dependency>
<groupId>org.apache.aries.blueprint</groupId> <groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.web</artifactId> <artifactId>org.apache.aries.blueprint.web</artifactId>
Expand Down
1 change: 1 addition & 0 deletions blueprint/blueprint-web/pom.xml
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
<groupId>org.apache.geronimo.specs</groupId> <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.5_spec</artifactId> <artifactId>geronimo-servlet_2.5_spec</artifactId>
<version>1.2</version> <version>1.2</version>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
Expand Down
3 changes: 1 addition & 2 deletions .../blueprint-web/src/main/java/org/apache/aries/blueprint/web/BlueprintContextListener.java
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -45,8 +45,7 @@ public void contextInitialized(ServletContextEvent event) {
if (location == null) { if (location == null) {
location = DEFAULT_LOCATION; location = DEFAULT_LOCATION;
} }
Set<URL> resourcePathSet = servletContext.getResourcePaths(location); List<URL> resourcePaths = new ArrayList<URL>();
List<URL> resourcePaths = new ArrayList<URL>(resourcePathSet);
ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
try { try {
Enumeration<URL> resources = classLoader.getResources(location); Enumeration<URL> resources = classLoader.getResources(location);
Expand Down