You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by me...@apache.org on 2007/01/20 01:52:44 UTC
svn commit: r498020 - in /incubator/tuscany/java/sca:
kernel/core/src/main/java/org/apache/tuscany/core/launcher/
kernel/host-api/src/main/java/org/apache/tuscany/host/
plugins/plugin.itest/src/main/java/org/apache/tuscany/sca/plugin/itest/
runtime/sta...
Author: meerajk
Date: Fri Jan 19 16:52:43 2007
New Revision: 498020
URL: http://svn.apache.org/viewvc?view=rev&rev=498020
Log:
Added runtimeId to RuntimeInfo
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/launcher/LauncherRuntimeInfo.java
incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/AbstractRuntimeInfo.java
incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/RuntimeInfo.java
incubator/tuscany/java/sca/plugins/plugin.itest/src/main/java/org/apache/tuscany/sca/plugin/itest/MavenRuntimeInfo.java
incubator/tuscany/java/sca/runtime/standalone/standalone-api/src/main/java/org/apache/tuscany/runtime/standalone/StandaloneRuntimeInfoImpl.java
incubator/tuscany/java/sca/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/WebappRuntimeInfoImpl.java
incubator/tuscany/java/sca/services/discovery/jxta/src/main/java/org/apache/tuscany/service/discovery/jxta/JxtaDiscoveryService.java
incubator/tuscany/java/sca/services/maven/src/test/java/org/apache/tuscany/services/maven/MavenArtifactRepositoryTestCase.java
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/launcher/LauncherRuntimeInfo.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/launcher/LauncherRuntimeInfo.java?view=diff&rev=498020&r1=498019&r2=498020
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/launcher/LauncherRuntimeInfo.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/launcher/LauncherRuntimeInfo.java Fri Jan 19 16:52:43 2007
@@ -89,4 +89,8 @@
public boolean isOnline() {
return online;
}
+
+ public String getRuntimeId() {
+ throw new UnsupportedOperationException();
+ }
}
Modified: incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/AbstractRuntimeInfo.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/AbstractRuntimeInfo.java?view=diff&rev=498020&r1=498019&r2=498020
==============================================================================
--- incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/AbstractRuntimeInfo.java (original)
+++ incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/AbstractRuntimeInfo.java Fri Jan 19 16:52:43 2007
@@ -45,14 +45,14 @@
private final URL baseUrl;
/**
- * Install directory.
+ * Online indicator.
*/
- private final File installDirectory;
+ private final boolean online;
/**
- * Online indicator.
+ * Runtime Id.
*/
- private final boolean online;
+ private String runtimeId;
/**
* Initializes the runtime info instance.
@@ -60,37 +60,64 @@
* @param domain the SCA Domain that this runtime belongs to
* @param applicationRootDirectory Application root directory.
* @param baseUrl Base Url.
- * @param installDirectory Install directory.
* @param online Onlne indicator.
+ * @param runtimeId Runtime Id.
*/
- public AbstractRuntimeInfo(URI domain,
- File applicationRootDirectory,
- URL baseUrl,
- File installDirectory,
- boolean online) {
+ public AbstractRuntimeInfo(final URI domain,
+ final File applicationRootDirectory,
+ final URL baseUrl,
+ final boolean online,
+ final String runtimeId) {
this.domain = domain;
this.applicationRootDirectory = applicationRootDirectory;
this.baseUrl = baseUrl;
- this.installDirectory = installDirectory;
this.online = online;
+ this.runtimeId = runtimeId;
}
+ /**
+ * Returns the SCA domain associated with this runtime.
+ * A null domain indicates that this is a standalone runtime with a self-contained assembly.
+ *
+ * @return the SCA domain associated with this runtime; may be null
+ */
public URI getDomain() {
return domain;
}
+ /**
+ * Returns the unique runtime is in the SCA domain.
+ *
+ * @return the SCA domain associated with this runtime; may be null
+ */
+ public String getRuntimeId() {
+ return runtimeId;
+ }
+
+ /**
+ * Return the root directory used to resolve application file paths.
+ *
+ * @return the directory used to resolve application file paths.
+ */
public final File getApplicationRootDirectory() {
return applicationRootDirectory;
}
+ /**
+ * Gets the base URL for the runtime.
+ *
+ * @return The base URL for the runtime.
+ */
public final URL getBaseURL() {
return baseUrl;
}
- public final File getInstallDirectory() {
- return installDirectory;
- }
-
+ /**
+ * Returns whether the runtime considers itself "online" or connected to the internet.
+ * This can be used by services to enable access to remote resources.
+ *
+ * @return true if the runtime is online.
+ */
public final boolean isOnline() {
return online;
}
Modified: incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/RuntimeInfo.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/RuntimeInfo.java?view=diff&rev=498020&r1=498019&r2=498020
==============================================================================
--- incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/RuntimeInfo.java (original)
+++ incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/RuntimeInfo.java Fri Jan 19 16:52:43 2007
@@ -42,6 +42,13 @@
URI getDomain();
/**
+ * Returns the unique runtime is in the SCA domain.
+ *
+ * @return the SCA domain associated with this runtime; may be null
+ */
+ String getRuntimeId();
+
+ /**
* Return the root directory used to resolve application file paths.
*
* @return the directory used to resolve application file paths.
Modified: incubator/tuscany/java/sca/plugins/plugin.itest/src/main/java/org/apache/tuscany/sca/plugin/itest/MavenRuntimeInfo.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/plugins/plugin.itest/src/main/java/org/apache/tuscany/sca/plugin/itest/MavenRuntimeInfo.java?view=diff&rev=498020&r1=498019&r2=498020
==============================================================================
--- incubator/tuscany/java/sca/plugins/plugin.itest/src/main/java/org/apache/tuscany/sca/plugin/itest/MavenRuntimeInfo.java (original)
+++ incubator/tuscany/java/sca/plugins/plugin.itest/src/main/java/org/apache/tuscany/sca/plugin/itest/MavenRuntimeInfo.java Fri Jan 19 16:52:43 2007
@@ -49,4 +49,8 @@
public URI getDomain() {
throw new UnsupportedOperationException();
}
+
+ public String getRuntimeId() {
+ throw new UnsupportedOperationException();
+ }
}
Modified: incubator/tuscany/java/sca/runtime/standalone/standalone-api/src/main/java/org/apache/tuscany/runtime/standalone/StandaloneRuntimeInfoImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/standalone/standalone-api/src/main/java/org/apache/tuscany/runtime/standalone/StandaloneRuntimeInfoImpl.java?view=diff&rev=498020&r1=498019&r2=498020
==============================================================================
--- incubator/tuscany/java/sca/runtime/standalone/standalone-api/src/main/java/org/apache/tuscany/runtime/standalone/StandaloneRuntimeInfoImpl.java (original)
+++ incubator/tuscany/java/sca/runtime/standalone/standalone-api/src/main/java/org/apache/tuscany/runtime/standalone/StandaloneRuntimeInfoImpl.java Fri Jan 19 16:52:43 2007
@@ -30,6 +30,7 @@
public class StandaloneRuntimeInfoImpl extends AbstractRuntimeInfo implements StandaloneRuntimeInfo {
private final String profileName;
private final File profileDirectory;
+ private final File installDirectory;
private final Properties properties;
/**
@@ -44,16 +45,18 @@
* @param online true if this runtime should consider itself online
* @param properties properties for this runtime
*/
- public StandaloneRuntimeInfoImpl(URI domain, String profileName,
- File installDirectory,
- File profileDirectory,
- File applicationRootDirectory,
- boolean online,
- Properties properties) {
- super(domain, applicationRootDirectory, DirectoryHelper.toURL(installDirectory), installDirectory, online);
+ public StandaloneRuntimeInfoImpl(final URI domain,
+ final String profileName,
+ final File installDirectory,
+ final File profileDirectory,
+ final File applicationRootDirectory,
+ final boolean online,
+ final Properties properties) {
+ super(domain, applicationRootDirectory, DirectoryHelper.toURL(installDirectory), online, profileName);
this.profileName = profileName;
this.profileDirectory = profileDirectory;
this.properties = properties;
+ this.installDirectory = installDirectory;
}
@@ -63,6 +66,10 @@
public File getProfileDirectory() {
return profileDirectory;
+ }
+
+ public File getInstallDirectory() {
+ return installDirectory;
}
public String getProperty(String name, String defaultValue) {
Modified: incubator/tuscany/java/sca/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/WebappRuntimeInfoImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/WebappRuntimeInfoImpl.java?view=diff&rev=498020&r1=498019&r2=498020
==============================================================================
--- incubator/tuscany/java/sca/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/WebappRuntimeInfoImpl.java (original)
+++ incubator/tuscany/java/sca/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/WebappRuntimeInfoImpl.java Fri Jan 19 16:52:43 2007
@@ -60,4 +60,8 @@
public URI getDomain() {
throw new UnsupportedOperationException();
}
+
+ public String getRuntimeId() {
+ throw new UnsupportedOperationException();
+ }
}
Modified: incubator/tuscany/java/sca/services/discovery/jxta/src/main/java/org/apache/tuscany/service/discovery/jxta/JxtaDiscoveryService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/discovery/jxta/src/main/java/org/apache/tuscany/service/discovery/jxta/JxtaDiscoveryService.java?view=diff&rev=498020&r1=498019&r2=498020
==============================================================================
--- incubator/tuscany/java/sca/services/discovery/jxta/src/main/java/org/apache/tuscany/service/discovery/jxta/JxtaDiscoveryService.java (original)
+++ incubator/tuscany/java/sca/services/discovery/jxta/src/main/java/org/apache/tuscany/service/discovery/jxta/JxtaDiscoveryService.java Fri Jan 19 16:52:43 2007
@@ -26,7 +26,6 @@
import org.apache.tuscany.host.RuntimeInfo;
import org.apache.tuscany.spi.services.discovery.AbstractDiscoveryService;
-import org.apache.tuscany.spi.services.domain.DomainModelService;
/**
* Discovery service implemented using Apple bonjour.
@@ -45,8 +44,8 @@
*/
public void onMessage(Message message) {
- DomainModelService domainModelService = getDomainModelService();
// TODO Notify the domain model service
+ // DomainModelService domainModelService = getDomainModelService();
}
/**
@@ -62,10 +61,9 @@
RuntimeInfo runtimeInfo = getRuntimeInfo();
URI domain = runtimeInfo.getDomain();
- // TODO Move profile from StandaloneRuntimeInfo to RuntimeInfo
- String profile = null;
+ String runtimeId = runtimeInfo.getRuntimeId();
- pipeReceiver.start(domain, profile);
+ pipeReceiver.start(domain, runtimeId);
// TODO Use pipe sender to notify coming alive
Modified: incubator/tuscany/java/sca/services/maven/src/test/java/org/apache/tuscany/services/maven/MavenArtifactRepositoryTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/maven/src/test/java/org/apache/tuscany/services/maven/MavenArtifactRepositoryTestCase.java?view=diff&rev=498020&r1=498019&r2=498020
==============================================================================
--- incubator/tuscany/java/sca/services/maven/src/test/java/org/apache/tuscany/services/maven/MavenArtifactRepositoryTestCase.java (original)
+++ incubator/tuscany/java/sca/services/maven/src/test/java/org/apache/tuscany/services/maven/MavenArtifactRepositoryTestCase.java Fri Jan 19 16:52:43 2007
@@ -72,6 +72,10 @@
public URI getDomain() {
throw new UnsupportedOperationException();
}
+
+ public String getRuntimeId() {
+ throw new UnsupportedOperationException();
+ }
});
Artifact artifact = new Artifact();
artifact.setGroup("junit");
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org