summaryrefslogtreecommitdiffstats
path: root/branches
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--branches/sca-java-1.x/modules/contribution-jee-impl/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEIntrospectorImpl.java6
-rw-r--r--branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleInfo.java5
-rw-r--r--branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WebModuleInfoImpl.java23
3 files changed, 27 insertions, 7 deletions
diff --git a/branches/sca-java-1.x/modules/contribution-jee-impl/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEIntrospectorImpl.java b/branches/sca-java-1.x/modules/contribution-jee-impl/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEIntrospectorImpl.java
index f342bc89f1..ff4a10bff8 100644
--- a/branches/sca-java-1.x/modules/contribution-jee-impl/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEIntrospectorImpl.java
+++ b/branches/sca-java-1.x/modules/contribution-jee-impl/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEIntrospectorImpl.java
@@ -126,7 +126,7 @@ public class JavaEEIntrospectorImpl implements JavaEEIntrospector {
// Process Servlets
for(Servlet servlet: webApp.getServlet()) {
try {
- wmInfo.getClassesToScan().add(classLoader.loadClass(servlet.getServletClass()));
+ wmInfo.getServletClasses().add(classLoader.loadClass(servlet.getServletClass()));
} catch (ClassNotFoundException e) {
// TODO Auto-generated catch block
e.printStackTrace();
@@ -136,7 +136,7 @@ public class JavaEEIntrospectorImpl implements JavaEEIntrospector {
// Process Filters
for(Filter filter: webApp.getFilter()) {
try {
- wmInfo.getClassesToScan().add(classLoader.loadClass(filter.getFilterClass()));
+ wmInfo.getFilterClasses().add(classLoader.loadClass(filter.getFilterClass()));
} catch (ClassNotFoundException e) {
// TODO Auto-generated catch block
e.printStackTrace();
@@ -146,7 +146,7 @@ public class JavaEEIntrospectorImpl implements JavaEEIntrospector {
// Process Listeners
for(Listener listener: webApp.getListener()) {
try {
- wmInfo.getClassesToScan().add(classLoader.loadClass(listener.getListenerClass()));
+ wmInfo.getListenerClasses().add(classLoader.loadClass(listener.getListenerClass()));
} catch (ClassNotFoundException e) {
// TODO Auto-generated catch block
e.printStackTrace();
diff --git a/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleInfo.java b/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleInfo.java
index 2feaf2aac4..a0bc74fc2d 100644
--- a/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleInfo.java
+++ b/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleInfo.java
@@ -38,6 +38,9 @@ public interface WebModuleInfo {
EjbReferenceInfo getEjbReference(String ejbRefName);
EnvEntryInfo getEnvEntry(String envEntryName);
- Collection<Class<?>> getClassesToScan();
+ Collection<Class<?>> getServletClasses();
+ Collection<Class<?>> getListenerClasses();
+ Collection<Class<?>> getFilterClasses();
+ Collection<Class<?>> getJSFClasses();
//TODO: JSP tags?
}
diff --git a/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WebModuleInfoImpl.java b/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WebModuleInfoImpl.java
index 353ac7b5c5..9e9a6e3de9 100644
--- a/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WebModuleInfoImpl.java
+++ b/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WebModuleInfoImpl.java
@@ -32,14 +32,31 @@ public class WebModuleInfoImpl implements WebModuleInfo {
private URI uri;
private String moduleName;
- private Collection<Class<?>> classesToScan = new ArrayList<Class<?>>();
+
+ private Collection<Class<?>> servletClasses = new ArrayList<Class<?>>();
+ private Collection<Class<?>> listenerClasses = new ArrayList<Class<?>>();
+ private Collection<Class<?>> filterClasses = new ArrayList<Class<?>>();
+ private Collection<Class<?>> jsfClasses = new ArrayList<Class<?>>();
+
private Map<String, EjbReferenceInfo> ejbReferences = new HashMap<String, EjbReferenceInfo>();
private Map<String, EnvEntryInfo> envEntries = new HashMap<String, EnvEntryInfo>();
public WebModuleInfoImpl() {
}
- public Collection<Class<?>> getClassesToScan() {
- return classesToScan;
+ public Collection<Class<?>> getServletClasses() {
+ return servletClasses;
+ }
+
+ public Collection<Class<?>> getListenerClasses() {
+ return listenerClasses;
+ }
+
+ public Collection<Class<?>> getFilterClasses() {
+ return filterClasses;
+ }
+
+ public Collection<Class<?>> getJSFClasses() {
+ return jsfClasses;
}
public EjbReferenceInfo getEjbReference(String ejbRefName) {