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/02/10 21:08:06 UTC
svn commit: r505753 - in
/incubator/tuscany/java/sca/runtime/itest/src/main/java/org/apache/tuscany/sca/plugin/itest:
MavenEmbeddedArtifactRepository.java MavenEmbeddedRuntime.java
TuscanyITestMojo.java TuscanyStartMojo.java
Author: jboynes
Date: Sat Feb 10 12:08:06 2007
New Revision: 505753
URL: http://svn.apache.org/viewvc?view=rev&rev=505753
Log:
comment out old application deployment code
Added:
incubator/tuscany/java/sca/runtime/itest/src/main/java/org/apache/tuscany/sca/plugin/itest/MavenEmbeddedArtifactRepository.java (with props)
Modified:
incubator/tuscany/java/sca/runtime/itest/src/main/java/org/apache/tuscany/sca/plugin/itest/MavenEmbeddedRuntime.java
incubator/tuscany/java/sca/runtime/itest/src/main/java/org/apache/tuscany/sca/plugin/itest/TuscanyITestMojo.java
incubator/tuscany/java/sca/runtime/itest/src/main/java/org/apache/tuscany/sca/plugin/itest/TuscanyStartMojo.java
Added: incubator/tuscany/java/sca/runtime/itest/src/main/java/org/apache/tuscany/sca/plugin/itest/MavenEmbeddedArtifactRepository.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/itest/src/main/java/org/apache/tuscany/sca/plugin/itest/MavenEmbeddedArtifactRepository.java?view=auto&rev=505753
==============================================================================
--- incubator/tuscany/java/sca/runtime/itest/src/main/java/org/apache/tuscany/sca/plugin/itest/MavenEmbeddedArtifactRepository.java (added)
+++ incubator/tuscany/java/sca/runtime/itest/src/main/java/org/apache/tuscany/sca/plugin/itest/MavenEmbeddedArtifactRepository.java Sat Feb 10 12:08:06 2007
@@ -0,0 +1,159 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tuscany.sca.plugin.itest;
+
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.util.Collection;
+import java.util.List;
+
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.factory.ArtifactFactory;
+import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
+import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
+import org.apache.maven.artifact.metadata.ResolutionGroup;
+import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
+import org.apache.maven.artifact.resolver.ArtifactResolutionException;
+import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
+import org.apache.maven.artifact.resolver.ArtifactResolver;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class MavenEmbeddedArtifactRepository implements org.apache.tuscany.spi.services.artifact.ArtifactRepository {
+ public static final URI COMPONENT_NAME = URI.create("MavenEmbeddedArtifactRepository");
+
+ private ArtifactFactory artifactFactory;
+ private ArtifactResolver resolver;
+ private ArtifactMetadataSource metadataSource;
+ private ArtifactRepository localRepository;
+ private List remoteRepositories;
+
+ public MavenEmbeddedArtifactRepository(ArtifactFactory artifactFactory,
+ ArtifactResolver resolver,
+ ArtifactMetadataSource metadataSource,
+ ArtifactRepository localRepository,
+ List remoteRepositories) {
+ this.artifactFactory = artifactFactory;
+ this.resolver = resolver;
+ this.metadataSource = metadataSource;
+ this.localRepository = localRepository;
+ this.remoteRepositories = remoteRepositories;
+ }
+
+ public void resolve(org.apache.tuscany.spi.services.artifact.Artifact artifact) {
+ resolveTransitively(artifact);
+ }
+
+ public void resolve(Collection artifacts) {
+ for (Object a : artifacts) {
+ resolve((Artifact) a);
+ }
+ }
+
+ /**
+ * Resolves the dependencies transitively.
+ *
+ * @param rootArtifact Artifact whose dependencies need to be resolved.
+ * @return true if all dependencies were resolved
+ */
+ public boolean resolveTransitively(org.apache.tuscany.spi.services.artifact.Artifact rootArtifact) {
+
+ Artifact mavenRootArtifact =
+ artifactFactory.createArtifact(rootArtifact.getGroup(), rootArtifact.getName(), rootArtifact
+ .getVersion(), Artifact.SCOPE_RUNTIME, rootArtifact.getType());
+
+ try {
+
+ if (resolve(mavenRootArtifact)) {
+ rootArtifact.setUrl(mavenRootArtifact.getFile().toURL());
+ return resolveDependencies(rootArtifact, mavenRootArtifact);
+ } else {
+ return false;
+ }
+ } catch (MalformedURLException ex) {
+ throw new IllegalArgumentException(ex);
+ }
+
+ }
+
+ /*
+ * Resolves the artifact.
+ */
+ private boolean resolve(Artifact mavenRootArtifact) {
+
+ try {
+ resolver.resolve(mavenRootArtifact, remoteRepositories, localRepository);
+ return true;
+ } catch (ArtifactResolutionException ex) {
+ return false;
+ } catch (ArtifactNotFoundException ex) {
+ return false;
+ }
+
+ }
+
+ /*
+ * Resolves transitive dependencies.
+ */
+ private boolean resolveDependencies(org.apache.tuscany.spi.services.artifact.Artifact rootArtifact,
+ Artifact mavenRootArtifact) {
+
+ try {
+
+ ResolutionGroup resolutionGroup = metadataSource.retrieve(mavenRootArtifact,
+ localRepository,
+ remoteRepositories);
+
+ ArtifactResolutionResult result = resolver.resolveTransitively(resolutionGroup.getArtifacts(),
+ mavenRootArtifact,
+ remoteRepositories,
+ localRepository,
+ metadataSource);
+
+ // Add the artifacts to the deployment unit
+ for (Object obj : result.getArtifacts()) {
+ Artifact depArtifact = (Artifact) obj;
+ org.apache.tuscany.spi.services.artifact.Artifact artifact =
+ new org.apache.tuscany.spi.services.artifact.Artifact();
+ artifact.setName(depArtifact.getArtifactId());
+ artifact.setGroup(depArtifact.getGroupId());
+ artifact.setType(depArtifact.getType());
+ artifact.setClassifier(depArtifact.getClassifier());
+ artifact.setUrl(depArtifact.getFile().toURL());
+ artifact.setVersion(depArtifact.getVersion());
+ rootArtifact.addDependency(artifact);
+ }
+
+ } catch (ArtifactMetadataRetrievalException ex) {
+ return false;
+ } catch (MalformedURLException ex) {
+ throw new IllegalArgumentException(ex);
+ } catch (ArtifactResolutionException ex) {
+ return false;
+ } catch (ArtifactNotFoundException ex) {
+ return false;
+ }
+
+ return true;
+
+ }
+
+}
Propchange: incubator/tuscany/java/sca/runtime/itest/src/main/java/org/apache/tuscany/sca/plugin/itest/MavenEmbeddedArtifactRepository.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/runtime/itest/src/main/java/org/apache/tuscany/sca/plugin/itest/MavenEmbeddedArtifactRepository.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/runtime/itest/src/main/java/org/apache/tuscany/sca/plugin/itest/MavenEmbeddedRuntime.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/itest/src/main/java/org/apache/tuscany/sca/plugin/itest/MavenEmbeddedRuntime.java?view=diff&rev=505753&r1=505752&r2=505753
==============================================================================
--- incubator/tuscany/java/sca/runtime/itest/src/main/java/org/apache/tuscany/sca/plugin/itest/MavenEmbeddedRuntime.java (original)
+++ incubator/tuscany/java/sca/runtime/itest/src/main/java/org/apache/tuscany/sca/plugin/itest/MavenEmbeddedRuntime.java Sat Feb 10 12:08:06 2007
@@ -18,31 +18,16 @@
*/
package org.apache.tuscany.sca.plugin.itest;
-import java.net.URI;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
-
import org.apache.tuscany.core.runtime.AbstractRuntime;
import org.apache.tuscany.host.runtime.InitializationException;
-import org.apache.tuscany.sca.plugin.itest.TuscanyStartMojo.MavenEmbeddedArtifactRepository;
import org.apache.tuscany.spi.component.ComponentRegistrationException;
-import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.services.artifact.ArtifactRepository;
/**
* @version $Rev$ $Date$
*/
public class MavenEmbeddedRuntime extends AbstractRuntime {
- private CompositeComponent application;
-
private ArtifactRepository artifactRepository;
- // leave untyped b/c of QDox error
- private Map extensions = new HashMap();
-
- public void addExtension(String extensionName, URL extentionSCDL) {
- extensions.put(extensionName, extentionSCDL);
- }
protected void registerSystemComponents() throws InitializationException {
super.registerSystemComponents();
@@ -51,71 +36,12 @@
MavenRuntimeInfo.class,
(MavenRuntimeInfo) getRuntimeInfo());
- getComponentManager().registerJavaObject(URI.create(MavenEmbeddedArtifactRepository.COMPONENT_NAME),
+ getComponentManager().registerJavaObject(MavenEmbeddedArtifactRepository.COMPONENT_NAME,
ArtifactRepository.class,
artifactRepository);
} catch (ComponentRegistrationException e) {
throw new InitializationException(e);
}
- }
-
- public void initialize() throws InitializationException {
- super.initialize();
-
-/*
- try {
- for (Object extensionName : extensions.keySet()) {
- deployExtension(getTuscanySystem(), getDeployer(), (String) extensionName, (URL) extensions.get(extensionName));
- }
-
- application = deployApplicationScdl(getDeployer(),
- getRuntime().getRootComponent(),
- getApplicationName(),
- getApplicationScdl(),
- getApplicationClassLoader());
- application.start();
-
- context = new CompositeContextImpl(application, getWireService());
- } catch (LoaderException e) {
- throw new InitializationException(e);
- } catch (BuilderException e) {
- throw new InitializationException(e);
- } catch (TargetResolutionException e) {
- throw new InitializationException(e);
- } catch (ComponentException e) {
- throw new InitializationException(e);
- }
-*/
- }
-
- /*
- protected void deployExtension(CompositeComponent composite, Deployer deployer, String extensionName, URL url)
- throws LoaderException, BuilderException, ComponentException {
- SystemCompositeImplementation implementation = new SystemCompositeImplementation();
- URL scdlLocation;
- try {
- scdlLocation = new URL("jar:" + url.toExternalForm() + "!/META-INF/sca/default.scdl");
- } catch (MalformedURLException e) {
- throw new IllegalArgumentException(e);
- }
-
- implementation.setScdlLocation(scdlLocation);
- implementation.setClassLoader(new CompositeClassLoader(new URL[]{url}, getClass().getClassLoader()));
-
- ComponentDefinition<SystemCompositeImplementation> definition =
- new ComponentDefinition<SystemCompositeImplementation>(extensionName, implementation);
-
- Component component = deployer.deploy(composite, definition);
- component.start();
- }
-
- */
- public void destroy() {
- if (application != null) {
- application.stop();
- application = null;
- }
- super.destroy();
}
public void setArtifactRepository(ArtifactRepository artifactRepository) {
Modified: incubator/tuscany/java/sca/runtime/itest/src/main/java/org/apache/tuscany/sca/plugin/itest/TuscanyITestMojo.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/itest/src/main/java/org/apache/tuscany/sca/plugin/itest/TuscanyITestMojo.java?view=diff&rev=505753&r1=505752&r2=505753
==============================================================================
--- incubator/tuscany/java/sca/runtime/itest/src/main/java/org/apache/tuscany/sca/plugin/itest/TuscanyITestMojo.java (original)
+++ incubator/tuscany/java/sca/runtime/itest/src/main/java/org/apache/tuscany/sca/plugin/itest/TuscanyITestMojo.java Sat Feb 10 12:08:06 2007
@@ -82,7 +82,8 @@
}
public boolean runSurefire() throws MojoExecutionException {
- ClassLoader testsClassLoader = TuscanyStartMojo.foo.get();
+ // FIXME get classloader for tests
+ ClassLoader testsClassLoader = null;
try {
Properties status = new Properties();
boolean success = run(testsClassLoader, status);
Modified: incubator/tuscany/java/sca/runtime/itest/src/main/java/org/apache/tuscany/sca/plugin/itest/TuscanyStartMojo.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/itest/src/main/java/org/apache/tuscany/sca/plugin/itest/TuscanyStartMojo.java?view=diff&rev=505753&r1=505752&r2=505753
==============================================================================
--- incubator/tuscany/java/sca/runtime/itest/src/main/java/org/apache/tuscany/sca/plugin/itest/TuscanyStartMojo.java (original)
+++ incubator/tuscany/java/sca/runtime/itest/src/main/java/org/apache/tuscany/sca/plugin/itest/TuscanyStartMojo.java Sat Feb 10 12:08:06 2007
@@ -19,29 +19,20 @@
package org.apache.tuscany.sca.plugin.itest;
import java.io.File;
-import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLClassLoader;
-import java.net.URI;
-import java.util.Collection;
-import java.util.Enumeration;
import java.util.Iterator;
import java.util.List;
-import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
-import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
-import org.apache.maven.artifact.metadata.ResolutionGroup;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
-import org.apache.maven.artifact.resolver.ArtifactResolutionException;
-import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
import org.apache.maven.artifact.resolver.ArtifactResolver;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
+
import org.apache.tuscany.host.runtime.InitializationException;
/**
@@ -51,113 +42,6 @@
*/
public class TuscanyStartMojo extends AbstractMojo {
- public class MavenEmbeddedArtifactRepository implements org.apache.tuscany.spi.services.artifact.ArtifactRepository {
- public static final String COMPONENT_NAME = "MavenEmbeddedArtifactRepository";
-
- public void resolve(org.apache.tuscany.spi.services.artifact.Artifact artifact) {
- resolveTransitively(artifact);
- }
-
- public void resolve(Collection artifacts) {
- for (Object a : artifacts) {
- resolve((Artifact)a);
- }
- }
-
- /**
- * Resolves the dependencies transitively.
- *
- * @param rootArtifact Artifact whose dependencies need to be resolved.
- */
- public boolean resolveTransitively(org.apache.tuscany.spi.services.artifact.Artifact rootArtifact) {
-
- org.apache.maven.artifact.Artifact mavenRootArtifact =
- artifactFactory.createArtifact(rootArtifact.getGroup(), rootArtifact.getName(), rootArtifact
- .getVersion(), org.apache.maven.artifact.Artifact.SCOPE_RUNTIME, rootArtifact.getType());
-
- try {
-
- if (resolve(mavenRootArtifact)) {
- rootArtifact.setUrl(mavenRootArtifact.getFile().toURL());
- if (resolveDependencies(rootArtifact, mavenRootArtifact)) {
- return true;
- } else {
- return false;
- }
- } else {
- return false;
- }
- } catch (MalformedURLException ex) {
- throw new IllegalArgumentException(ex);
- }
-
- }
-
- /*
- * Resolves the artifact.
- */
- private boolean resolve(org.apache.maven.artifact.Artifact mavenRootArtifact) {
-
- try {
- resolver.resolve(mavenRootArtifact, remoteRepositories, localRepository);
- return true;
- } catch (ArtifactResolutionException ex) {
- return false;
- } catch (ArtifactNotFoundException ex) {
- return false;
- }
-
- }
-
- /*
- * Resolves transitive dependencies.
- */
- private boolean resolveDependencies(org.apache.tuscany.spi.services.artifact.Artifact rootArtifact,
- org.apache.maven.artifact.Artifact mavenRootArtifact) {
-
- try {
-
- ResolutionGroup resolutionGroup = null;
- ArtifactResolutionResult result = null;
-
- resolutionGroup = metadataSource.retrieve(mavenRootArtifact, localRepository, remoteRepositories);
- result =
- resolver.resolveTransitively(resolutionGroup.getArtifacts(),
- mavenRootArtifact,
- remoteRepositories,
- localRepository,
- metadataSource);
-
- // Add the artifacts to the deployment unit
- for (Object obj : result.getArtifacts()) {
- org.apache.maven.artifact.Artifact depArtifact = (org.apache.maven.artifact.Artifact)obj;
- org.apache.tuscany.spi.services.artifact.Artifact artifact =
- new org.apache.tuscany.spi.services.artifact.Artifact();
- artifact.setName(depArtifact.getArtifactId());
- artifact.setGroup(depArtifact.getGroupId());
- artifact.setType(depArtifact.getType());
- artifact.setClassifier(depArtifact.getClassifier());
- artifact.setUrl(depArtifact.getFile().toURL());
- artifact.setVersion(depArtifact.getVersion());
- rootArtifact.addDependency(artifact);
- }
-
- } catch (ArtifactMetadataRetrievalException ex) {
- return false;
- } catch (MalformedURLException ex) {
- throw new IllegalArgumentException(ex);
- } catch (ArtifactResolutionException ex) {
- return false;
- } catch (ArtifactNotFoundException ex) {
- return false;
- }
-
- return true;
-
- }
-
- }
-
/**
* @parameter
*/
@@ -177,14 +61,14 @@
/**
* Extensions
- *
+ *
* @parameter
*/
private Dependency[] extensions = new Dependency[0];
/**
* Used to look up Artifacts in the remote repository.
- *
+ *
* @parameter expression="${component.org.apache.maven.artifact.resolver.ArtifactResolver}"
* @required
* @readonly
@@ -193,7 +77,7 @@
/**
* Used to look up Artifacts in the remote repository.
- *
+ *
* @parameter expression="${component.org.apache.maven.artifact.metadata.ArtifactMetadataSource}"
* @required
* @readonly
@@ -202,7 +86,7 @@
/**
* Location of the local repository.
- *
+ *
* @parameter expression="${localRepository}"
* @readonly
* @required
@@ -211,7 +95,7 @@
/**
* List of Remote Repositories used by the resolver
- *
+ *
* @parameter expression="${project.remoteArtifactRepositories}"
* @readonly
* @required
@@ -220,15 +104,13 @@
/**
* Used to look up Artifacts in the remote repository.
- *
+ *
* @parameter expression="${component.org.apache.maven.artifact.factory.ArtifactFactory}"
* @required
* @readonly
*/
private ArtifactFactory artifactFactory;
- static ThreadLocal<ClassLoader> foo = new ThreadLocal<ClassLoader>();
-
public void execute() throws MojoExecutionException, MojoFailureException {
getLog().info("Starting Tuscany...");
@@ -238,9 +120,18 @@
}
MavenRuntimeInfo runtimeInfo = new MavenRuntimeInfo();
+ MavenEmbeddedArtifactRepository artifactRepository = new MavenEmbeddedArtifactRepository(artifactFactory,
+ resolver,
+ metadataSource,
+ localRepository,
+ remoteRepositories);
MavenEmbeddedRuntime runtime = new MavenEmbeddedRuntime();
- runtime.setArtifactRepository(new MavenEmbeddedArtifactRepository());
+ runtime.setRuntimeInfo(runtimeInfo);
+ runtime.setSystemScdl(systemScdl);
+ runtime.setHostClassLoader(hostClassLoader);
+ runtime.setArtifactRepository(artifactRepository);
+/*
for (Dependency d : extensions) {
try {
Artifact artifact = d.getArtifact(artifactFactory);
@@ -252,10 +143,9 @@
throw new MojoExecutionException("Fail to resolve an extension", e);
}
}
+*/
- runtime.setSystemScdl(systemScdl);
- runtime.setHostClassLoader(hostClassLoader);
-
+/*
ClassLoader applicationClassLoader = createApplicationClassLoader(hostClassLoader);
if (applicationScdl == null) {
Enumeration resources;
@@ -289,21 +179,19 @@
runtime.setApplicationName("application");
runtime.setApplicationScdl(applicationScdl);
runtime.setApplicationClassLoader(applicationClassLoader);
- runtime.setRuntimeInfo(runtimeInfo);
+*/
try {
runtime.initialize();
} catch (InitializationException e) {
throw new MojoExecutionException("Error initializing", e);
}
-
- foo.set(applicationClassLoader);
}
public ClassLoader createApplicationClassLoader(ClassLoader parent) {
URL[] urls = new URL[testClassPath.size()];
int idx = 0;
for (Iterator i = testClassPath.iterator(); i.hasNext();) {
- File pathElement = new File((String)i.next());
+ File pathElement = new File((String) i.next());
try {
URL url = pathElement.toURI().toURL();
getLog().debug("Adding application URL: " + url);
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org