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/03/01 01:32:12 UTC
svn commit: r513082 - in
/incubator/tuscany/branches/sca-java-integration/sca/kernel:
api/src/main/java/org/apache/tuscany/api/
core/src/main/java/org/apache/tuscany/core/bootstrap/
core/src/main/java/org/apache/tuscany/core/services/deployment/
Author: lresende
Date: Wed Feb 28 16:32:11 2007
New Revision: 513082
URL: http://svn.apache.org/viewvc?view=rev&rev=513082
Log:
[sca-integration-branch] Bugfixes and support for accessing contribution service inside integration tests
Modified:
incubator/tuscany/branches/sca-java-integration/sca/kernel/api/src/main/java/org/apache/tuscany/api/SCAContainer.java
incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultSCAContainer.java
incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/ContributionServiceImpl.java
Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/api/src/main/java/org/apache/tuscany/api/SCAContainer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/api/src/main/java/org/apache/tuscany/api/SCAContainer.java?view=diff&rev=513082&r1=513081&r2=513082
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/api/src/main/java/org/apache/tuscany/api/SCAContainer.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/api/src/main/java/org/apache/tuscany/api/SCAContainer.java Wed Feb 28 16:32:11 2007
@@ -120,7 +120,7 @@
ClassLoader classLoader = SCAContainer.class.getClassLoader();
instance = newInstance(classLoader);
return instance;
- } // NOPMD
+ }
/**
* Start the Tuscany runtime using default SCDLs
@@ -203,6 +203,14 @@
return getInstance().getContext(componentName);
}
+
+ /**
+ * Get access to a system service
+ * @param serviceName
+ * @return
+ */
+ protected abstract Object getSystemService(String serviceName);
+
/**
* Stop the Tuscany container
*/
Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultSCAContainer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultSCAContainer.java?view=diff&rev=513082&r1=513081&r2=513082
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultSCAContainer.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultSCAContainer.java Wed Feb 28 16:32:11 2007
@@ -228,4 +228,16 @@
public CompositeComponent getCompsiteComponent() {
return component;
}
+
+ @Override
+ public Object getSystemService(String serviceName){
+
+ if(serviceName.equals(ComponentNames.TUSCANY_CONTRIBUTION_SERVICE)) {
+ return this.contributionService;
+ } else if(serviceName.equals(ComponentNames.TUSCANY_ASSEMBLY_SERVICE)) {
+ return this.assemblyService;
+ } else {
+ return null;
+ }
+ }
}
Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/ContributionServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/ContributionServiceImpl.java?view=diff&rev=513082&r1=513081&r2=513082
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/ContributionServiceImpl.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/ContributionServiceImpl.java Wed Feb 28 16:32:11 2007
@@ -113,7 +113,7 @@
contribution.setLocation(locationURL);
// process the contribution
- this.processorRegistry.processContent(contribution, contributionURI, locationURL.openStream());
+ this.processorRegistry.processContent(contribution, contributionURI, contributionStream);
// store the contribution on the registry
this.contributionRegistry.put(contribution.getUri(), contribution);
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org