You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ca...@apache.org on 2006/09/05 23:45:57 UTC
svn commit: r440500 - in /maven/shared/trunk/maven-user: ./ maven-user-controller/ maven-user-controller/src/test/resources/META-INF/plexus/ maven-user-model/src/main/java/org/apache/maven/user/model/impl/ maven-user-model/src/test/java/org/apache/mave...

Author: carlos
Date: Tue Sep  5 14:45:56 2006
New Revision: 440500

URL: http://svn.apache.org/viewvc?view=rev&rev=440500
Log:
Moved UserHolderMock to main

Added:
    maven/shared/trunk/maven-user/maven-user-model/src/main/java/org/apache/maven/user/model/impl/UserHolderMock.java
      - copied unchanged from r440492, maven/shared/trunk/maven-user/maven-user-model/src/test/java/org/apache/maven/user/model/impl/UserHolderMock.java
Removed:
    maven/shared/trunk/maven-user/maven-user-model/src/test/java/org/apache/maven/user/model/impl/UserHolderMock.java
Modified:
    maven/shared/trunk/maven-user/maven-user-controller/pom.xml
    maven/shared/trunk/maven-user/maven-user-controller/src/test/resources/META-INF/plexus/components.xml
    maven/shared/trunk/maven-user/maven-user-model/src/test/resources/META-INF/plexus/components.xml
    maven/shared/trunk/maven-user/pom.xml

Modified: maven/shared/trunk/maven-user/maven-user-controller/pom.xml
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-user/maven-user-controller/pom.xml?view=diff&rev=440500&r1=440499&r2=440500
==============================================================================
--- maven/shared/trunk/maven-user/maven-user-controller/pom.xml (original)
+++ maven/shared/trunk/maven-user/maven-user-controller/pom.xml Tue Sep  5 14:45:56 2006
@@ -24,13 +24,6 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>maven-user-model</artifactId>
-      <version>${project.version}</version>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-xwork-integration</artifactId>
       <version>1.0-alpha-2-SNAPSHOT</version>

Modified: maven/shared/trunk/maven-user/maven-user-controller/src/test/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-user/maven-user-controller/src/test/resources/META-INF/plexus/components.xml?view=diff&rev=440500&r1=440499&r2=440500
==============================================================================
--- maven/shared/trunk/maven-user/maven-user-controller/src/test/resources/META-INF/plexus/components.xml (original)
+++ maven/shared/trunk/maven-user/maven-user-controller/src/test/resources/META-INF/plexus/components.xml Tue Sep  5 14:45:56 2006
@@ -4,13 +4,5 @@
       <role>org.codehaus.plexus.jdo.JdoFactory</role>
       <implementation>org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory</implementation>
     </component>
-    <component>
-      <role>org.apache.maven.user.model.UserHolder</role>
-      <role-hint>mock</role-hint>
-      <implementation>org.apache.maven.user.model.impl.UserHolderMock</implementation>
-      <configuration>
-        <userName>myUserName</userName>
-      </configuration>
-    </component>
   </components>
 </component-set>

Modified: maven/shared/trunk/maven-user/maven-user-model/src/test/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-user/maven-user-model/src/test/resources/META-INF/plexus/components.xml?view=diff&rev=440500&r1=440499&r2=440500
==============================================================================
--- maven/shared/trunk/maven-user/maven-user-model/src/test/resources/META-INF/plexus/components.xml (original)
+++ maven/shared/trunk/maven-user/maven-user-model/src/test/resources/META-INF/plexus/components.xml Tue Sep  5 14:45:56 2006
@@ -4,13 +4,5 @@
       <role>org.codehaus.plexus.jdo.JdoFactory</role>
       <implementation>org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory</implementation>
     </component>
-    <component>
-      <role>org.apache.maven.user.model.UserHolder</role>
-      <role-hint>mock</role-hint>
-      <implementation>org.apache.maven.user.model.impl.UserHolderMock</implementation>
-      <configuration>
-        <userName>myUserName</userName>
-      </configuration>
-    </component>
   </components>
 </component-set>

Modified: maven/shared/trunk/maven-user/pom.xml
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-user/pom.xml?view=diff&rev=440500&r1=440499&r2=440500
==============================================================================
--- maven/shared/trunk/maven-user/pom.xml (original)
+++ maven/shared/trunk/maven-user/pom.xml Tue Sep  5 14:45:56 2006
@@ -150,18 +150,6 @@
         </configuration>
       </plugin>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <executions>
-          <execution>
-            <goals>
-              <goal>test-jar</goal>
-            </goals>
-            <phase>package</phase>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
         <groupId>org.mortbay.jetty</groupId>
         <artifactId>maven-jetty-plugin</artifactId>
         <version>6.0.0rc2</version>