From 701d50c2a2308672129ca761036500f7492a84b0 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Wed, 8 Dec 2010 09:56:47 +0000 Subject: [PATCH] Use commons as parent git-svn-id: https://svn.argeo.org/slc/trunk@3957 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- dep/org.argeo.slc.dep.server/pom.xml | 5 + dist/org.argeo.slc.sdk/pom.xml | 2 +- .../org.argeo.slc.it.webapp/pom.xml | 8 + pom.xml | 142 +--- .../slc/maven/MavenDeployEnvironment.java | 13 +- .../org/argeo/slc/maven/MavenManager.java | 48 +- .../org/argeo/slc/maven/SlcMavenEmbedder.java | 717 ------------------ .../embedder/AbstractMavenEmbedderLogger.java | 140 ---- .../embedder/MavenEmbedderConsoleLogger.java | 99 --- .../embedder/MavenEmbedderException.java | 56 -- .../maven/embedder/MavenEmbedderLogger.java | 86 --- .../embedder/MavenEmbedderLoggerManager.java | 164 ---- .../maven/embedder/PlexusLoggerAdapter.java | 143 ---- .../embedder/SummaryPluginDescriptor.java | 52 -- runtime/org.argeo.slc.support.osgi/pom.xml | 14 +- .../.classpath | 2 +- .../org.argeo.slc.support.ws.client/.project | 9 +- .../org.argeo.slc.support.ws.client/pom.xml | 2 +- 18 files changed, 87 insertions(+), 1615 deletions(-) delete mode 100644 runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/SlcMavenEmbedder.java delete mode 100644 runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/embedder/AbstractMavenEmbedderLogger.java delete mode 100644 runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/embedder/MavenEmbedderConsoleLogger.java delete mode 100644 runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/embedder/MavenEmbedderException.java delete mode 100644 runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/embedder/MavenEmbedderLogger.java delete mode 100644 runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/embedder/MavenEmbedderLoggerManager.java delete mode 100644 runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/embedder/PlexusLoggerAdapter.java delete mode 100644 runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/embedder/SummaryPluginDescriptor.java diff --git a/dep/org.argeo.slc.dep.server/pom.xml b/dep/org.argeo.slc.dep.server/pom.xml index 35ec95891..3fd01d479 100644 --- a/dep/org.argeo.slc.dep.server/pom.xml +++ b/dep/org.argeo.slc.dep.server/pom.xml @@ -40,6 +40,11 @@ org.argeo.slc.runtime org.argeo.slc.support.jcr + + org.argeo.slc.runtime + org.argeo.slc.support.ws.client + ${project.version} + diff --git a/dist/org.argeo.slc.sdk/pom.xml b/dist/org.argeo.slc.sdk/pom.xml index 901e7dd1a..e60e73a88 100644 --- a/dist/org.argeo.slc.sdk/pom.xml +++ b/dist/org.argeo.slc.sdk/pom.xml @@ -7,7 +7,7 @@ org.argeo.slc.dist org.argeo.slc.sdk - jar + pom SLC SDK /opt/equinox-p2-agent/eclipse diff --git a/integration-tests/org.argeo.slc.it.webapp/pom.xml b/integration-tests/org.argeo.slc.it.webapp/pom.xml index 034317318..18f192bc6 100644 --- a/integration-tests/org.argeo.slc.it.webapp/pom.xml +++ b/integration-tests/org.argeo.slc.it.webapp/pom.xml @@ -113,6 +113,14 @@ + + maven-jar-plugin + + + META-INF/MANIFEST.MF + + + diff --git a/pom.xml b/pom.xml index e8fca2fdd..607a12dd0 100644 --- a/pom.xml +++ b/pom.xml @@ -1,9 +1,10 @@ - + 4.0.0 - org.argeo - parent - 1.2.0 + org.argeo.commons + argeo-commons + 0.2.2-SNAPSHOT org.argeo.slc argeo-slc @@ -12,13 +13,6 @@ 0.13.1-SNAPSHOT 0.13 - 1.1.0 - 0.12.5 - 0.2.1 - 3.6.1 - 2.0.1 - 0.1.29 - 1.1.0 file:///srv/projects/www/slc/site http://projects.argeo.org/slc/site @@ -39,10 +33,6 @@ scm:svn:https://svn.argeo.org/slc/trunk https://svn.argeo.org/slc/trunk - - Bugzilla - https://bugzilla.argeo.org - Apache 2 @@ -68,10 +58,6 @@ limitations under the License. - - Argeo - http://www.argeo.org - mbaudier @@ -118,112 +104,8 @@ limitations under the License. - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - package - - jar - - - - - - org.argeo.maven.plugins - maven-argeo-osgi-plugin - ${version.maven-argeo-osgi} - - - - - - org.codehaus.mojo - buildnumber-maven-plugin - - - validate - - create - - - - - false - false - true - - - - org.apache.maven.plugins - maven-resources-plugin - - UTF-8 - - - - org.apache.maven.plugins - maven-site-plugin - 2.1.1 - - - org.apache.maven.plugins - maven-release-plugin - - true - release - clean install - - - - com.mycila.maven-license-plugin - maven-license-plugin - -
license-apache2-header.txt
- true - true - - src/**/*.java - src/**/*.xml - - - **/springutil/** - **/qooxdoo-sdk/** - - true - - SLASHSTAR_STYLE - XML_STYLE - - - - - - - - - org.argeo.dep - versions-all - ${version.argeo-distribution} - pom - import - - org.argeo.slc.runtime @@ -383,6 +265,20 @@ limitations under the License. fail + + argeo-snapshots + http://dev.argeo.org/maven/argeo-snapshots + + false + never + fail + + + true + always + fail + + diff --git a/runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/MavenDeployEnvironment.java b/runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/MavenDeployEnvironment.java index 93db6837c..2bef26e14 100644 --- a/runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/MavenDeployEnvironment.java +++ b/runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/MavenDeployEnvironment.java @@ -34,14 +34,15 @@ public abstract class MavenDeployEnvironment implements DeployEnvironment { public void unpackTo(Object packg, File targetLocation, Map filter) { - File packageLocation; + File packageLocation=null; String type = null; String removeRootDir = "enabled"; - if (packg instanceof MavenFile) { - packageLocation = mavenManager - .getPackageLocation((MavenFile) packg); - type = ((MavenFile) packg).getType(); - } else if (packg instanceof File) { +// if (packg instanceof MavenFile) { +// packageLocation = mavenManager +// .getPackageLocation((MavenFile) packg); +// type = ((MavenFile) packg).getType(); +// } else + if (packg instanceof File) { packageLocation = (File) packg; // TODO: type based on extension } else { diff --git a/runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/MavenManager.java b/runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/MavenManager.java index a78588c2e..2c6fddd4b 100644 --- a/runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/MavenManager.java +++ b/runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/MavenManager.java @@ -16,26 +16,36 @@ package org.argeo.slc.maven; -import java.io.File; -import java.util.List; -import java.util.Set; -import java.util.Vector; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.maven.artifact.Artifact; -import org.apache.maven.artifact.factory.ArtifactFactory; -import org.apache.maven.artifact.metadata.ArtifactMetadataSource; -import org.apache.maven.artifact.repository.ArtifactRepository; -import org.apache.maven.artifact.resolver.ArtifactResolutionResult; -import org.apache.maven.artifact.resolver.ArtifactResolver; -import org.apache.maven.project.MavenProject; -import org.argeo.slc.SlcException; -import org.argeo.slc.maven.embedder.MavenEmbedderException; -import org.codehaus.plexus.embed.Embedder; +import org.apache.maven.cli.MavenCli; +import org.codehaus.plexus.PlexusContainer; + + public class MavenManager { + + public static void main(String[] args){ + //CustomCli mavenCli = new CustomCli(); + MavenCli mavenCli = new MavenCli(); + String[] goals = { "-e","dependency:tree" }; + mavenCli.doMain(goals, "/home/mbaudier/dev/src/slc/dist/org.argeo.slc.sdk", System.out, System.err); + } + + static class CustomCli extends MavenCli{ + private PlexusContainer container; + + @Override + protected void customizeContainer(PlexusContainer container) { + this.container = container; + } + public PlexusContainer getContainer() { + return container; + } + + + + } +/* private final Log log = LogFactory.getLog(getClass()); private String localRepositoryPath = System.getProperty("user.home") @@ -45,7 +55,7 @@ public class MavenManager { private List remoteRepositoriesInternal; private List remoteRepositories = new Vector(); - private SlcMavenEmbedder mavenEmbedder; + private MavenEmbedder mavenEmbedder; private ClassLoader classLoader; private Boolean offline = false; @@ -220,5 +230,5 @@ public class MavenManager { public void setOffline(Boolean offline) { this.offline = offline; } - +*/ } diff --git a/runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/SlcMavenEmbedder.java b/runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/SlcMavenEmbedder.java deleted file mode 100644 index ee12d0653..000000000 --- a/runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/SlcMavenEmbedder.java +++ /dev/null @@ -1,717 +0,0 @@ -/* - * Copyright (C) 2010 Mathieu Baudier - * - * Licensed 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.argeo.slc.maven; - -/* - * Copyright 2001-2005 The Apache Software Foundation. - * - * Licensed 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. - */ - -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.Writer; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Date; -import java.util.Iterator; -import java.util.List; -import java.util.Properties; - -import org.apache.maven.BuildFailureException; -import org.apache.maven.artifact.Artifact; -import org.apache.maven.artifact.factory.ArtifactFactory; -import org.apache.maven.artifact.manager.WagonManager; -import org.apache.maven.artifact.repository.ArtifactRepository; -import org.apache.maven.artifact.repository.ArtifactRepositoryFactory; -import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy; -import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout; -import org.apache.maven.artifact.resolver.ArtifactNotFoundException; -import org.apache.maven.artifact.resolver.ArtifactResolutionException; -import org.apache.maven.artifact.resolver.ArtifactResolver; -import org.apache.maven.execution.MavenSession; -import org.apache.maven.execution.ReactorManager; -import org.apache.maven.lifecycle.LifecycleExecutionException; -import org.apache.maven.lifecycle.LifecycleExecutor; -import org.apache.maven.model.Model; -import org.apache.maven.model.io.xpp3.MavenXpp3Reader; -import org.apache.maven.model.io.xpp3.MavenXpp3Writer; -import org.apache.maven.monitor.event.DefaultEventDispatcher; -import org.apache.maven.monitor.event.EventDispatcher; -import org.apache.maven.monitor.event.EventMonitor; -import org.apache.maven.plugin.MojoExecutionException; -import org.apache.maven.plugin.descriptor.PluginDescriptor; -import org.apache.maven.plugin.descriptor.PluginDescriptorBuilder; -import org.apache.maven.profiles.DefaultProfileManager; -import org.apache.maven.profiles.ProfileManager; -import org.apache.maven.project.DuplicateProjectException; -import org.apache.maven.project.MavenProject; -import org.apache.maven.project.MavenProjectBuilder; -import org.apache.maven.project.ProjectBuildingException; -import org.apache.maven.settings.MavenSettingsBuilder; -import org.apache.maven.settings.RuntimeInfo; -import org.apache.maven.settings.Settings; -import org.apache.maven.wagon.events.TransferListener; -import org.argeo.slc.maven.embedder.MavenEmbedderException; -import org.argeo.slc.maven.embedder.MavenEmbedderLogger; -import org.argeo.slc.maven.embedder.MavenEmbedderLoggerManager; -import org.argeo.slc.maven.embedder.PlexusLoggerAdapter; -import org.argeo.slc.maven.embedder.SummaryPluginDescriptor; -import org.codehaus.classworlds.ClassWorld; -import org.codehaus.classworlds.DuplicateRealmException; -import org.codehaus.plexus.PlexusContainerException; -import org.codehaus.plexus.component.repository.ComponentDescriptor; -import org.codehaus.plexus.component.repository.exception.ComponentLifecycleException; -import org.codehaus.plexus.component.repository.exception.ComponentLookupException; -import org.codehaus.plexus.configuration.PlexusConfiguration; -import org.codehaus.plexus.configuration.PlexusConfigurationException; -import org.codehaus.plexus.embed.Embedder; -import org.codehaus.plexus.util.DirectoryScanner; -import org.codehaus.plexus.util.dag.CycleDetectedException; -import org.codehaus.plexus.util.xml.pull.XmlPullParserException; - -/** - * Class intended to be used by clients who wish to embed Maven into their - * applications - * - * @author Jason van Zyl - */ -public class SlcMavenEmbedder { - public static final String userHome = System.getProperty("user.home"); - - // ---------------------------------------------------------------------- - // Embedder - // ---------------------------------------------------------------------- - - private Embedder embedder; - - // ---------------------------------------------------------------------- - // Components - // ---------------------------------------------------------------------- - - private MavenProjectBuilder mavenProjectBuilder; - - private ArtifactRepositoryFactory artifactRepositoryFactory; - - private MavenSettingsBuilder settingsBuilder; - - private LifecycleExecutor lifecycleExecutor; - - private WagonManager wagonManager; - - private MavenXpp3Reader modelReader; - - private MavenXpp3Writer modelWriter; - - private ProfileManager profileManager; - - private PluginDescriptorBuilder pluginDescriptorBuilder; - - private ArtifactFactory artifactFactory; - - private ArtifactResolver artifactResolver; - - private ArtifactRepositoryLayout defaultArtifactRepositoryLayout; - - // ---------------------------------------------------------------------- - // Configuration - // ---------------------------------------------------------------------- - - private Settings settings; - - private ArtifactRepository localRepository; - - private File localRepositoryDirectory; - - private ClassLoader classLoader; - - private MavenEmbedderLogger logger; - - // ---------------------------------------------------------------------- - // User options - // ---------------------------------------------------------------------- - - // release plugin uses this but in IDE there will probably always be some - // form of interaction. - private boolean interactiveMode; - - private boolean offline; - - private String globalChecksumPolicy; - - /** - * This option determines whether the embedder is to be aligned to the user - * installation. - */ - private boolean alignWithUserInstallation; - - // ---------------------------------------------------------------------- - // Accessors - // ---------------------------------------------------------------------- - - public void setInteractiveMode(boolean interactiveMode) { - this.interactiveMode = interactiveMode; - } - - public boolean isInteractiveMode() { - return interactiveMode; - } - - public void setOffline(boolean offline) { - this.offline = offline; - } - - public boolean isOffline() { - return offline; - } - - public void setGlobalChecksumPolicy(String globalChecksumPolicy) { - this.globalChecksumPolicy = globalChecksumPolicy; - } - - public String getGlobalChecksumPolicy() { - return globalChecksumPolicy; - } - - public boolean isAlignWithUserInstallation() { - return alignWithUserInstallation; - } - - public void setAlignWithUserInstallation(boolean alignWithUserInstallation) { - this.alignWithUserInstallation = alignWithUserInstallation; - } - - /** - * Set the classloader to use with the maven embedder. - * - * @param classLoader - */ - public void setClassLoader(ClassLoader classLoader) { - this.classLoader = classLoader; - } - - public ClassLoader getClassLoader() { - return classLoader; - } - - public void setLocalRepositoryDirectory(File localRepositoryDirectory) { - this.localRepositoryDirectory = localRepositoryDirectory; - } - - public File getLocalRepositoryDirectory() { - return localRepositoryDirectory; - } - - public ArtifactRepository getLocalRepository() { - return localRepository; - } - - public MavenEmbedderLogger getLogger() { - return logger; - } - - public void setLogger(MavenEmbedderLogger logger) { - this.logger = logger; - } - - // ---------------------------------------------------------------------- - // Embedder Client Contract - // ---------------------------------------------------------------------- - - // ---------------------------------------------------------------------- - // Model - // ---------------------------------------------------------------------- - - public Model readModel(File model) throws XmlPullParserException, - FileNotFoundException, IOException { - return modelReader.read(new FileReader(model)); - } - - public void writeModel(Writer writer, Model model) throws IOException { - modelWriter.write(writer, model); - } - - // ---------------------------------------------------------------------- - // Project - // ---------------------------------------------------------------------- - - public MavenProject readProject(File mavenProject) - throws ProjectBuildingException { - return mavenProjectBuilder.build(mavenProject, localRepository, - profileManager); - } - - public MavenProject readProjectWithDependencies(File mavenProject, - TransferListener transferListener) throws ProjectBuildingException, - ArtifactResolutionException, ArtifactNotFoundException { - return mavenProjectBuilder.buildWithDependencies(mavenProject, - localRepository, profileManager, transferListener); - } - - public MavenProject readProjectWithDependencies(File mavenProject) - throws ProjectBuildingException, ArtifactResolutionException, - ArtifactNotFoundException { - return mavenProjectBuilder.buildWithDependencies(mavenProject, - localRepository, profileManager); - } - - public List collectProjects(File basedir, String[] includes, - String[] excludes) throws MojoExecutionException { - List projects = new ArrayList(); - - List poms = getPomFiles(basedir, includes, excludes); - - for (Iterator i = poms.iterator(); i.hasNext();) { - File pom = (File) i.next(); - - try { - MavenProject p = readProject(pom); - - projects.add(p); - - } catch (ProjectBuildingException e) { - throw new MojoExecutionException("Error loading " + pom, e); - } - } - - return projects; - } - - // ---------------------------------------------------------------------- - // Artifacts - // ---------------------------------------------------------------------- - - public Artifact createArtifact(String groupId, String artifactId, - String version, String scope, String type) { - return artifactFactory.createArtifact(groupId, artifactId, version, - scope, type); - } - - public Artifact createArtifactWithClassifier(String groupId, - String artifactId, String version, String type, String classifier) { - return artifactFactory.createArtifactWithClassifier(groupId, - artifactId, version, type, classifier); - } - - public void resolve(Artifact artifact, List remoteRepositories, - ArtifactRepository localRepository) - throws ArtifactResolutionException, ArtifactNotFoundException { - artifactResolver.resolve(artifact, remoteRepositories, localRepository); - } - - // ---------------------------------------------------------------------- - // Plugins - // ---------------------------------------------------------------------- - - public List getAvailablePlugins() { - List plugins = new ArrayList(); - - plugins.add(makeMockPlugin("org.apache.maven.plugins", - "maven-jar-plugin", "Maven Jar Plug-in")); - - plugins.add(makeMockPlugin("org.apache.maven.plugins", - "maven-compiler-plugin", "Maven Compiler Plug-in")); - - return plugins; - } - - public PluginDescriptor getPluginDescriptor( - SummaryPluginDescriptor summaryPluginDescriptor) - throws MavenEmbedderException { - PluginDescriptor pluginDescriptor; - - try { - InputStream is = classLoader.getResourceAsStream("/plugins/" - + summaryPluginDescriptor.getArtifactId() + ".xml"); - - pluginDescriptor = pluginDescriptorBuilder - .build(new InputStreamReader(is)); - } catch (PlexusConfigurationException e) { - throw new MavenEmbedderException( - "Error retrieving plugin descriptor.", e); - } - - return pluginDescriptor; - } - - private SummaryPluginDescriptor makeMockPlugin(String groupId, - String artifactId, String name) { - return new SummaryPluginDescriptor(groupId, artifactId, name); - } - - // ---------------------------------------------------------------------- - // Execution of phases/goals - // ---------------------------------------------------------------------- - - // TODO: should we allow the passing in of a settings object so that - // everything can be taken from the client env - // TODO: transfer listener - // TODO: logger - - public void execute(MavenProject project, List goals, - EventMonitor eventMonitor, TransferListener transferListener, - Properties properties, File executionRootDirectory) - throws CycleDetectedException, LifecycleExecutionException, - BuildFailureException, DuplicateProjectException { - execute(Collections.singletonList(project), goals, eventMonitor, - transferListener, properties, executionRootDirectory); - } - - public void execute(List projects, List goals, EventMonitor eventMonitor, - TransferListener transferListener, Properties properties, - File executionRootDirectory) throws CycleDetectedException, - LifecycleExecutionException, BuildFailureException, - DuplicateProjectException { - ReactorManager rm = new ReactorManager(projects); - - EventDispatcher eventDispatcher = new DefaultEventDispatcher(); - - eventDispatcher.addEventMonitor(eventMonitor); - - // If this option is set the exception seems to be hidden ... - - // rm.setFailureBehavior( ReactorManager.FAIL_AT_END ); - - rm.setFailureBehavior(ReactorManager.FAIL_FAST); - - MavenSession session = new MavenSession(embedder.getContainer(), - settings, localRepository, eventDispatcher, rm, goals, - executionRootDirectory.getAbsolutePath(), properties, - new Date()); - - session.setUsingPOMsFromFilesystem(true); - - if (transferListener != null) { - wagonManager.setDownloadMonitor(transferListener); - } - - // ---------------------------------------------------------------------- - // Maven should not be using system properties internally but because - // it does for now I'll just take properties that are handed to me - // and set them so that the plugin expression evaluator will work - // as expected. - // ---------------------------------------------------------------------- - - if (properties != null) { - for (Iterator i = properties.keySet().iterator(); i.hasNext();) { - String key = (String) i.next(); - - String value = properties.getProperty(key); - - System.setProperty(key, value); - } - } - - lifecycleExecutor.execute(session, rm, session.getEventDispatcher()); - } - - // ---------------------------------------------------------------------- - // Lifecycle information - // ---------------------------------------------------------------------- - - public List getLifecyclePhases() throws MavenEmbedderException { - List phases = new ArrayList(); - - ComponentDescriptor descriptor = embedder.getContainer() - .getComponentDescriptor(LifecycleExecutor.ROLE); - - PlexusConfiguration configuration = descriptor.getConfiguration(); - - PlexusConfiguration[] phasesConfigurations = configuration.getChild( - "lifecycles").getChild(0).getChild("phases").getChildren( - "phase"); - - try { - for (int i = 0; i < phasesConfigurations.length; i++) { - phases.add(phasesConfigurations[i].getValue()); - } - } catch (PlexusConfigurationException e) { - throw new MavenEmbedderException( - "Cannot retrieve default lifecycle phasesConfigurations.", - e); - } - - return phases; - } - - // ---------------------------------------------------------------------- - // Remote Repository - // ---------------------------------------------------------------------- - - // ---------------------------------------------------------------------- - // Local Repository - // ---------------------------------------------------------------------- - - public static final String DEFAULT_LOCAL_REPO_ID = "local"; - - public static final String DEFAULT_LAYOUT_ID = "default"; - - public ArtifactRepository createLocalRepository(File localRepository) - throws ComponentLookupException { - return createLocalRepository(localRepository.getAbsolutePath(), - DEFAULT_LOCAL_REPO_ID); - } - - public ArtifactRepository createLocalRepository(Settings settings) - throws ComponentLookupException { - return createLocalRepository(settings.getLocalRepository(), - DEFAULT_LOCAL_REPO_ID); - } - - public ArtifactRepository createLocalRepository(String url, - String repositoryId) throws ComponentLookupException { - if (!url.startsWith("file:")) { - url = "file://" + url; - } - - return createRepository(url, repositoryId); - } - - public ArtifactRepository createRepository(String url, String repositoryId) - throws ComponentLookupException { - // snapshots vs releases - // offline = to turning the update policy off - - // TODO: we'll need to allow finer grained creation of repositories but - // this will do for now - - String updatePolicyFlag = ArtifactRepositoryPolicy.UPDATE_POLICY_ALWAYS; - - String checksumPolicyFlag = ArtifactRepositoryPolicy.CHECKSUM_POLICY_WARN; - - ArtifactRepositoryPolicy snapshotsPolicy = new ArtifactRepositoryPolicy( - true, updatePolicyFlag, checksumPolicyFlag); - - ArtifactRepositoryPolicy releasesPolicy = new ArtifactRepositoryPolicy( - true, updatePolicyFlag, checksumPolicyFlag); - - return artifactRepositoryFactory.createArtifactRepository(repositoryId, - url, defaultArtifactRepositoryLayout, snapshotsPolicy, - releasesPolicy); - } - - // ---------------------------------------------------------------------- - // Internal utility code - // ---------------------------------------------------------------------- - - private RuntimeInfo createRuntimeInfo(Settings settings) { - RuntimeInfo runtimeInfo = new RuntimeInfo(settings); - - runtimeInfo.setPluginUpdateOverride(Boolean.FALSE); - - return runtimeInfo; - } - - private List getPomFiles(File basedir, String[] includes, String[] excludes) { - DirectoryScanner scanner = new DirectoryScanner(); - - scanner.setBasedir(basedir); - - scanner.setIncludes(includes); - - scanner.setExcludes(excludes); - - scanner.scan(); - - List poms = new ArrayList(); - - for (int i = 0; i < scanner.getIncludedFiles().length; i++) { - poms.add(new File(basedir, scanner.getIncludedFiles()[i])); - } - - return poms; - } - - // ---------------------------------------------------------------------- - // Lifecycle - // ---------------------------------------------------------------------- - - public void start() throws MavenEmbedderException { - detectUserInstallation(); - - // ---------------------------------------------------------------------- - // Set the maven.home system property which is need by components like - // the plugin registry builder. - // ---------------------------------------------------------------------- - - if (classLoader == null) { - throw new IllegalStateException( - "A classloader must be specified using setClassLoader(ClassLoader)."); - } - - embedder = new Embedder(); - - if (logger != null) { - embedder.setLoggerManager(new MavenEmbedderLoggerManager( - new PlexusLoggerAdapter(logger))); - } - - try { - ClassWorld classWorld = new ClassWorld(); - - classWorld.newRealm("plexus.core", classLoader); - - embedder.start(classWorld); - - // ---------------------------------------------------------------------- - // Lookup each of the components we need to provide the desired - // client interface. - // ---------------------------------------------------------------------- - - modelReader = new MavenXpp3Reader(); - - modelWriter = new MavenXpp3Writer(); - - pluginDescriptorBuilder = new PluginDescriptorBuilder(); - - profileManager = new DefaultProfileManager(embedder.getContainer()); - - mavenProjectBuilder = (MavenProjectBuilder) embedder - .lookup(MavenProjectBuilder.ROLE); - - // ---------------------------------------------------------------------- - // Artifact related components - // ---------------------------------------------------------------------- - - artifactRepositoryFactory = (ArtifactRepositoryFactory) embedder - .lookup(ArtifactRepositoryFactory.ROLE); - - artifactFactory = (ArtifactFactory) embedder - .lookup(ArtifactFactory.ROLE); - - artifactResolver = (ArtifactResolver) embedder - .lookup(ArtifactResolver.ROLE); - - defaultArtifactRepositoryLayout = (ArtifactRepositoryLayout) embedder - .lookup(ArtifactRepositoryLayout.ROLE, DEFAULT_LAYOUT_ID); - - lifecycleExecutor = (LifecycleExecutor) embedder - .lookup(LifecycleExecutor.ROLE); - - wagonManager = (WagonManager) embedder.lookup(WagonManager.ROLE); - - createMavenSettings(); - - profileManager.loadSettingsProfiles(settings); - - localRepository = createLocalRepository(settings); - } catch (PlexusContainerException e) { - throw new MavenEmbedderException("Cannot start Plexus embedder.", e); - } catch (DuplicateRealmException e) { - throw new MavenEmbedderException( - "Cannot create Classworld realm for the embedder.", e); - } catch (ComponentLookupException e) { - throw new MavenEmbedderException( - "Cannot lookup required component.", e); - } - } - - // ---------------------------------------------------------------------- - // - // ---------------------------------------------------------------------- - - private void detectUserInstallation() { - if (new File(userHome, ".m2").exists()) { - alignWithUserInstallation = true; - } - } - - /** - * Create the Settings that will be used with the embedder. If we are - * aligning with the user installation then we lookup the standard settings - * builder and use that to create our settings. Otherwise we constructs a - * settings object and populate the information ourselves. - * - * @throws MavenEmbedderException - * @throws ComponentLookupException - */ - private void createMavenSettings() throws MavenEmbedderException, - ComponentLookupException { - if (alignWithUserInstallation) { - // ---------------------------------------------------------------------- - // We will use the standard method for creating the settings. This - // method reproduces the method of building the settings from the - // CLI - // mode of operation. - // ---------------------------------------------------------------------- - - settingsBuilder = (MavenSettingsBuilder) embedder - .lookup(MavenSettingsBuilder.ROLE); - - try { - settings = settingsBuilder.buildSettings(); - } catch (IOException e) { - throw new MavenEmbedderException("Error creating settings.", e); - } catch (XmlPullParserException e) { - throw new MavenEmbedderException("Error creating settings.", e); - } - } else { - if (localRepository == null) { - throw new IllegalArgumentException( - "When not aligning with a user install you must specify a local repository location using the setLocalRepositoryDirectory( File ) method."); - } - - settings = new Settings(); - - settings.setLocalRepository(localRepositoryDirectory - .getAbsolutePath()); - - settings.setRuntimeInfo(createRuntimeInfo(settings)); - - settings.setOffline(offline); - - settings.setInteractiveMode(interactiveMode); - } - } - - // ---------------------------------------------------------------------- - // Lifecycle - // ---------------------------------------------------------------------- - - public void stop() throws MavenEmbedderException { - try { - embedder.release(mavenProjectBuilder); - - embedder.release(artifactRepositoryFactory); - - embedder.release(settingsBuilder); - - embedder.release(lifecycleExecutor); - } catch (ComponentLifecycleException e) { - throw new MavenEmbedderException("Cannot stop the embedder.", e); - } - } - - public Embedder getEmbedder() { - return embedder; - } - -} diff --git a/runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/embedder/AbstractMavenEmbedderLogger.java b/runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/embedder/AbstractMavenEmbedderLogger.java deleted file mode 100644 index 73a6c2e5d..000000000 --- a/runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/embedder/AbstractMavenEmbedderLogger.java +++ /dev/null @@ -1,140 +0,0 @@ -/* - * Copyright (C) 2010 Mathieu Baudier - * - * Licensed 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.argeo.slc.maven.embedder; - -/* -* Copyright 2001-2005 The Apache Software Foundation. -* -* Licensed 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. -*/ - -/** - * @author Trygve Laugstøl - * @version $Id: AbstractMavenEmbedderLogger.java 292888 2005-10-01 01:17:36Z jvanzyl $ - */ -public abstract class AbstractMavenEmbedderLogger - implements MavenEmbedderLogger -{ - private int threshold = MavenEmbedderLogger.LEVEL_INFO; - - private String name; - - public int getThreshold() - { - return threshold; - } - - public void setThreshold( int threshold ) - { - this.threshold = threshold; - } - - public String getName() - { - return name; - } - - public void debug( String message ) - { - debug( message, null ); - } - - public boolean isDebugEnabled() - { - return threshold <= LEVEL_DEBUG; - } - - public void info( String message ) - { - info( message, null ); - } - - public boolean isInfoEnabled() - { - return threshold <= LEVEL_INFO; - } - - public void warn( String message ) - { - warn( message, null ); - } - - public boolean isWarnEnabled() - { - return threshold <= LEVEL_WARN; - } - - public void error( String message ) - { - error( message, null ); - } - - public boolean isErrorEnabled() - { - return threshold <= LEVEL_ERROR; - } - - public void fatalError( String message ) - { - fatalError( message, null ); - } - - public boolean isFatalErrorEnabled() - { - return threshold <= LEVEL_FATAL; - } - - protected boolean isValidThreshold( int threshold ) - { - if ( threshold == LEVEL_DEBUG ) - { - return true; - } - if ( threshold == LEVEL_INFO ) - { - return true; - } - if ( threshold == LEVEL_WARN ) - { - return true; - } - if ( threshold == LEVEL_ERROR ) - { - return true; - } - if ( threshold == LEVEL_FATAL ) - { - return true; - } - if ( threshold == LEVEL_DISABLED ) - { - return true; - } - - return false; - } -} diff --git a/runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/embedder/MavenEmbedderConsoleLogger.java b/runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/embedder/MavenEmbedderConsoleLogger.java deleted file mode 100644 index 2a4d2861e..000000000 --- a/runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/embedder/MavenEmbedderConsoleLogger.java +++ /dev/null @@ -1,99 +0,0 @@ -/* - * Copyright (C) 2010 Mathieu Baudier - * - * Licensed 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.argeo.slc.maven.embedder; - -/** - * Logger sending everything to the standard output streams. - * This is mainly for the cases when you have a utility that - * does not have a logger to supply. - * - * @author Avalon Development Team - * @version $Id: MavenEmbedderConsoleLogger.java 292888 2005-10-01 01:17:36Z jvanzyl $ - */ -public final class MavenEmbedderConsoleLogger - extends AbstractMavenEmbedderLogger -{ - public void debug( String message, Throwable throwable ) - { - if ( isDebugEnabled() ) - { - System.out.print( "[ maven embedder DEBUG] " ); - System.out.println( message ); - - if ( null != throwable ) - { - throwable.printStackTrace( System.out ); - } - } - } - - public void info( String message, Throwable throwable ) - { - if ( isInfoEnabled() ) - { - System.out.print( "[ maven embedder INFO] " ); - System.out.println( message ); - - if ( null != throwable ) - { - throwable.printStackTrace( System.out ); - } - } - } - - public void warn( String message, Throwable throwable ) - { - if ( isWarnEnabled() ) - { - System.out.print( "[ maven embedder WARNING] " ); - System.out.println( message ); - - if ( null != throwable ) - { - throwable.printStackTrace( System.out ); - } - } - } - - public void error( String message, Throwable throwable ) - { - if ( isErrorEnabled() ) - { - System.out.print( "[ maven embedder ERROR] " ); - System.out.println( message ); - - if ( null != throwable ) - { - throwable.printStackTrace( System.out ); - } - } - } - - public void fatalError( String message, Throwable throwable ) - { - if ( isFatalErrorEnabled() ) - { - System.out.print( "[ maven embedder FATAL ERROR] " ); - System.out.println( message ); - - if ( null != throwable ) - { - throwable.printStackTrace( System.out ); - } - } - } -} diff --git a/runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/embedder/MavenEmbedderException.java b/runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/embedder/MavenEmbedderException.java deleted file mode 100644 index 323154778..000000000 --- a/runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/embedder/MavenEmbedderException.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright (C) 2010 Mathieu Baudier - * - * Licensed 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.argeo.slc.maven.embedder; - -/* -* Copyright 2001-2005 The Apache Software Foundation. -* -* Licensed 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. -*/ - -/** - * @author Jason van Zyl - * @version $Id:$ - */ -public class MavenEmbedderException - extends Exception -{ - public MavenEmbedderException( String message ) - { - super( message ); - } - - public MavenEmbedderException( Throwable cause ) - { - super( cause ); - } - - public MavenEmbedderException( String message, Throwable cause ) - { - super( message, cause ); - } -} diff --git a/runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/embedder/MavenEmbedderLogger.java b/runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/embedder/MavenEmbedderLogger.java deleted file mode 100644 index 331b2157c..000000000 --- a/runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/embedder/MavenEmbedderLogger.java +++ /dev/null @@ -1,86 +0,0 @@ -/* - * Copyright (C) 2010 Mathieu Baudier - * - * Licensed 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.argeo.slc.maven.embedder; - -/* -* Copyright 2001-2005 The Apache Software Foundation. -* -* Licensed 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. -*/ - -/** - * @author Jason van Zyl - * @version $Id: MavenEmbedderLogger.java 293410 2005-10-03 18:06:00Z jdcasey $ - */ -public interface MavenEmbedderLogger -{ - int LEVEL_DEBUG = 0; - - int LEVEL_INFO = 1; - - int LEVEL_WARN = 2; - - int LEVEL_ERROR = 3; - - int LEVEL_FATAL = 4; - - int LEVEL_DISABLED = 5; - - void debug( String message ); - - void debug( String message, Throwable throwable ); - - boolean isDebugEnabled(); - - void info( String message ); - - void info( String message, Throwable throwable ); - - boolean isInfoEnabled(); - - void warn( String message ); - - void warn( String message, Throwable throwable ); - - boolean isWarnEnabled(); - - void error( String message ); - - void error( String message, Throwable throwable ); - - boolean isErrorEnabled(); - - void fatalError( String message ); - - void fatalError( String message, Throwable throwable ); - - boolean isFatalErrorEnabled(); - - void setThreshold( int threshold ); - - int getThreshold(); -} diff --git a/runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/embedder/MavenEmbedderLoggerManager.java b/runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/embedder/MavenEmbedderLoggerManager.java deleted file mode 100644 index 752175a59..000000000 --- a/runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/embedder/MavenEmbedderLoggerManager.java +++ /dev/null @@ -1,164 +0,0 @@ -/* - * Copyright (C) 2010 Mathieu Baudier - * - * Licensed 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.argeo.slc.maven.embedder; - -/* - * Copyright 2001-2005 The Apache Software Foundation. - * - * Licensed 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. - */ - -import org.codehaus.plexus.logging.AbstractLoggerManager; -import org.codehaus.plexus.logging.Logger; -import org.codehaus.plexus.logging.LoggerManager; -import org.codehaus.plexus.logging.console.ConsoleLogger; -import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable; - -/** - * This is a simple logger manager that will only write the logging statements to the console. - *

- * Sample configuration: - * 

- * 
- *   org.codehaus.plexus.logging.ConsoleLoggerManager
- *   
- *     DEBUG
- *   
- * 
- *
- * - * @author Jason van Zyl - * @author Trygve Laugstøl - * @version $Id: MavenEmbedderLoggerManager.java 292888 2005-10-01 01:17:36Z jvanzyl $ - */ -public class MavenEmbedderLoggerManager - extends AbstractLoggerManager - implements LoggerManager, Initializable -{ - /** - * Message of this level or higher will be logged. - *

- * This field is set by the plexus container thus the name is 'threshold'. The field - * currentThreshold contains the current setting of the threshold. - */ - private String threshold = "info"; - - private int currentThreshold; - - private Logger logger; - - public MavenEmbedderLoggerManager( Logger logger ) - { - this.logger = logger; - } - - public void initialize() - { - debug( "Initializing ConsoleLoggerManager: " + this.hashCode() + "." ); - - currentThreshold = parseThreshold( threshold ); - - if ( currentThreshold == -1 ) - { - debug( "Could not parse the threshold level: '" + threshold + "', setting to debug." ); - currentThreshold = Logger.LEVEL_DEBUG; - } - } - - public void setThreshold( int currentThreshold ) - { - this.currentThreshold = currentThreshold; - } - - /** - * @return Returns the threshold. - */ - public int getThreshold() - { - return currentThreshold; - } - - public void setThreshold( String role, String roleHint, int threshold ) - { - } - - public int getThreshold( String role, String roleHint ) - { - return currentThreshold; - } - - public Logger getLoggerForComponent( String role, String roleHint ) - { - return logger; - } - - public void returnComponentLogger( String role, String roleHint ) - { - } - - public int getActiveLoggerCount() - { - return 1; - } - - private int parseThreshold( String text ) - { - text = text.trim().toLowerCase(); - - if ( text.equals( "debug" ) ) - { - return ConsoleLogger.LEVEL_DEBUG; - } - else if ( text.equals( "info" ) ) - { - return ConsoleLogger.LEVEL_INFO; - } - else if ( text.equals( "warn" ) ) - { - return ConsoleLogger.LEVEL_WARN; - } - else if ( text.equals( "error" ) ) - { - return ConsoleLogger.LEVEL_ERROR; - } - else if ( text.equals( "fatal" ) ) - { - return ConsoleLogger.LEVEL_FATAL; - } - - return -1; - } - - /** - * Remove this method and all references when this code is verified. - * - * @param msg - */ - private void debug( String msg ) - { - } -} diff --git a/runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/embedder/PlexusLoggerAdapter.java b/runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/embedder/PlexusLoggerAdapter.java deleted file mode 100644 index 75d544b5c..000000000 --- a/runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/embedder/PlexusLoggerAdapter.java +++ /dev/null @@ -1,143 +0,0 @@ -/* - * Copyright (C) 2010 Mathieu Baudier - * - * Licensed 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.argeo.slc.maven.embedder; - -import org.codehaus.plexus.logging.Logger;/* - * Copyright 2001-2005 The Apache Software Foundation. - * - * Licensed 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. - */ - -/** - * @author Jason van Zyl - * @version $Id: PlexusLoggerAdapter.java 293410 2005-10-03 18:06:00Z jdcasey $ - */ -public class PlexusLoggerAdapter - implements Logger -{ - private MavenEmbedderLogger logger; - - public PlexusLoggerAdapter( MavenEmbedderLogger logger ) - { - this.logger = logger; - } - - public void debug( String message ) - { - logger.debug( message ); - } - - public void debug( String message, Throwable throwable ) - { - logger.debug( message, throwable ); - } - - public boolean isDebugEnabled() - { - return logger.isDebugEnabled(); - } - - public void info( String message ) - { - logger.info( message ); - } - - public void info( String message, Throwable throwable ) - { - logger.info( message, throwable ); - } - - public boolean isInfoEnabled() - { - return logger.isInfoEnabled(); - } - - public void warn( String message ) - { - logger.warn( message ); - } - - public void warn( String message, Throwable throwable ) - { - logger.warn( message, throwable ); - } - - public boolean isWarnEnabled() - { - return logger.isWarnEnabled(); - } - - public void error( String message ) - { - logger.error( message ); - } - - public void error( String message, Throwable throwable ) - { - logger.error( message ); - } - - public boolean isErrorEnabled() - { - return logger.isErrorEnabled(); - } - - public void fatalError( String message ) - { - logger.fatalError( message ); - } - - public void fatalError( String message, Throwable throwable ) - { - logger.fatalError( message, throwable ); - } - - public boolean isFatalErrorEnabled() - { - return logger.isFatalErrorEnabled(); - } - - public void setThreshold( int i ) - { - logger.setThreshold( i ); - } - - public int getThreshold() - { - return logger.getThreshold(); - } - - public String getName() - { - return toString(); - } - - public Logger getChildLogger( String name ) - { - return this; - } -} diff --git a/runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/embedder/SummaryPluginDescriptor.java b/runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/embedder/SummaryPluginDescriptor.java deleted file mode 100644 index b86f4b8f4..000000000 --- a/runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/embedder/SummaryPluginDescriptor.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (C) 2010 Mathieu Baudier - * - * Licensed 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.argeo.slc.maven.embedder; - -/** - * @author Jason van Zyl - * @version $Id: SummaryPluginDescriptor.java 292750 2005-09-30 14:33:10Z jdcasey $ - */ -public class SummaryPluginDescriptor -{ - private String groupId; - - private String artifactId; - - private String name; - - public SummaryPluginDescriptor( String groupId, String artifactId, String name ) - { - this.groupId = groupId; - this.artifactId = artifactId; - this.name = name; - } - - public String getGroupId() - { - return groupId; - } - - public String getArtifactId() - { - return artifactId; - } - - public String getName() - { - return name; - } -} diff --git a/runtime/org.argeo.slc.support.osgi/pom.xml b/runtime/org.argeo.slc.support.osgi/pom.xml index 119e71fc6..e60a79dc4 100644 --- a/runtime/org.argeo.slc.support.osgi/pom.xml +++ b/runtime/org.argeo.slc.support.osgi/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 org.argeo.slc @@ -33,6 +34,11 @@ org.argeo.slc.core + + org.argeo.dep.osgi + org.argeo.dep.osgi.bnd + + org.eclipse.osgi org.eclipse.osgi @@ -63,10 +69,8 @@ com.springsource.org.objectweb.asm.attrs - + org.apache.xalan com.springsource.org.apache.xalan diff --git a/runtime/org.argeo.slc.support.ws.client/.classpath b/runtime/org.argeo.slc.support.ws.client/.classpath index 036412180..7430a31e5 100644 --- a/runtime/org.argeo.slc.support.ws.client/.classpath +++ b/runtime/org.argeo.slc.support.ws.client/.classpath @@ -3,6 +3,6 @@ - + diff --git a/runtime/org.argeo.slc.support.ws.client/.project b/runtime/org.argeo.slc.support.ws.client/.project index 8135e999b..142bb4ada 100644 --- a/runtime/org.argeo.slc.support.ws.client/.project +++ b/runtime/org.argeo.slc.support.ws.client/.project @@ -11,13 +11,18 @@ - org.maven.ide.eclipse.maven2Builder + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder org.eclipse.jdt.core.javanature - org.maven.ide.eclipse.maven2Nature + org.eclipse.pde.PluginNature diff --git a/runtime/org.argeo.slc.support.ws.client/pom.xml b/runtime/org.argeo.slc.support.ws.client/pom.xml index f18a6345b..2f537d0c7 100644 --- a/runtime/org.argeo.slc.support.ws.client/pom.xml +++ b/runtime/org.argeo.slc.support.ws.client/pom.xml @@ -25,6 +25,7 @@ javax.xml.*;version="0.0.0", org.xml.*;version="0.0.0", org.springframework.ws.*;resolution:="optional", + org.springframework.core;resolution:="optional", * @@ -45,7 +46,6 @@ org.springframework.ws org.springframework.ws - 1.5.8.A -- 2.39.2