You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by lr...@apache.org on 2007/05/17 23:41:01 UTC
svn commit: r539127 - in /incubator/tuscany/java/sca:
modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/
modules/host-webapp/src/main/java/org/apache/tuscany/sca/webapp/
samples/calculator-web/src/main/resources/META-INF/ sa...
Author: lresende
Date: Thu May 17 14:41:00 2007
New Revision: 539127
URL: http://svn.apache.org/viewvc?view=rev&rev=539127
Log:
Fixing web-apps to store the sca-contribution.xml on the proper location (root of the war file\META-INF).
Also had to change host-webapp in order to properly find the contribution root
Added:
incubator/tuscany/java/sca/samples/calculator-web/src/main/webapp/META-INF/
- copied from r539017, incubator/tuscany/java/sca/samples/calculator-web/src/main/resources/META-INF/
incubator/tuscany/java/sca/samples/calculator-web/src/main/webapp/META-INF/sca-contribution.xml
- copied unchanged from r539076, incubator/tuscany/java/sca/samples/calculator-web/src/main/resources/META-INF/sca-contribution.xml
incubator/tuscany/java/sca/samples/das-service-web/src/main/webapp/META-INF/sca-contribution.xml
- copied unchanged from r539076, incubator/tuscany/java/sca/samples/das-service-web/src/main/resources/META-INF/sca-contribution.xml
incubator/tuscany/java/sca/samples/helloworld-jsonrpc/src/main/webapp/META-INF/
- copied from r539076, incubator/tuscany/java/sca/samples/helloworld-jsonrpc/src/main/resources/META-INF/
Removed:
incubator/tuscany/java/sca/samples/calculator-web/src/main/resources/META-INF/
incubator/tuscany/java/sca/samples/das-service-web/src/main/resources/META-INF/
incubator/tuscany/java/sca/samples/helloworld-jsonrpc/src/main/resources/META-INF/
Modified:
incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java
incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/webapp/SCADomainHelper.java
incubator/tuscany/java/sca/samples/helloworld-ws-reference/pom.xml
Modified: incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java?view=diff&rev=539127&r1=539126&r2=539127
==============================================================================
--- incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java (original)
+++ incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java Thu May 17 14:41:00 2007
@@ -217,19 +217,22 @@
// Here the SCADomain was started without any reference to a composite file
// We are going to look for an sca-contribution.xml or sca-contribution-generated.xml
+
+ // Look for META-INF/sca-contribution.xml
contributionArtifactPath = Contribution.SCA_CONTRIBUTION_META;
contributionArtifactURL = classLoader.getResource(contributionArtifactPath);
+ // Look for META-INF/sca-contribution-generated.xml
if( contributionArtifactURL == null ) {
contributionArtifactPath = Contribution.SCA_CONTRIBUTION_GENERATED_META;
contributionArtifactURL = classLoader.getResource(contributionArtifactPath);
}
- // Look for META-INF/sca-deployables
- if (contributionArtifactURL == null) {
- contributionArtifactPath = Contribution.SCA_CONTRIBUTION_DEPLOYABLES;
- contributionArtifactURL = classLoader.getResource(contributionArtifactPath);
- }
+ // Look for META-INF/sca-deployables directory
+ if (contributionArtifactURL == null) {
+ contributionArtifactPath = Contribution.SCA_CONTRIBUTION_DEPLOYABLES;
+ contributionArtifactURL = classLoader.getResource(contributionArtifactPath);
+ }
}
if (contributionArtifactURL == null) {
Modified: incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/webapp/SCADomainHelper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/webapp/SCADomainHelper.java?view=diff&rev=539127&r1=539126&r2=539127
==============================================================================
--- incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/webapp/SCADomainHelper.java (original)
+++ incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/webapp/SCADomainHelper.java Thu May 17 14:41:00 2007
@@ -19,6 +19,9 @@
package org.apache.tuscany.sca.webapp;
+import java.io.File;
+import java.net.MalformedURLException;
+
import javax.servlet.ServletContext;
import org.apache.tuscany.sca.host.embedded.SCADomain;
@@ -36,8 +39,20 @@
*/
public static SCADomain initSCADomain(ServletContext servletContext) {
SCADomain scaDomain = (SCADomain)servletContext.getAttribute(SCA_DOMAIN_ATTRIBUTE);
+
+ String domainURI = "http://localhost/" + servletContext.getServletContextName().replace(' ', '.');
+ File warRootFile = new File(servletContext.getRealPath("/"));
+ String contributionRoot = null;
+
+ try {
+ contributionRoot = warRootFile.toURL().toString();
+ } catch (MalformedURLException e) {
+ //ignore, we will pass null
+ }
+
+
if (scaDomain == null) {
- scaDomain = SCADomain.newInstance();
+ scaDomain = SCADomain.newInstance(domainURI, contributionRoot);
servletContext.setAttribute(SCA_DOMAIN_ATTRIBUTE, scaDomain);
}
return scaDomain;
Modified: incubator/tuscany/java/sca/samples/helloworld-ws-reference/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-ws-reference/pom.xml?view=diff&rev=539127&r1=539126&r2=539127
==============================================================================
--- incubator/tuscany/java/sca/samples/helloworld-ws-reference/pom.xml (original)
+++ incubator/tuscany/java/sca/samples/helloworld-ws-reference/pom.xml Thu May 17 14:41:00 2007
@@ -62,6 +62,13 @@
<version>1.0-incubating-SNAPSHOT</version>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-log4j-props</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>junit</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org