You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jb...@apache.org on 2007/01/10 20:28:22 UTC
svn commit: r494939 - 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: jboynes
Date: Wed Jan 10 11:28:20 2007
New Revision: 494939
URL: http://svn.apache.org/viewvc?view=rev&rev=494939
Log:
add domain name 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/launcher/src/main/java/org/apache/tuscany/launcher/Main.java
incubator/tuscany/java/sca/runtime/standalone/server.start/src/main/java/org/apache/tuscany/standalone/server/TuscanyServer.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/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=494939&r1=494938&r2=494939
==============================================================================
--- 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 Wed Jan 10 11:28:20 2007
@@ -21,6 +21,7 @@
import java.io.File;
import java.net.MalformedURLException;
import java.net.URL;
+import java.net.URI;
import org.apache.tuscany.host.RuntimeInfo;
@@ -47,6 +48,10 @@
this.installDirectory = installDirectory;
this.applicationRootDirectory = applicationRootDirectory;
this.online = online;
+ }
+
+ public URI getDomain() {
+ 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=494939&r1=494938&r2=494939
==============================================================================
--- 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 Wed Jan 10 11:28:20 2007
@@ -20,6 +20,7 @@
import java.io.File;
import java.net.URL;
+import java.net.URI;
/**
* Abstract runtime info implementation.
@@ -27,7 +28,12 @@
* @version $Revision$ $Date$
*/
public abstract class AbstractRuntimeInfo implements RuntimeInfo {
-
+
+ /**
+ * This SCA Domain this runtime belongs to.
+ */
+ private final URI domain;
+
/**
* Application root directory.
*/
@@ -51,42 +57,40 @@
/**
* Initializes the runtime info instance.
*
+ * @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.
*/
- public AbstractRuntimeInfo(File applicationRootDirectory, URL baseUrl, File installDirectory, boolean online) {
+ public AbstractRuntimeInfo(URI domain,
+ File applicationRootDirectory,
+ URL baseUrl,
+ File installDirectory,
+ boolean online) {
+ this.domain = domain;
this.applicationRootDirectory = applicationRootDirectory;
this.baseUrl = baseUrl;
this.installDirectory = installDirectory;
this.online = online;
}
- /**
- * @see org.apache.tuscany.host.RuntimeInfo#getApplicationRootDirectory()
- */
+ public URI getDomain() {
+ return domain;
+ }
+
public final File getApplicationRootDirectory() {
return applicationRootDirectory;
}
- /**
- * @see org.apache.tuscany.host.RuntimeInfo#getBaseURL()
- */
public final URL getBaseURL() {
return baseUrl;
}
- /**
- * @see org.apache.tuscany.host.RuntimeInfo#getInstallDirectory()
- */
public final File getInstallDirectory() {
return installDirectory;
}
- /**
- * @see org.apache.tuscany.host.RuntimeInfo#isOnline()
- */
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=494939&r1=494938&r2=494939
==============================================================================
--- 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 Wed Jan 10 11:28:20 2007
@@ -19,6 +19,7 @@
package org.apache.tuscany.host;
import java.io.File;
+import java.net.URI;
import java.net.URL;
/**
@@ -31,6 +32,14 @@
* The default name that the runtime should assign to the component providing this service.
*/
String COMPONENT_NAME = "RuntimeInfo";
+
+ /**
+ * 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
+ */
+ URI getDomain();
/**
* Return the root 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=494939&r1=494938&r2=494939
==============================================================================
--- 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 Wed Jan 10 11:28:20 2007
@@ -20,6 +20,7 @@
import java.io.File;
import java.net.URL;
+import java.net.URI;
import org.apache.tuscany.host.RuntimeInfo;
@@ -42,6 +43,10 @@
}
public boolean isOnline() {
+ throw new UnsupportedOperationException();
+ }
+
+ public URI getDomain() {
throw new UnsupportedOperationException();
}
}
Modified: incubator/tuscany/java/sca/runtime/standalone/launcher/src/main/java/org/apache/tuscany/launcher/Main.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/standalone/launcher/src/main/java/org/apache/tuscany/launcher/Main.java?view=diff&rev=494939&r1=494938&r2=494939
==============================================================================
--- incubator/tuscany/java/sca/runtime/standalone/launcher/src/main/java/org/apache/tuscany/launcher/Main.java (original)
+++ incubator/tuscany/java/sca/runtime/standalone/launcher/src/main/java/org/apache/tuscany/launcher/Main.java Wed Jan 10 11:28:20 2007
@@ -110,7 +110,7 @@
// online unless the offline property is set
boolean online = !Boolean.parseBoolean(props.getProperty("offline", "false"));
- return new StandaloneRuntimeInfoImpl(profile, installDir, profileDir, null, online, props);
+ return new StandaloneRuntimeInfoImpl(null, profile, installDir, profileDir, null, online, props);
}
static TuscanyRuntime createRuntime(StandaloneRuntimeInfo runtimeInfo) throws Exception {
Modified: incubator/tuscany/java/sca/runtime/standalone/server.start/src/main/java/org/apache/tuscany/standalone/server/TuscanyServer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/standalone/server.start/src/main/java/org/apache/tuscany/standalone/server/TuscanyServer.java?view=diff&rev=494939&r1=494938&r2=494939
==============================================================================
--- incubator/tuscany/java/sca/runtime/standalone/server.start/src/main/java/org/apache/tuscany/standalone/server/TuscanyServer.java (original)
+++ incubator/tuscany/java/sca/runtime/standalone/server.start/src/main/java/org/apache/tuscany/standalone/server/TuscanyServer.java Wed Jan 10 11:28:20 2007
@@ -192,7 +192,7 @@
// online unless the offline property is set
boolean online = !Boolean.parseBoolean(props.getProperty("offline", "false"));
- return new StandaloneRuntimeInfoImpl(profile, installDirectory, profileDir, null, online, props);
+ return new StandaloneRuntimeInfoImpl(null, profile, installDirectory, profileDir, null, online, props);
}
/**
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=494939&r1=494938&r2=494939
==============================================================================
--- 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 Wed Jan 10 11:28:20 2007
@@ -19,6 +19,7 @@
package org.apache.tuscany.runtime.standalone;
import java.io.File;
+import java.net.URI;
import java.util.Properties;
import org.apache.tuscany.host.AbstractRuntimeInfo;
@@ -35,6 +36,7 @@
* Initializes the base URL, install directory, application root directory and
* online mode.
*
+ * @param domain the SCA domain this runtime belongs to
* @param profileName the runtime's profile name
* @param installDirectory directory containing the standalone installation
* @param profileDirectory directory containing this runtime's profile
@@ -42,14 +44,14 @@
* @param online true if this runtime should consider itself online
* @param properties properties for this runtime
*/
- public StandaloneRuntimeInfoImpl(String profileName,
+ public StandaloneRuntimeInfoImpl(URI domain, String profileName,
File installDirectory,
File profileDirectory,
File applicationRootDirectory,
boolean online,
Properties properties) {
- super(applicationRootDirectory, DirectoryHelper.toURL(installDirectory), installDirectory, online);
- this.profileName = profileName;
+ super(domain, applicationRootDirectory, DirectoryHelper.toURL(installDirectory), installDirectory, online);
+ this.profileName = profileName;
this.profileDirectory = profileDirectory;
this.properties = properties;
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=494939&r1=494938&r2=494939
==============================================================================
--- 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 Wed Jan 10 11:28:20 2007
@@ -20,6 +20,7 @@
import java.io.File;
import java.net.URL;
+import java.net.URI;
import javax.servlet.ServletContext;
/**
@@ -54,5 +55,9 @@
public boolean isOnline() {
return online;
+ }
+
+ public URI getDomain() {
+ throw new UnsupportedOperationException();
}
}
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=494939&r1=494938&r2=494939
==============================================================================
--- 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 Wed Jan 10 11:28:20 2007
@@ -20,6 +20,7 @@
import java.io.File;
import java.net.URL;
+import java.net.URI;
import java.util.Set;
import junit.framework.TestCase;
@@ -66,6 +67,10 @@
public boolean isOnline() {
return false;
+ }
+
+ public URI getDomain() {
+ throw new UnsupportedOperationException();
}
});
Artifact artifact = new Artifact();
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org