cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From reinh...@apache.org
Subject svn commit: r415923 - in /cocoon/trunk/tools/cocoon-maven-eclipse-plugin: ./ src/main/java/org/apache/maven/plugin/eclipse/ src/main/java/org/apache/maven/plugin/ide/ src/test/java/org/apache/maven/plugin/eclipse/ src/test/projects/project-12/ src/test...
Date Wed, 21 Jun 2006 06:10:41 GMT
Author: reinhard
Date: Tue Jun 20 23:10:40 2006
New Revision: 415923

URL: http://svn.apache.org/viewvc?rev=415923&view=rev
Log:
merge with maven-eclipse-plugin rev 415916; tests don't run through ATM but this is a problem
with the maven-eclipse-plugin

Added:
    cocoon/trunk/tools/cocoon-maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/AddMavenRepoMojoTest.java
      - copied unchanged from r415917, maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/AddMavenRepoMojoTest.java
    cocoon/trunk/tools/cocoon-maven-eclipse-plugin/src/test/test-harness/
      - copied from r415917, maven/plugins/trunk/maven-eclipse-plugin/src/test/test-harness/
    cocoon/trunk/tools/cocoon-maven-eclipse-plugin/src/test/test-harness/add-maven-repo/
      - copied from r415917, maven/plugins/trunk/maven-eclipse-plugin/src/test/test-harness/add-maven-repo/
    cocoon/trunk/tools/cocoon-maven-eclipse-plugin/src/test/test-harness/add-maven-repo/min-plugin-config.xml
      - copied unchanged from r415917, maven/plugins/trunk/maven-eclipse-plugin/src/test/test-harness/add-maven-repo/min-plugin-config.xml
Modified:
    cocoon/trunk/tools/cocoon-maven-eclipse-plugin/   (props changed)
    cocoon/trunk/tools/cocoon-maven-eclipse-plugin/pom.xml
    cocoon/trunk/tools/cocoon-maven-eclipse-plugin/revision.txt
    cocoon/trunk/tools/cocoon-maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/AddMavenRepoMojo.java
    cocoon/trunk/tools/cocoon-maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java
    cocoon/trunk/tools/cocoon-maven-eclipse-plugin/src/test/projects/project-12/   (props
changed)
    cocoon/trunk/tools/cocoon-maven-eclipse-plugin/src/test/projects/project-13/   (props
changed)
    cocoon/trunk/tools/cocoon-maven-eclipse-plugin/src/test/projects/project-14/   (props
changed)
    cocoon/trunk/tools/cocoon-maven-eclipse-plugin/src/test/projects/project-15/   (props
changed)
    cocoon/trunk/tools/cocoon-maven-eclipse-plugin/src/test/projects/project-19/   (props
changed)

Propchange: cocoon/trunk/tools/cocoon-maven-eclipse-plugin/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Jun 20 23:10:40 2006
@@ -1,4 +1,3 @@
-release.properties
 target
 *.iml
 .wtpmodules

Modified: cocoon/trunk/tools/cocoon-maven-eclipse-plugin/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/cocoon-maven-eclipse-plugin/pom.xml?rev=415923&r1=415922&r2=415923&view=diff
==============================================================================
--- cocoon/trunk/tools/cocoon-maven-eclipse-plugin/pom.xml (original)
+++ cocoon/trunk/tools/cocoon-maven-eclipse-plugin/pom.xml Tue Jun 20 23:10:40 2006
@@ -78,5 +78,11 @@
       <artifactId>plexus-utils</artifactId>
       <version>1.0.5</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-plugin-testing-harness</artifactId>
+      <version>1.0-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>

Modified: cocoon/trunk/tools/cocoon-maven-eclipse-plugin/revision.txt
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/cocoon-maven-eclipse-plugin/revision.txt?rev=415923&r1=415922&r2=415923&view=diff
==============================================================================
--- cocoon/trunk/tools/cocoon-maven-eclipse-plugin/revision.txt (original)
+++ cocoon/trunk/tools/cocoon-maven-eclipse-plugin/revision.txt Tue Jun 20 23:10:40 2006
@@ -1,3 +1,5 @@
+2006-06-21: merge with Revision 415916 (Reinhard)
+--------------------------------------------------------------------------
 Author: reinhard
 Date: Mon Apr 24 04:07:51 2006
 New Revision: 396513
@@ -8,4 +10,5 @@
 
 Added:
     cocoon/trunk/tools/cocoon-maven-eclipse-plugin/
-      - copied from r396512, maven/plugins/trunk/maven-eclipse-plugin/
\ No newline at end of file
+      - copied from r396512, maven/plugins/trunk/maven-eclipse-plugin/
+--------------------------------------------------------------------------
\ No newline at end of file

Modified: cocoon/trunk/tools/cocoon-maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/AddMavenRepoMojo.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/cocoon-maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/AddMavenRepoMojo.java?rev=415923&r1=415922&r2=415923&view=diff
==============================================================================
--- cocoon/trunk/tools/cocoon-maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/AddMavenRepoMojo.java
(original)
+++ cocoon/trunk/tools/cocoon-maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/AddMavenRepoMojo.java
Tue Jun 20 23:10:40 2006
@@ -42,24 +42,24 @@
      * Path under Eclipse workspace where Eclipse Plugin metadata/config is
      * stored.
      */
-    private static final String DIR_ECLIPSE_PLUGINS_METADATA = ".metadata/.plugins"; //$NON-NLS-1$
+    public static final String DIR_ECLIPSE_PLUGINS_METADATA = ".metadata/.plugins"; //$NON-NLS-1$
 
     /**
      * Path under {@value #DIR_ECLIPSE_PLUGINS_METADATA } folder where Eclipse
      * Workspace Runtime settings are stored.
      */
-    private static final String DIR_ECLIPSE_CORE_RUNTIME_SETTINGS = DIR_ECLIPSE_PLUGINS_METADATA
+    public static final String DIR_ECLIPSE_CORE_RUNTIME_SETTINGS = DIR_ECLIPSE_PLUGINS_METADATA
         + "/org.eclipse.core.runtime/.settings"; //$NON-NLS-1$
 
     /**
      * File that stores the Eclipse JDT Core preferences.
      */
-    private static final String FILE_ECLIPSE_JDT_CORE_PREFS = "org.eclipse.jdt.core.prefs";
//$NON-NLS-1$
+    public static final String FILE_ECLIPSE_JDT_CORE_PREFS = "org.eclipse.jdt.core.prefs";
//$NON-NLS-1$
 
     /**
      * Property constant under which Variable 'M2_REPO' is setup.
      */
-    private static final String CLASSPATH_VARIABLE_M2_REPO = "org.eclipse.jdt.core.classpathVariable.M2_REPO";
//$NON-NLS-1$
+    public static final String CLASSPATH_VARIABLE_M2_REPO = "org.eclipse.jdt.core.classpathVariable.M2_REPO";
//$NON-NLS-1$
 
     /**
      * Location of the <code>Eclipse</code> workspace that holds your

Modified: cocoon/trunk/tools/cocoon-maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/cocoon-maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java?rev=415923&r1=415922&r2=415923&view=diff
==============================================================================
--- cocoon/trunk/tools/cocoon-maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java
(original)
+++ cocoon/trunk/tools/cocoon-maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java
Tue Jun 20 23:10:40 2006
@@ -16,17 +16,6 @@
  * limitations under the License.
  */
 
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
-
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
@@ -52,6 +41,17 @@
 import org.apache.maven.project.MavenProject;
 import org.codehaus.plexus.logging.LogEnabled;
 import org.codehaus.plexus.logging.Logger;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
 
 /**
  * Abstract base plugin which takes care of the common stuff usually needed by maven IDE
plugins. A

Propchange: cocoon/trunk/tools/cocoon-maven-eclipse-plugin/src/test/projects/project-12/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Jun 20 23:10:40 2006
@@ -1,5 +1,4 @@
-.classpath
-.settings
-.wtpmodules
-.project
-target
+target
+.settings
+.project
+.classpath

Propchange: cocoon/trunk/tools/cocoon-maven-eclipse-plugin/src/test/projects/project-13/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Jun 20 23:10:40 2006
@@ -1,5 +1,2 @@
-.classpath
-.settings
-.wtpmodules
-.project
-target
+.project
+.classpath

Propchange: cocoon/trunk/tools/cocoon-maven-eclipse-plugin/src/test/projects/project-14/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Jun 20 23:10:40 2006
@@ -1,5 +1,3 @@
-.classpath
-.settings
-.wtpmodules
-.project
-target
+.project
+.classpath
+

Propchange: cocoon/trunk/tools/cocoon-maven-eclipse-plugin/src/test/projects/project-15/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Jun 20 23:10:40 2006
@@ -1,5 +1,3 @@
-.classpath
-.settings
-.wtpmodules
-.project
-target
+.project
+.classpath
+

Propchange: cocoon/trunk/tools/cocoon-maven-eclipse-plugin/src/test/projects/project-19/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Jun 20 23:10:40 2006
@@ -1,5 +1,3 @@
-.classpath
-.settings
-.wtpmodules
-.project
-target
+.project
+.classpath
+target



Mime
View raw message