maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jvan...@apache.org
Subject svn commit: r688581 - in /maven/components/trunk: ./ maven-core/src/main/java/org/apache/maven/execution/ maven-core/src/main/java/org/apache/maven/monitor/event/ maven-embedder/src/main/java/org/apache/maven/embedder/ maven-embedder/src/main/java/org/...
Date Sun, 24 Aug 2008 23:24:42 GMT
Author: jvanzyl
Date: Sun Aug 24 16:24:41 2008
New Revision: 688581

URL: http://svn.apache.org/viewvc?rev=688581&view=rev
Log: (empty)

Removed:
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/monitor/event/AbstractWorkspaceMonitor.java
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/monitor/event/MavenWorkspaceMonitor.java
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/monitor/event/OnStopWorkspaceMonitor.java
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/monitor/event/PerCallWorkspaceMonitor.java
    maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderEventingTest.java
Modified:
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
    maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/Configuration.java
    maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/DefaultConfiguration.java
    maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
    maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
    maven/components/trunk/maven-embedder/src/main/resources/META-INF/plexus/components.xml
    maven/components/trunk/pom.xml

Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java?rev=688581&r1=688580&r2=688581&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
(original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
Sun Aug 24 16:24:41 2008
@@ -22,7 +22,6 @@
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.errors.CoreErrorReporter;
 import org.apache.maven.monitor.event.EventMonitor;
-import org.apache.maven.monitor.event.MavenWorkspaceMonitor;
 import org.apache.maven.profiles.ProfileManager;
 import org.apache.maven.profiles.activation.ProfileActivationContext;
 import org.apache.maven.project.DefaultProjectBuilderConfiguration;
@@ -102,8 +101,6 @@
 
     private List eventMonitors;
 
-    private MavenWorkspaceMonitor workspaceMonitor;
-
     private List activeProfiles;
 
     private List inactiveProfiles;
@@ -712,17 +709,6 @@
         return this;
     }
 
-    public MavenWorkspaceMonitor getWorkspaceMonitor()
-    {
-        return workspaceMonitor;
-    }
-
-    public MavenExecutionRequest setWorkspaceMonitor( MavenWorkspaceMonitor workspaceMonitor
)
-    {
-        this.workspaceMonitor = workspaceMonitor;
-        return this;
-    }
-
     public Properties getUserProperties()
     {
         return userProperties;

Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java?rev=688581&r1=688580&r2=688581&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
(original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
Sun Aug 24 16:24:41 2008
@@ -23,7 +23,6 @@
 import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
 import org.apache.maven.errors.CoreErrorReporter;
 import org.apache.maven.monitor.event.EventMonitor;
-import org.apache.maven.monitor.event.MavenWorkspaceMonitor;
 import org.apache.maven.profiles.ProfileManager;
 import org.apache.maven.profiles.activation.ProfileActivationContext;
 import org.apache.maven.project.ProjectBuilderConfiguration;
@@ -222,8 +221,5 @@
     MavenExecutionRequest setErrorReporter( CoreErrorReporter reporter );
     CoreErrorReporter getErrorReporter();
 
-    MavenExecutionRequest setWorkspaceMonitor( MavenWorkspaceMonitor workspaceMonitor );
-    MavenWorkspaceMonitor getWorkspaceMonitor();
-
     ProjectBuilderConfiguration getProjectBuildingConfiguration();
 }

Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/Configuration.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/Configuration.java?rev=688581&r1=688580&r2=688581&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/Configuration.java
(original)
+++ maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/Configuration.java
Sun Aug 24 16:24:41 2008
@@ -20,7 +20,6 @@
 
 import org.apache.maven.errors.CoreErrorReporter;
 import org.apache.maven.monitor.event.EventMonitor;
-import org.apache.maven.monitor.event.MavenWorkspaceMonitor;
 import org.apache.maven.realm.MavenRealmManager;
 import org.codehaus.plexus.PlexusContainer;
 import org.codehaus.plexus.classworlds.ClassWorld;
@@ -152,8 +151,4 @@
     Configuration setEventMonitors( List eventMonitors );
 
     List getEventMonitors();
-
-    Configuration setWorkspaceMonitor( MavenWorkspaceMonitor workspaceMonitor );
-
-    MavenWorkspaceMonitor getWorkspaceMonitor();
 }

Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/DefaultConfiguration.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/DefaultConfiguration.java?rev=688581&r1=688580&r2=688581&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/DefaultConfiguration.java
(original)
+++ maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/DefaultConfiguration.java
Sun Aug 24 16:24:41 2008
@@ -20,7 +20,6 @@
 
 import org.apache.maven.errors.CoreErrorReporter;
 import org.apache.maven.monitor.event.EventMonitor;
-import org.apache.maven.monitor.event.MavenWorkspaceMonitor;
 import org.apache.maven.realm.MavenRealmManager;
 import org.codehaus.plexus.PlexusContainer;
 import org.codehaus.plexus.classworlds.ClassWorld;
@@ -69,8 +68,6 @@
     /** List<EventMonitor>. */
     private List eventMonitors;
 
-    private MavenWorkspaceMonitor workspaceMonitor;
-
     /** Creates a new instance of DefaultConfiguration */
     public DefaultConfiguration()
     {
@@ -276,15 +273,4 @@
         this.eventMonitors = eventMonitors;
         return this;
     }
-
-    public MavenWorkspaceMonitor getWorkspaceMonitor()
-    {
-        return workspaceMonitor;
-    }
-
-    public Configuration setWorkspaceMonitor( MavenWorkspaceMonitor workspaceMonitor )
-    {
-        this.workspaceMonitor = workspaceMonitor;
-        return this;
-    }
 }

Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java?rev=688581&r1=688580&r2=688581&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
(original)
+++ maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
Sun Aug 24 16:24:41 2008
@@ -167,9 +167,6 @@
 
     private BuildPlanner buildPlanner;
 
-    // TODO: Remove this once we have better control over cache-cleaning.
-    private MavenWorkspaceStore workspaceStore;
-
     // ----------------------------------------------------------------------
     // Configuration
     // ----------------------------------------------------------------------
@@ -203,11 +200,6 @@
         return request;
     }
 
-    protected MavenWorkspaceStore getWorkspaceStore()
-    {
-        return workspaceStore;
-    }
-
     // ----------------------------------------------------------------------
     // Accessors
     // ----------------------------------------------------------------------
@@ -710,8 +702,6 @@
 
             buildPlanner = (BuildPlanner) container.lookup( BuildPlanner.class );
 
-            workspaceStore = (MavenWorkspaceStore) container.lookup( MavenWorkspaceStore.class
);
-
             artifactHandlerManager = (ArtifactHandlerManager) container.lookup( ArtifactHandlerManager.ROLE
);
 
             // This is temporary as we can probably cache a single request and use it for
default values and

Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java?rev=688581&r1=688580&r2=688581&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
(original)
+++ maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
Sun Aug 24 16:24:41 2008
@@ -34,8 +34,6 @@
 import org.apache.maven.model.Repository;
 import org.apache.maven.monitor.event.DefaultEventMonitor;
 import org.apache.maven.monitor.event.EventMonitor;
-import org.apache.maven.monitor.event.MavenWorkspaceMonitor;
-import org.apache.maven.monitor.event.PerCallWorkspaceMonitor;
 import org.apache.maven.plugin.Mojo;
 import org.apache.maven.profiles.DefaultProfileManager;
 import org.apache.maven.profiles.ProfileManager;
@@ -96,8 +94,6 @@
 
     private WagonManager wagonManager;
 
-    private MavenWorkspaceStore workspaceManager;
-
     private MavenSettingsBuilder settingsBuilder;
 
     public MavenExecutionRequest populateDefaults( MavenExecutionRequest request,
@@ -106,8 +102,6 @@
     {
         eventing( request, configuration );
 
-        workspaceMonitor( request, configuration );
-
         reporter( request, configuration );
 
         executionProperties( request, configuration );
@@ -136,44 +130,6 @@
         return request;
     }
 
-    private void workspaceMonitor( MavenExecutionRequest request,
-                                   Configuration configuration )
-    {
-        MavenWorkspaceMonitor workspaceMonitor = request.getWorkspaceMonitor();
-
-        if ( workspaceMonitor == null )
-        {
-            workspaceMonitor = configuration.getWorkspaceMonitor();
-        }
-
-        List requestEventMonitors = request.getEventMonitors();
-        if ( ( requestEventMonitors != null ) && !requestEventMonitors.isEmpty()
)
-        {
-            for ( Iterator it = requestEventMonitors.iterator(); it.hasNext(); )
-            {
-                Object monitor = it.next();
-                if ( monitor instanceof MavenWorkspaceMonitor )
-                {
-                    if ( workspaceMonitor == null )
-                    {
-                        workspaceMonitor = (MavenWorkspaceMonitor) monitor;
-                    }
-                    it.remove();
-                    break;
-                }
-            }
-        }
-
-        if ( workspaceMonitor == null )
-        {
-            workspaceMonitor = new PerCallWorkspaceMonitor();
-        }
-
-        workspaceMonitor.setWorkspaceStore( workspaceManager );
-
-        request.addEventMonitor( workspaceMonitor );
-    }
-
     private void reporter( MavenExecutionRequest request,
                            Configuration configuration )
     {

Modified: maven/components/trunk/maven-embedder/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/resources/META-INF/plexus/components.xml?rev=688581&r1=688580&r2=688581&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/main/resources/META-INF/plexus/components.xml
(original)
+++ maven/components/trunk/maven-embedder/src/main/resources/META-INF/plexus/components.xml
Sun Aug 24 16:24:41 2008
@@ -24,9 +24,6 @@
       <implementation>org.apache.maven.embedder.execution.DefaultMavenExecutionRequestPopulator</implementation>
       <requirements>
         <requirement>
-          <role>org.apache.maven.workspace.MavenWorkspaceStore</role>
-        </requirement>
-        <requirement>
           <role>org.apache.maven.artifact.manager.WagonManager</role>
           <role-hint>default</role-hint>
         </requirement>
@@ -75,6 +72,5 @@
         </httpHeaders>
       </configuration>
     </component>
-
   </components>
 </component-set>

Modified: maven/components/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/pom.xml?rev=688581&r1=688580&r2=688581&view=diff
==============================================================================
--- maven/components/trunk/pom.xml (original)
+++ maven/components/trunk/pom.xml Sun Aug 24 16:24:41 2008
@@ -256,7 +256,6 @@
     <module>maven-project</module>
     <module>maven-reporting-api</module>
     <module>maven-embedder</module>
-    <module>maven-workspace</module>
     <module>maven-toolchain</module>
   </modules>
   <properties>
@@ -267,7 +266,7 @@
     <doxiaVersion>1.0-alpha-9</doxiaVersion>
     <easyMockVersion>1.2_Java1.3</easyMockVersion>
     <junitVersion>3.8.1</junitVersion>
-    <plexusVersion>1.0-alpha-48</plexusVersion>
+    <plexusVersion>1.0-alpha-50-SNAPSHOT</plexusVersion>
     <plexusInteractivityVersion>1.0-alpha-6</plexusInteractivityVersion>
     <plexusInterpolationVersion>1.1</plexusInterpolationVersion>
     <plexusUtilsVersion>1.5.5</plexusUtilsVersion>



Mime
View raw message