ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hi...@apache.org
Subject svn commit: r720513 - in /ant/ivy/ivyde/trunk: doc/ org.apache.ivyde.eclipse/ org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/ org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/ org.apache.ivyde.eclipse/src/java/org/a...
Date Tue, 25 Nov 2008 15:43:17 GMT
Author: hibou
Date: Tue Nov 25 07:43:16 2008
New Revision: 720513

URL: http://svn.apache.org/viewvc?rev=720513&view=rev
Log:
IVYDE-106: add the possibility to specify the types and configurations for the retrieve job

Added:
    ant/ivy/ivyde/trunk/test/retrieve-by-type/   (with props)
    ant/ivy/ivyde/trunk/test/retrieve-by-type/.classpath
    ant/ivy/ivyde/trunk/test/retrieve-by-type/.project
    ant/ivy/ivyde/trunk/test/retrieve-by-type/ivy.xml   (with props)
    ant/ivy/ivyde/trunk/test/retrieve-by-type/ivysettings.xml   (with props)
    ant/ivy/ivyde/trunk/test/retrieve-by-type/src/
Modified:
    ant/ivy/ivyde/trunk/doc/index.html
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/CHANGES.txt
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerConfiguration.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJob.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvydeContainerPage.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/RetrieveComposite.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/IvyDEPreferenceStoreHelper.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/IvyPreferencePage.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/PreferenceConstants.java

Modified: ant/ivy/ivyde/trunk/doc/index.html
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/doc/index.html?rev=720513&r1=720512&r2=720513&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/doc/index.html (original)
+++ ant/ivy/ivyde/trunk/doc/index.html Tue Nov 25 07:43:16 2008
@@ -45,20 +45,30 @@
 The global configuration can be found in the global configuration panel of Eclipse (menu
Window>Preferences for Windows and Linux users, Eclipse>Preferences for mac users),
and select the item Ivy.
 
 <img src="images/pref.jpg"/><br/>
-<ol><b>Preference fields:</b>
+<ul><b>Global settings:</b>
 	<li><u>Ivy settings URL:</u> specify here the path to your ivy settings
file. Leave it blank to use Ivy default resolvers</li>
-	<li><u>Retrieve option:</u> specify here if you want ivy to do a retrieve
after the resolve.<br/> If you check retrieve you must provide a the retrieve pattern.
Check <a href="../../../history/latest-milestone/use/retrieve.html">Ivy documentation</a>
for pattern explanation.</li>
+</ul>
+<ul><b>Retrieve configuration:</b><br/>
+    If checked, some retrieve job will be triggered after each the resolve.<br/>
+	<li><u>Retrieve pattern:</u> the pattern to use for the retrieve. Check
<a href="../../../history/latest-milestone/use/retrieve.html">Ivy documentation</a>
for pattern explanation.</li>
+        <li><u>Delete old retrieve artifacts:</u> on each retrieve, the
previously retrieved libraries will be removed (similar to the sync argument in the ant task)</li>
+        <li><u>Retrieve configurations:</u> the configurations to retrieve
(a comma separated list)</li>
+        <li><u>Retrieve types:</u> the types of artifact to retrieve (a
comma separated list)</li>
+</ul>
+<ul><b>Classpath container configuration:</b>
+	<li><u>Project dependencies:</u> IvyDE can try to make dependencies between
project more than to jars into a repository.
+	    <u><i>Important note:</i></u> this feature is quite limited
for now, it just tries to replace jar dependencies with project dependencies, based on the
module id of the jar, and the projects configured to use IvyDE; the version is not taken into
consideration, and even if a project match a dependency, the jar of the dependency have to
be resolved from a repository.</li>
+	<li><u>Order alphabetically:</u> by default in the classpath container
the entries are ordered by order of declaration. When there are many entries, it could be
useful to have them ordered alphabetically so that you can find them faster.</li>
 	<li><u>Accepted types:</u> a comma separated list of extensions which
will make IvyDE add the artifact to the classpath</li>
 	<li><u>Sources types:</u> a comma separated list of ivy "type" which will
make IvyDE consider them as sources</li>
 	<li><u>Sources suffixes:</u> a comma separated list of suffixes which
will make IvyDE attach as source the artifact with the suffix to the artifact without the
suffix. For instance, "commons-lang-sources.jar" will be attached as source to "commons-lang.jar"
with the default value.</li>
 	<li><u>Javadoc types:</u> same as sources types but for javadocs</li>
 	<li><u>Javadoc suffixes:</u> same as sources suffixes but for javadocs</li>
-	<li><u>Order alphabetically:</u> by default in the classpath container
the entries are ordered by order of declaration. When there are many entries, it could be
useful to have them ordered alphabetically so that you can find them faster.</li>
-	<li><u>Project dependencies:</u> IvyDE can try to make dependencies between
project more than to jars into a repository.
-	    <u><i>Important note:</i></u> this feature is quite limited
for now, it just tries to replace jar dependencies with project dependencies, based on the
module id of the jar, and the projects configured to use IvyDE; the version is not taken into
consideration, and even if a project match a dependency, the jar of the dependency have to
be resolved from a repository.</li>
+</ul>
+<ul><b>Editor information:</b>
 	<li><u>Organisation:</u> your company name for ivy editor completion </li>
 	<li><u>Organisation URL:</u> your company web site url for ivy editor
completion </li>
-</ol>
+</ul>
 
 </textarea>
 <script type="text/javascript">xooki.postProcess();</script>

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/CHANGES.txt
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/CHANGES.txt?rev=720513&r1=720512&r2=720513&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/CHANGES.txt (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/CHANGES.txt Tue Nov 25 07:43:16 2008
@@ -8,6 +8,7 @@
 - NEW: Add errors marker to the Ivy container (IVYDE-78)
 - NEW: Handle a project: scheme for the path of the ivysettings.xml (IVYDE-94)
 - NEW: Need CleanCache task in context menu (IVYDE-114)
+- NEW: Retrieve after resolve feature does not fetch only accepted jar types artifact (IVYDE-106)
 
 - IMPROVE: Split the configuration panel (IVYDE-119)
 - IMPROVE: Support latest dev version of ivy.jar in IVYDE build (IVYDE-122)

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerConfiguration.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerConfiguration.java?rev=720513&r1=720512&r2=720513&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerConfiguration.java
(original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerConfiguration.java
Tue Nov 25 07:43:16 2008
@@ -89,6 +89,10 @@
 
     boolean retrieveSync = false;
 
+    String retrieveConfs = "*";
+
+    String retrieveTypes = "*";
+
     boolean alphaOrder;
 
     boolean resolveInWorkspace;
@@ -205,6 +209,12 @@
             } else if (parameter[0].equals("retrieveSync")) {
                 retrieveSync = Boolean.valueOf(value).booleanValue();
                 isRetrieveProjectSpecific = true;
+            } else if (parameter[0].equals("retrieveConfs")) {
+                retrieveConfs = value;
+                isRetrieveProjectSpecific = true;
+            } else if (parameter[0].equals("retrieveTypes")) {
+                retrieveTypes = value;
+                isRetrieveProjectSpecific = true;
             } else if (parameter[0].equals("acceptedTypes")) {
                 acceptedTypes = IvyClasspathUtil.split(value);
                 isAdvancedProjectSpecific = true;
@@ -305,6 +315,10 @@
                 path.append(URLEncoder.encode(retrievePattern, "UTF-8"));
                 path.append("&retrieveSync=");
                 path.append(URLEncoder.encode(Boolean.toString(retrieveSync), "UTF-8"));
+                path.append("&retrieveConfs=");
+                path.append(URLEncoder.encode(retrieveConfs, "UTF-8"));
+                path.append("&retrieveTypes=");
+                path.append(URLEncoder.encode(retrieveTypes, "UTF-8"));
             }
             if (isAdvancedProjectSpecific) {
                 path.append("&acceptedTypes=");
@@ -566,6 +580,20 @@
         return retrievePattern;
     }
 
+    public String getInheritedRetrieveConfs() {
+        if (!isRetrieveProjectSpecific) {
+            return IvyPlugin.getPreferenceStoreHelper().getRetrieveConfs();
+        }
+        return retrieveConfs;
+    }
+
+    public String getInheritedRetrieveTypes() {
+        if (!isRetrieveProjectSpecific) {
+            return IvyPlugin.getPreferenceStoreHelper().getRetrieveTypes();
+        }
+        return retrieveTypes;
+    }
+
     public boolean getInheritedRetrieveSync() {
         if (!isRetrieveProjectSpecific) {
             return IvyPlugin.getPreferenceStoreHelper().getRetrieveSync();

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJob.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJob.java?rev=720513&r1=720512&r2=720513&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJob.java
(original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJob.java
Tue Nov 25 07:43:16 2008
@@ -55,6 +55,8 @@
 import org.apache.ivy.plugins.repository.TransferEvent;
 import org.apache.ivy.plugins.repository.TransferListener;
 import org.apache.ivy.util.Message;
+import org.apache.ivy.util.filter.ArtifactTypeFilter;
+import org.apache.ivy.util.filter.Filter;
 import org.apache.ivyde.eclipse.IvyDEException;
 import org.apache.ivyde.eclipse.IvyPlugin;
 import org.eclipse.core.resources.IFile;
@@ -448,6 +450,9 @@
             monitor.setTaskName("retrieving dependencies in " + pattern);
             RetrieveOptions c = new RetrieveOptions().setConfs(confs);
             c.setSync(conf.getInheritedRetrieveSync());
+            c.setConfs(conf.getInheritedRetrieveConfs().split(","));
+            c.setArtifactFilter(new ArtifactTypeFilter(IvyClasspathUtil.split(conf
+                    .getInheritedRetrieveTypes())));
             ivy.retrieve(md.getModuleRevisionId(), pattern, c);
         }
     }

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvydeContainerPage.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvydeContainerPage.java?rev=720513&r1=720512&r2=720513&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvydeContainerPage.java
(original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvydeContainerPage.java
Tue Nov 25 07:43:16 2008
@@ -132,6 +132,8 @@
             conf.doRetrieve = retrieveComposite.isRetrieveEnabled();
             conf.retrievePattern = retrieveComposite.getRetrievePattern();
             conf.retrieveSync = retrieveComposite.isSyncEnabled();
+            conf.retrieveConfs = retrieveComposite.getRetrieveConfs();
+            conf.retrieveTypes = retrieveComposite.getRetrieveTypes();
             conf.alphaOrder = alphaOrderCheck.getSelectionIndex() == 1;
             conf.resolveInWorkspace = resolveInWorkspaceCheck.getSelection();
         } else {
@@ -432,10 +434,11 @@
 
         if (conf.isRetrieveProjectSpecific()) {
             retrieveProjectSpecificButton.setSelection(true);
-            retrieveComposite.init(conf.doRetrieve, conf.retrievePattern, conf.retrieveSync);
+            retrieveComposite.init(conf.doRetrieve, conf.retrievePattern, conf.retrieveConfs,
+                conf.retrieveTypes, conf.retrieveSync);
         } else {
             retrieveProjectSpecificButton.setSelection(false);
-            retrieveComposite.init(helper.getDoRetrieve(), helper.getRetrievePattern(), helper
+            retrieveComposite.init(helper.getDoRetrieve(), helper.getRetrievePattern(), helper.getRetrieveConfs(),
helper.getRetrieveTypes(), helper
                     .getRetrieveSync());
         }
 

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/RetrieveComposite.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/RetrieveComposite.java?rev=720513&r1=720512&r2=720513&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/RetrieveComposite.java
(original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/RetrieveComposite.java
Tue Nov 25 07:43:16 2008
@@ -33,12 +33,22 @@
             + "To copy artifacts in folder named lib without revision by folder"
             + " named like configurations";
 
+    public static final String TOOLTIP_RETRIEVE_CONFS = "Comma separated list of configuration
to retrieve\n"
+        +"Exemple: '*' or 'compile,test'";
+
+    public static final String TOOLTIP_RETRIEVE_TYPES = "Comma separated list of types to
retrieve\n"
+        +"Exemple: '*' or 'jar,source'";
+
     private Button doRetrieveButton;
 
     private Text retrievePatternText;
 
     private Button retrieveSyncButton;
 
+    private Text confsText;
+
+    private Text typesText;
+
     public RetrieveComposite(Composite parent, int style) {
         super(parent, style);
         GridLayout layout = new GridLayout(2, false);
@@ -65,10 +75,28 @@
                 2, 1));
         retrieveSyncButton.setEnabled(doRetrieveButton.getSelection());
 
+        label = new Label(this, SWT.NONE);
+        label.setText("Configurations:");
+
+        confsText = new Text(this, SWT.SINGLE | SWT.BORDER);
+        confsText.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false));
+        confsText.setEnabled(doRetrieveButton.getSelection());
+        confsText.setToolTipText(TOOLTIP_RETRIEVE_CONFS);
+
+        label = new Label(this, SWT.NONE);
+        label.setText("Types:");
+
+        typesText = new Text(this, SWT.SINGLE | SWT.BORDER);
+        typesText.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false));
+        typesText.setEnabled(doRetrieveButton.getSelection());
+        typesText.setToolTipText(TOOLTIP_RETRIEVE_TYPES);
+        
         doRetrieveButton.addSelectionListener(new SelectionAdapter() {
             public void widgetSelected(SelectionEvent e) {
                 retrievePatternText.setEnabled(doRetrieveButton.getSelection());
                 retrieveSyncButton.setEnabled(doRetrieveButton.getSelection());
+                confsText.setEnabled(doRetrieveButton.getSelection());
+                typesText.setEnabled(doRetrieveButton.getSelection());
             }
         });
     }
@@ -85,10 +113,20 @@
         return retrievePatternText.getText();
     }
 
-    public void init(boolean doRetrieve, String retrievePattern, boolean retrieveSync) {
+    public String getRetrieveConfs() {
+        return confsText.getText();
+    }
+
+    public String getRetrieveTypes() {
+        return typesText.getText();
+    }
+
+    public void init(boolean doRetrieve, String retrievePattern, String confs, String types,
boolean retrieveSync) {
         doRetrieveButton.setSelection(doRetrieve);
         retrievePatternText.setText(retrievePattern);
         retrieveSyncButton.setSelection(retrieveSync);
+        confsText.setText(confs);
+        typesText.setText(types);
     }
 
     public void setEnabled(boolean enabled) {
@@ -96,5 +134,7 @@
         doRetrieveButton.setEnabled(enabled);
         retrievePatternText.setEnabled(enabled && doRetrieveButton.getSelection());
         retrieveSyncButton.setEnabled(enabled && doRetrieveButton.getSelection());
+        confsText.setEnabled(enabled && doRetrieveButton.getSelection());
+        typesText.setEnabled(enabled && doRetrieveButton.getSelection());
     }
 }

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/IvyDEPreferenceStoreHelper.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/IvyDEPreferenceStoreHelper.java?rev=720513&r1=720512&r2=720513&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/IvyDEPreferenceStoreHelper.java
(original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/IvyDEPreferenceStoreHelper.java
Tue Nov 25 07:43:16 2008
@@ -47,6 +47,10 @@
 
     public static final boolean DEFAULT_RETRIEVE_SYNC = false;
 
+    public static final String DEFAULT_RETRIEVE_CONFS = "*";
+
+    public static final String DEFAULT_RETRIEVE_TYPES = "*";
+
     public static final boolean DEFAULT_ALPHABETICAL_ORDER = false;
 
     public static final boolean DEFAULT_RESOLVE_IN_WORKSPACE = false;
@@ -78,6 +82,8 @@
         }
 
         prefStore.setDefault(PreferenceConstants.RETRIEVE_PATTERN, DEFAULT_RETRIEVE_PATTERN);
+        prefStore.setDefault(PreferenceConstants.RETRIEVE_CONFS, DEFAULT_RETRIEVE_CONFS);
+        prefStore.setDefault(PreferenceConstants.RETRIEVE_TYPES, DEFAULT_RETRIEVE_TYPES);
         String s = prefStore.getString(PreferenceConstants.RETRIEVE_PATTERN_DEPRECATED);
         if (s != null && s.length() != 0) {
             // not the default value, so it has been set
@@ -180,6 +186,22 @@
         prefStore.setValue(PreferenceConstants.RETRIEVE_SYNC, sync);
     }
 
+    public String getRetrieveConfs() {
+        return prefStore.getString(PreferenceConstants.RETRIEVE_CONFS);
+    }
+
+    public void setRetrieveConfs(String confs) {
+        prefStore.setValue(PreferenceConstants.RETRIEVE_CONFS, confs);
+    }
+
+    public String getRetrieveTypes() {
+        return prefStore.getString(PreferenceConstants.RETRIEVE_TYPES);
+    }
+
+    public void setRetrieveTypes(String types) {
+        prefStore.setValue(PreferenceConstants.RETRIEVE_TYPES, types);
+    }
+
     public boolean isAlphOrder() {
         return prefStore.getBoolean(PreferenceConstants.ALPHABETICAL_ORDER);
     }

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/IvyPreferencePage.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/IvyPreferencePage.java?rev=720513&r1=720512&r2=720513&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/IvyPreferencePage.java
(original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/IvyPreferencePage.java
Tue Nov 25 07:43:16 2008
@@ -158,7 +158,7 @@
         IvyDEPreferenceStoreHelper helper = IvyPlugin.getPreferenceStoreHelper();
         settingsPathText.init(helper.getIvySettingsPath());
         retrieveComposite.init(helper.getDoRetrieve(), helper.getRetrievePattern(), helper
-                .getRetrieveSync());
+                .getRetrieveConfs(), helper.getRetrieveTypes(), helper.getRetrieveSync());
         resolveInWorkspaceCheck.setSelection(helper.isResolveInWorkspace());
         alphaOrderCheck.select(helper.isAlphOrder() ? 1 : 0);
         acceptedSuffixesTypesComposite.init(helper.getAcceptedTypes(), helper.getSourceTypes(),
@@ -173,6 +173,8 @@
         helper.setDoRetrieve(retrieveComposite.isRetrieveEnabled());
         helper.setRetrievePattern(retrieveComposite.getRetrievePattern());
         helper.setRetrieveSync(retrieveComposite.isSyncEnabled());
+        helper.setRetrieveConfs(retrieveComposite.getRetrieveConfs());
+        helper.setRetrieveTypes(retrieveComposite.getRetrieveTypes());
         helper.setResolveInWorkspace(resolveInWorkspaceCheck.getSelection());
         helper.setAlphOrder(alphaOrderCheck.getSelectionIndex() == 1);
         helper.setAcceptedTypes(acceptedSuffixesTypesComposite.getAcceptedTypes());
@@ -189,6 +191,8 @@
         settingsPathText.init(IvyDEPreferenceStoreHelper.DEFAULT_IVYSETTINGS_PATH);
         retrieveComposite.init(IvyDEPreferenceStoreHelper.DEFAULT_DO_RETRIEVE,
             IvyDEPreferenceStoreHelper.DEFAULT_RETRIEVE_PATTERN,
+            IvyDEPreferenceStoreHelper.DEFAULT_RETRIEVE_CONFS,
+            IvyDEPreferenceStoreHelper.DEFAULT_RETRIEVE_TYPES,
             IvyDEPreferenceStoreHelper.DEFAULT_RETRIEVE_SYNC);
         resolveInWorkspaceCheck
                 .setSelection(IvyDEPreferenceStoreHelper.DEFAULT_RESOLVE_IN_WORKSPACE);

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/PreferenceConstants.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/PreferenceConstants.java?rev=720513&r1=720512&r2=720513&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/PreferenceConstants.java
(original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/PreferenceConstants.java
Tue Nov 25 07:43:16 2008
@@ -58,8 +58,13 @@
 
     public static final String RETRIEVE_SYNC = "retrieve.sync";
 
+    public static final String RETRIEVE_CONFS = "retrieve.confs";
+
+    public static final String RETRIEVE_TYPES = "retrieve.types";
+
     public static final String ALPHABETICAL_ORDER = "order.alphabetical";
 
     public static final String RESOLVE_IN_WORKSPACE = "resolveInWorkspace";
 
+
 }

Propchange: ant/ivy/ivyde/trunk/test/retrieve-by-type/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Nov 25 07:43:16 2008
@@ -0,0 +1,3 @@
+lib
+bin
+

Added: ant/ivy/ivyde/trunk/test/retrieve-by-type/.classpath
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/retrieve-by-type/.classpath?rev=720513&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/test/retrieve-by-type/.classpath (added)
+++ ant/ivy/ivyde/trunk/test/retrieve-by-type/.classpath Tue Nov 25 07:43:16 2008
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?ivyXmlPath=ivy.xml&amp;confs=*&amp;ivySettingsPath=project%3A%2F%2F%2Fivysettings.xml&amp;doRetrieve=true&amp;retrievePattern=lib%2F%5Bartifact%5D-%5Brevision%5D.%5Bext%5D&amp;retrieveSync=true&amp;retrieveConfs=myconf&amp;retrieveTypes=jar&amp;acceptedTypes=jar&amp;sourceTypes=source&amp;javadocTypes=javadoc&amp;sourceSuffixes=-source%2C-sources%2C-src&amp;javadocSuffixes=-javadoc%2C-javadocs%2C-doc%2C-docs&amp;alphaOrder=false&amp;resolveInWorkspace=false"/>
+	<classpathentry kind="lib" path="lib/mymodule-1.1.jar"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

Added: ant/ivy/ivyde/trunk/test/retrieve-by-type/.project
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/retrieve-by-type/.project?rev=720513&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/test/retrieve-by-type/.project (added)
+++ ant/ivy/ivyde/trunk/test/retrieve-by-type/.project Tue Nov 25 07:43:16 2008
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>ivydetest-retrieve-by-type</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

Added: ant/ivy/ivyde/trunk/test/retrieve-by-type/ivy.xml
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/retrieve-by-type/ivy.xml?rev=720513&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/test/retrieve-by-type/ivy.xml (added)
+++ ant/ivy/ivyde/trunk/test/retrieve-by-type/ivy.xml Tue Nov 25 07:43:16 2008
@@ -0,0 +1,32 @@
+<!--
+   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.    
+-->
+<ivy-module version="1.0">
+    <info organisation="org.apache.ivyde" module="ivytest-retrieve-by-type">
+        <description>
+            Project that triggers a retrieve for a specific type and conf after resolve
+        </description>
+    </info>
+    <configurations>
+        <conf name="default" />
+        <conf name="myconf" />
+    </configurations>
+    <dependencies>
+        <dependency org="myorg" name="mymodule" rev="1.1" conf="myconf->default" />
+    </dependencies>
+</ivy-module>

Propchange: ant/ivy/ivyde/trunk/test/retrieve-by-type/ivy.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/ivyde/trunk/test/retrieve-by-type/ivy.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/ivyde/trunk/test/retrieve-by-type/ivy.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: ant/ivy/ivyde/trunk/test/retrieve-by-type/ivysettings.xml
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/retrieve-by-type/ivysettings.xml?rev=720513&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/test/retrieve-by-type/ivysettings.xml (added)
+++ ant/ivy/ivyde/trunk/test/retrieve-by-type/ivysettings.xml Tue Nov 25 07:43:16 2008
@@ -0,0 +1,10 @@
+<ivysettings>
+    <caches defaultCacheDir="${ivy.settings.dir}/../cache-fakerepo" useOrigin="true" />
+    <settings defaultResolver="fakerepo" checkUpToDate="false" />
+    <resolvers>
+        <filesystem name="fakerepo">
+            <ivy pattern="${ivy.settings.dir}/../fakerepo/[organisation]/[module]/ivy-[revision].xml"/>
+            <artifact pattern="${ivy.settings.dir}/../fakerepo/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]"/>
+        </filesystem>
+    </resolvers>
+</ivysettings>

Propchange: ant/ivy/ivyde/trunk/test/retrieve-by-type/ivysettings.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/ivyde/trunk/test/retrieve-by-type/ivysettings.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/ivyde/trunk/test/retrieve-by-type/ivysettings.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml



Mime
View raw message