You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by ad...@apache.org on 2008/04/10 08:44:48 UTC
svn commit: r646665 - in
/incubator/tuscany/sandbox/mobile-android/host-android/src/main/java/org/apache/tuscany/sca/host/embedded:
SCADomain.java impl/DefaultSCADomain.java impl/ReallySmallRuntime.java
Author: adrianocrestani
Date: Wed Apr 9 23:44:31 2008
New Revision: 646665
URL: http://svn.apache.org/viewvc?rev=646665&view=rev
Log:
-updating Android test files on the sandbox
Modified:
incubator/tuscany/sandbox/mobile-android/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomain.java
incubator/tuscany/sandbox/mobile-android/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java
incubator/tuscany/sandbox/mobile-android/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java
Modified: incubator/tuscany/sandbox/mobile-android/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomain.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/mobile-android/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomain.java?rev=646665&r1=646664&r2=646665&view=diff
==============================================================================
--- incubator/tuscany/sandbox/mobile-android/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomain.java (original)
+++ incubator/tuscany/sandbox/mobile-android/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomain.java Wed Apr 9 23:44:31 2008
@@ -33,6 +33,8 @@
import org.osoa.sca.ServiceReference;
import org.osoa.sca.ServiceRuntimeException;
+import android.content.Context;
+
/**
* A handle to an SCA domain.
*
@@ -47,7 +49,16 @@
*/
// TODO: Temporary support for SCADomain.connect() API
protected static SCADomain theDomain;
-
+
+ private static Context context;
+
+ public static void setContext(Context aContext) {
+ context = aContext;
+ }
+
+ public static Context getContext() {
+ return context;
+ }
/**
* Returns a new instance of a local SCA domain.
@@ -109,6 +120,8 @@
public void close() {
// TODO: temporary to support initial SCADomain.connect capability
SCADomain.removeInstance(this);
+
+
}
/**
Modified: incubator/tuscany/sandbox/mobile-android/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/mobile-android/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java?rev=646665&r1=646664&r2=646665&view=diff
==============================================================================
--- incubator/tuscany/sandbox/mobile-android/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java (original)
+++ incubator/tuscany/sandbox/mobile-android/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java Wed Apr 9 23:44:31 2008
@@ -123,18 +123,24 @@
// Contribute the given contribution to an in-memory repository
ContributionService contributionService = runtime.getContributionService();
- URL contributionURL;
+ String contributionURL;
try {
contributionURL = getContributionLocation(applicationClassLoader, contributionLocation, this.composites);
- if (contributionURL != null) {
+ /* if (contributionURL != null) {
// Make sure the URL is correctly encoded (for example, escape the space characters)
contributionURL = contributionURL.toURI().toURL();
- }
+ }*/
} catch (Exception e) {
throw new ServiceRuntimeException(e);
}
try {
+ addContribution(contributionService, contributionURL);
+ } catch (IOException e) {
+ throw new ServiceRuntimeException(e);
+ }
+
+ /* try {
String scheme = contributionURL.toURI().getScheme();
if (scheme == null || scheme.equalsIgnoreCase("file")) {
File contributionFile = new File(contributionURL.toURI());
@@ -161,7 +167,7 @@
throw new ServiceRuntimeException(e);
} catch (URISyntaxException e) {
throw new ServiceRuntimeException(e);
- }
+ }*/
// Create an in-memory domain level composite
AssemblyFactory assemblyFactory = runtime.getAssemblyFactory();
@@ -263,13 +269,13 @@
// }
}
- protected void addContribution(ContributionService contributionService, URL contributionURL) throws IOException {
+ protected void addContribution(ContributionService contributionService, String contributionURL) throws IOException {
try {
- String contributionURI = FileHelper.getName(contributionURL.getPath());
+ /* String contributionURI = FileHelper.getName(contributionURL.getPath());
if (contributionURI == null || contributionURI.length() == 0) {
contributionURI = contributionURL.toString();
- }
- contributions.add(contributionService.contribute(contributionURI, contributionURL, false));
+ }*/
+ contributions.add(contributionService.contribute(contributionURL, null, false));
} catch (ContributionException e) {
throw new ServiceRuntimeException(e);
}
@@ -327,28 +333,33 @@
* @return
* @throws MalformedURLException
*/
- protected URL getContributionLocation(ClassLoader classLoader, String contributionPath, String[] composites)
+ protected String getContributionLocation(ClassLoader classLoader, String contributionPath, String[] composites)
throws MalformedURLException {
- if (contributionPath != null && contributionPath.length() > 0) {
+ /* if (contributionPath != null && contributionPath.length() > 0) {
//encode spaces as they would cause URISyntaxException
contributionPath = contributionPath.replace(" ", "%20");
URI contributionURI = URI.create(contributionPath);
if (contributionURI.isAbsolute() || composites.length == 0) {
return new URL(contributionPath);
}
- }
+ }*/
String contributionArtifactPath = null;
- URL contributionArtifactURL = null;
+ String contributionArtifactURL = null;
if (composites != null && composites.length > 0 && composites[0].length() > 0) {
+ String packageName = getContext().getPackageName();
// Here the SCADomain was started with a reference to a composite file
contributionArtifactPath = composites[0];
- contributionArtifactURL = classLoader.getResource(contributionArtifactPath);
- if (contributionArtifactURL == null) {
+ int contributionId = getContext().getResources().getIdentifier(contributionArtifactPath, "raw", packageName);
+
+ if (contributionId == 0) {
throw new IllegalArgumentException("Composite not found: " + contributionArtifactPath);
}
- } else {
+
+ contributionArtifactURL = packageName + "raw" + contributionArtifactPath;
+
+ } /*else {
// 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
@@ -368,16 +379,16 @@
contributionArtifactPath = Contribution.SCA_CONTRIBUTION_DEPLOYABLES;
contributionArtifactURL = classLoader.getResource(contributionArtifactPath);
}
- }
+ }*/
if (contributionArtifactURL == null) {
throw new IllegalArgumentException(
"Can't determine contribution deployables. Either specify a composite file, or use an sca-contribution.xml file to specify the deployables.");
}
- URL contributionURL = null;
+ //URL contributionURL = contributionArtifactURL;
// "jar:file://....../something.jar!/a/b/c/app.composite"
- try {
+ /*try {
String url = contributionArtifactURL.toExternalForm();
String protocol = contributionArtifactURL.getProtocol();
if ("file".equals(protocol)) {
@@ -402,9 +413,10 @@
}
} catch (MalformedURLException mfe) {
throw new IllegalArgumentException(mfe);
- }
+ }*/
- return contributionURL;
+ return contributionArtifactURL;
+
}
@Override
Modified: incubator/tuscany/sandbox/mobile-android/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/mobile-android/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java?rev=646665&r1=646664&r2=646665&view=diff
==============================================================================
--- incubator/tuscany/sandbox/mobile-android/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java (original)
+++ incubator/tuscany/sandbox/mobile-android/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java Wed Apr 9 23:44:31 2008
@@ -53,8 +53,6 @@
import org.apache.tuscany.sca.core.scope.ScopeRegistry;
import org.apache.tuscany.sca.core.work.Jsr237WorkScheduler;
import org.apache.tuscany.sca.definitions.SCADefinitions;
-import org.apache.tuscany.sca.definitions.SCADefinitionsProvider;
-import org.apache.tuscany.sca.definitions.SCADefinitionsProviderExtensionPoint;
import org.apache.tuscany.sca.definitions.impl.SCADefinitionsImpl;
import org.apache.tuscany.sca.definitions.util.SCADefinitionsUtil;
import org.apache.tuscany.sca.definitions.xml.SCADefinitionsDocumentProcessor;
@@ -71,6 +69,8 @@
import org.apache.tuscany.sca.policy.PolicyFactory;
import org.apache.tuscany.sca.policy.PolicySet;
import org.apache.tuscany.sca.provider.DefaultSCADefinitionsProviderExtensionPoint;
+import org.apache.tuscany.sca.provider.SCADefinitionsProvider;
+import org.apache.tuscany.sca.provider.SCADefinitionsProviderExtensionPoint;
import org.apache.tuscany.sca.work.WorkScheduler;
public class ReallySmallRuntime {
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org