svn commit: r400348 - in /incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly: AssemblyContext.java impl/AssemblyContextImpl.java

[antelder]

Author: antelder
Date: Sat May  6 11:22:50 2006
New Revision: 400348

URL: http://svn.apache.org/viewcvs?rev=400348&view=rev
Log:
Fix for TUSCANY-63, put the web app name in the AssemblyContext so it can be 
past from Tomcat to the binding entryPoint

Modified:
    
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/AssemblyContext.java
    
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/AssemblyContextImpl.java

Modified: 
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/AssemblyContext.java
URL: 
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/AssemblyContext.java?rev=400348&r1=400347&r2=400348&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/AssemblyContext.java
 (original)
+++ 
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/AssemblyContext.java
 Sat May  6 11:22:50 2006
@@ -54,4 +54,11 @@
      */
     TypeHelper getTypeHelper();
     
+    /**
+     * Returns the Web application module URI
+     * 
+     * @return the module name of the Web app
+     */
+    String getWebAppName();
+    
 }

Modified: 
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/AssemblyContextImpl.java
URL: 
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/AssemblyContextImpl.java?rev=400348&r1=400347&r2=400348&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/AssemblyContextImpl.java
 (original)
+++ 
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/AssemblyContextImpl.java
 Sat May  6 11:22:50 2006
@@ -32,6 +32,7 @@
     private final AssemblyModelLoader assemblyLoader;
     private final ResourceLoader applicationResourceLoader;
     private final TypeHelper typeHelper;
+    private String webAppName;
 
     public AssemblyContextImpl(AssemblyModelLoader assemblyLoader, 
ResourceLoader resourceLoader) {
         this(new AssemblyFactoryImpl(), assemblyLoader, resourceLoader);
@@ -41,11 +42,19 @@
         this(assemblyFactory, assemblyLoader, artifactLoader, 
SDOUtil.createTypeHelper());
     }
     
+    public AssemblyContextImpl(AssemblyFactory assemblyFactory, 
AssemblyModelLoader assemblyLoader, ResourceLoader artifactLoader, String 
webAppName) {
+        this(assemblyFactory, assemblyLoader, artifactLoader, 
SDOUtil.createTypeHelper(), webAppName);
+    }
     public AssemblyContextImpl(AssemblyFactory assemblyFactory, 
AssemblyModelLoader assemblyLoader, ResourceLoader artifactLoader, TypeHelper 
typeHelper) {
+        this(assemblyFactory, assemblyLoader, artifactLoader, 
SDOUtil.createTypeHelper(), null);
+    }
+
+    public AssemblyContextImpl(AssemblyFactory assemblyFactory, 
AssemblyModelLoader assemblyLoader, ResourceLoader artifactLoader, TypeHelper 
typeHelper, String webAppName) {
         this.assemblyFactory = assemblyFactory;
         this.assemblyLoader = assemblyLoader;
         this.applicationResourceLoader = artifactLoader;
         this.typeHelper=typeHelper;
+        this.webAppName=webAppName;
     }
 
     /**
@@ -71,5 +80,9 @@
      */
     public TypeHelper getTypeHelper() {
         return typeHelper;
+    }
+
+    public String getWebAppName() {
+        return webAppName;
     }
 }