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 2006/10/13 21:43:15 UTC
svn commit: r463801 - in /incubator/tuscany/java:
distribution/sca/standalone/ distribution/sca/standalone/src/main/assembly/
sca/commands/launcher/src/main/resources/META-INF/tuscany/
sca/runtime/standalone-host/src/main/java/org/apache/tuscany/runtim...
Author: jboynes
Date: Fri Oct 13 12:43:14 2006
New Revision: 463801
URL: http://svn.apache.org/viewvc?view=rev&rev=463801
Log:
enable maven repo support in the standalone runtime
Modified:
incubator/tuscany/java/distribution/sca/standalone/pom.xml
incubator/tuscany/java/distribution/sca/standalone/src/main/assembly/standalone.xml
incubator/tuscany/java/sca/commands/launcher/src/main/resources/META-INF/tuscany/system.scdl
incubator/tuscany/java/sca/runtime/standalone-host/src/main/java/org/apache/tuscany/runtime/standalone/host/StandaloneRuntimeImpl.java
incubator/tuscany/java/sca/runtime/standalone/src/main/java/org/apache/tuscany/runtime/standalone/StandaloneRuntimeInfo.java
incubator/tuscany/java/sca/runtime/webapp/src/main/java/org/apache/tuscany/runtime/webapp/WebappRuntimeInfo.java
Modified: incubator/tuscany/java/distribution/sca/standalone/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/distribution/sca/standalone/pom.xml?view=diff&rev=463801&r1=463800&r2=463801
==============================================================================
--- incubator/tuscany/java/distribution/sca/standalone/pom.xml (original)
+++ incubator/tuscany/java/distribution/sca/standalone/pom.xml Fri Oct 13 12:43:14 2006
@@ -76,6 +76,11 @@
<artifactId>launcher</artifactId>
<version>${sca.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca.services</groupId>
+ <artifactId>maven</artifactId>
+ <version>${sca.version}</version>
+ </dependency>
</dependencies>
<build>
Modified: incubator/tuscany/java/distribution/sca/standalone/src/main/assembly/standalone.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/distribution/sca/standalone/src/main/assembly/standalone.xml?view=diff&rev=463801&r1=463800&r2=463801
==============================================================================
--- incubator/tuscany/java/distribution/sca/standalone/src/main/assembly/standalone.xml (original)
+++ incubator/tuscany/java/distribution/sca/standalone/src/main/assembly/standalone.xml Fri Oct 13 12:43:14 2006
@@ -67,6 +67,7 @@
<outputDirectory>boot</outputDirectory>
<includes>
<include>org.apache.tuscany.sca.runtime:standalone-host</include>
+ <include>org.apache.tuscany.sca.services:maven</include>
</includes>
<fileMode>644</fileMode>
</dependencySet>
Modified: incubator/tuscany/java/sca/commands/launcher/src/main/resources/META-INF/tuscany/system.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/commands/launcher/src/main/resources/META-INF/tuscany/system.scdl?view=diff&rev=463801&r1=463800&r2=463801
==============================================================================
--- incubator/tuscany/java/sca/commands/launcher/src/main/resources/META-INF/tuscany/system.scdl (original)
+++ incubator/tuscany/java/sca/commands/launcher/src/main/resources/META-INF/tuscany/system.scdl Fri Oct 13 12:43:14 2006
@@ -99,10 +99,10 @@
<!-- Java implementation type -->
<include name="org.apache.tuscany.core.JavaImplementation" scdlResource="org/apache/tuscany/core/javaImplementation.scdl"/>
- <!-- service for resolving artifacts against the user's local Maven repository -->
+ <!-- service for resolving artifacts using Maven repositories -->
<component name="artifactRepository">
- <system:implementation.system class="org.apache.tuscany.core.services.artifact.LocalMavenRepository"/>
- <property name="repository">.m2/repository</property>
+ <system:implementation.system class="org.apache.tuscany.services.maven.MavenArtifactRepository"/>
+ <property name="remoteRepoUrl">http://repo1.maven.org/maven2/,http://people.apache.org/repo/m2-snapshot-repository,http://people.apache.org/repo/m2-incubating-repository/,http://people.apache.org/repo/m1-snapshot-repository/</property>
</component>
<!-- WorkScheduler service -->
Modified: incubator/tuscany/java/sca/runtime/standalone-host/src/main/java/org/apache/tuscany/runtime/standalone/host/StandaloneRuntimeImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/standalone-host/src/main/java/org/apache/tuscany/runtime/standalone/host/StandaloneRuntimeImpl.java?view=diff&rev=463801&r1=463800&r2=463801
==============================================================================
--- incubator/tuscany/java/sca/runtime/standalone-host/src/main/java/org/apache/tuscany/runtime/standalone/host/StandaloneRuntimeImpl.java (original)
+++ incubator/tuscany/java/sca/runtime/standalone-host/src/main/java/org/apache/tuscany/runtime/standalone/host/StandaloneRuntimeImpl.java Fri Oct 13 12:43:14 2006
@@ -60,9 +60,11 @@
systemComponent = runtime.getSystemComponent();
// register the runtime info provided by the host
- systemComponent.registerJavaObject(RuntimeInfo.COMPONENT_NAME,
- StandaloneRuntimeInfo.class,
- (StandaloneRuntimeInfo) getRuntimeInfo());
+ RuntimeInfo runtimeInfo = getRuntimeInfo();
+ systemComponent.registerJavaObject(RuntimeInfo.COMPONENT_NAME, RuntimeInfo.class, runtimeInfo);
+ systemComponent.registerJavaObject(StandaloneRuntimeInfo.COMPONENT_NAME,
+ StandaloneRuntimeInfo.class,
+ (StandaloneRuntimeInfo) runtimeInfo);
// register the monitor factory provided by the host
systemComponent.registerJavaObject("MonitorFactory", MonitorFactory.class, mf);
Modified: incubator/tuscany/java/sca/runtime/standalone/src/main/java/org/apache/tuscany/runtime/standalone/StandaloneRuntimeInfo.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/standalone/src/main/java/org/apache/tuscany/runtime/standalone/StandaloneRuntimeInfo.java?view=diff&rev=463801&r1=463800&r2=463801
==============================================================================
--- incubator/tuscany/java/sca/runtime/standalone/src/main/java/org/apache/tuscany/runtime/standalone/StandaloneRuntimeInfo.java (original)
+++ incubator/tuscany/java/sca/runtime/standalone/src/main/java/org/apache/tuscany/runtime/standalone/StandaloneRuntimeInfo.java Fri Oct 13 12:43:14 2006
@@ -24,4 +24,5 @@
* @version $Rev$ $Date$
*/
public interface StandaloneRuntimeInfo extends RuntimeInfo {
+ static String COMPONENT_NAME = "StandaloneRuntimeInfo";
}
Modified: incubator/tuscany/java/sca/runtime/webapp/src/main/java/org/apache/tuscany/runtime/webapp/WebappRuntimeInfo.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/webapp/src/main/java/org/apache/tuscany/runtime/webapp/WebappRuntimeInfo.java?view=diff&rev=463801&r1=463800&r2=463801
==============================================================================
--- incubator/tuscany/java/sca/runtime/webapp/src/main/java/org/apache/tuscany/runtime/webapp/WebappRuntimeInfo.java (original)
+++ incubator/tuscany/java/sca/runtime/webapp/src/main/java/org/apache/tuscany/runtime/webapp/WebappRuntimeInfo.java Fri Oct 13 12:43:14 2006
@@ -26,7 +26,7 @@
* @version $Rev$ $Date$
*/
public interface WebappRuntimeInfo extends RuntimeInfo {
- public final static String COMPONENT_NAME = "WebappRuntimeInfo";
+ static String COMPONENT_NAME = "WebappRuntimeInfo";
/**
* Returns the ServletContext associated with this webapp runtime.
*
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org