Author: hibou Date: Sun Mar 31 14:52:49 2013 New Revision: 1462982 URL: http://svn.apache.org/r1462982 Log: IVYDE-326 : Support for variables in the retrieve pattern (thanks to Carsten Pfeiffer)
Added: ant/ivy/ivyde/trunk/test/retrieve-var/ (with props) ant/ivy/ivyde/trunk/test/retrieve-var/.classpath (with props) ant/ivy/ivyde/trunk/test/retrieve-var/.project (with props) ant/ivy/ivyde/trunk/test/retrieve-var/.settings/ ant/ivy/ivyde/trunk/test/retrieve-var/.settings/org.apache.ivyde.eclipse.prefs ant/ivy/ivyde/trunk/test/retrieve-var/ivy.xml (with props) ant/ivy/ivyde/trunk/test/retrieve-var/ivysettings.xml (with props) ant/ivy/ivyde/trunk/test/retrieve-var/src/ Modified: ant/ivy/ivyde/trunk/doc/release-notes.html ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/resolve/IvyResolver.java ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/ClasspathSetupEditor.java ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/ClasspathSetupTab.java ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/ClasspathTypeComposite.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/ClasspathSetupPreferencePage.java ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/EditStandaloneRetrieveDialog.java Modified: ant/ivy/ivyde/trunk/doc/release-notes.html URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/doc/release-notes.html?rev=1462982&r1=1462981&r2=1462982&view=diff ============================================================================== --- ant/ivy/ivyde/trunk/doc/release-notes.html (original) +++ ant/ivy/ivyde/trunk/doc/release-notes.html Sun Mar 31 14:52:49 2013 @@ -127,6 +127,7 @@ Here is the list of people who have cont List of changes since <a href="/ivy/ivyde/history/2.2.0.beta1/release-notes.html">Apache IvyDE 2.2.0 beta1</a>: <ul> + <li>NEW: Support for variables in the retrieve pattern (IVYDE-326) (thanks to Carsten Pfeiffer)</li> <li>NEW: Support Accepted Types: * (IVYDE-306)</li> <li>NEW: Support Workspace/Filesystem/Variables for "Ivy File" setting (IVYDE-304)</li> <li>NEW: Retrieve list does not resolve workspace projects (IVYDE-308) (thanks to Peter Oxenham)</li> Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/resolve/IvyResolver.java URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/resolve/IvyResolver.java?rev=1462982&r1=1462981&r2=1462982&view=diff ============================================================================== --- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/resolve/IvyResolver.java (original) +++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/resolve/IvyResolver.java Sun Mar 31 14:52:49 2013 @@ -49,10 +49,13 @@ import org.apache.ivyde.eclipse.cpcontai import org.apache.ivyde.eclipse.workspaceresolver.WorkspaceResolver; import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.MultiStatus; import org.eclipse.core.runtime.Status; +import org.eclipse.core.variables.IStringVariableManager; +import org.eclipse.core.variables.VariablesPlugin; /** * Eclipse classpath container that will contain the ivy resolved entries. @@ -325,7 +328,21 @@ public class IvyResolver { return Status.OK_STATUS; } - String pattern = project.getLocation().toPortableString() + "/" + retrievePattern; + // Perform variable substition on the pattern. + IStringVariableManager varManager = VariablesPlugin.getDefault().getStringVariableManager(); + String pattern; + try { + pattern = varManager.performStringSubstitution(retrievePattern, false); + } catch (CoreException e) { + return new Status(IStatus.ERROR, IvyPlugin.ID, IStatus.ERROR, + "Incorrect use of variables in retrievePattern '" + retrievePattern + "'." + + e.getMessage(), e); + } + // For backwards compatibility we prepend the project location to the pattern, + // but we do it only in case the pattern does not start with a variable (i.e. ${xxx ) + if (!retrievePattern.startsWith("${")) { + pattern = project.getLocation().toPortableString() + "/" + pattern; + } IvyDEMessage.info("Retrieving files into " + pattern); Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/ClasspathSetupEditor.java URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/ClasspathSetupEditor.java?rev=1462982&r1=1462981&r2=1462982&view=diff ============================================================================== --- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/ClasspathSetupEditor.java (original) +++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/ClasspathSetupEditor.java Sun Mar 31 14:52:49 2013 @@ -20,6 +20,7 @@ package org.apache.ivyde.eclipse.ui; import org.apache.ivyde.eclipse.IvyPlugin; import org.apache.ivyde.eclipse.cpcontainer.ClasspathSetup; import org.apache.ivyde.eclipse.cpcontainer.IvyClasspathUtil; +import org.eclipse.core.resources.IProject; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; @@ -60,7 +61,7 @@ public class ClasspathSetupEditor extend private boolean osgiAvailable; - public ClasspathSetupEditor(Composite parent, int style) { + public ClasspathSetupEditor(Composite parent, int style, IProject project) { super(parent, style); setLayout(new GridLayout(2, false)); @@ -113,7 +114,7 @@ public class ClasspathSetupEditor extend selectRetrieve = new Button(buttons, SWT.RADIO); selectRetrieve.setText("retrieved artifacts"); - retrieveComposite = new RetrieveComposite(this, SWT.NONE, false); + retrieveComposite = new RetrieveComposite(this, SWT.NONE, false, project); gridData = new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1); gridData.horizontalIndent = INDENT_RETRIEVE; retrieveComposite.setLayoutData(gridData); Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/ClasspathSetupTab.java URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/ClasspathSetupTab.java?rev=1462982&r1=1462981&r2=1462982&view=diff ============================================================================== --- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/ClasspathSetupTab.java (original) +++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/ClasspathSetupTab.java Sun Mar 31 14:52:49 2013 @@ -35,7 +35,7 @@ public class ClasspathSetupTab extends A } protected Composite createSetupEditor(Composite configComposite, IProject project) { - classpathSetupEditor = new ClasspathSetupEditor(configComposite, SWT.NONE); + classpathSetupEditor = new ClasspathSetupEditor(configComposite, SWT.NONE, project); classpathSetupEditor.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, true)); return classpathSetupEditor; } Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/ClasspathTypeComposite.java URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/ClasspathTypeComposite.java?rev=1462982&r1=1462981&r2=1462982&view=diff ============================================================================== --- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/ClasspathTypeComposite.java (original) +++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/ClasspathTypeComposite.java Sun Mar 31 14:52:49 2013 @@ -18,6 +18,7 @@ package org.apache.ivyde.eclipse.ui; import org.apache.ivyde.eclipse.retrieve.RetrieveSetup; +import org.eclipse.core.resources.IProject; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; @@ -39,7 +40,7 @@ public class ClasspathTypeComposite exte private Button selectCache; - public ClasspathTypeComposite(Composite parent, int style) { + public ClasspathTypeComposite(Composite parent, int style, IProject project) { super(parent, style); setLayout(new GridLayout(1, false)); @@ -58,7 +59,7 @@ public class ClasspathTypeComposite exte selectRetrieve = new Button(buttons, SWT.RADIO); selectRetrieve.setText("retrieved artifacts"); - retrieveComposite = new RetrieveComposite(this, SWT.NONE, false); + retrieveComposite = new RetrieveComposite(this, SWT.NONE, false, project); gridData = new GridData(SWT.FILL, SWT.FILL, true, true); gridData.horizontalIndent = INDENT_RETRIEVE; retrieveComposite.setLayoutData(gridData); 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=1462982&r1=1462981&r2=1462982&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 Sun Mar 31 14:52:49 2013 @@ -18,7 +18,10 @@ package org.apache.ivyde.eclipse.ui; import org.apache.ivyde.eclipse.retrieve.RetrieveSetup; +import org.eclipse.core.resources.IProject; import org.eclipse.swt.SWT; +import org.eclipse.swt.events.SelectionAdapter; +import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; @@ -38,7 +41,9 @@ public class RetrieveComposite extends C public static final String TOOLTIP_RETRIEVE_TYPES = "Comma separated list of types to retrieve" + "\nExemple: '*' or 'jar,source'"; - private Text retrievePatternText; + private static final String DEFAULT_PATTERN = "/[type]s/[artifact]-[revision](-[classifier]).[ext]"; + + private PathEditor retrievePatternText; private Button retrieveSyncButton; @@ -46,18 +51,35 @@ public class RetrieveComposite extends C private Text typesText; - public RetrieveComposite(Composite parent, int style, boolean withConf) { + public RetrieveComposite(Composite parent, int style, boolean withConf, IProject project) { super(parent, style); GridLayout layout = new GridLayout(2, false); layout.marginHeight = 0; layout.marginWidth = 0; setLayout(layout); - Label label = new Label(this, SWT.NONE); - label.setText("Retrieve pattern:"); + retrievePatternText = new PathEditor(this, SWT.NONE, "Retrieve pattern", project, null) { + private Button addPattern; - retrievePatternText = new Text(this, SWT.SINGLE | SWT.BORDER); - retrievePatternText.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false)); + protected boolean addButtons(Composite buttons) { + addPattern = new Button(buttons, SWT.NONE); + addPattern.setLayoutData(new GridData(GridData.END, GridData.CENTER, true, false)); + addPattern.setText("Add def. pattern"); + addPattern.addSelectionListener(new SelectionAdapter() { + public void widgetSelected(SelectionEvent e) { + getText().setText(getText().getText() + DEFAULT_PATTERN); + } + }); + return true; + } + + public void setEnabled(boolean enabled) { + super.setEnabled(enabled); + addPattern.setEnabled(enabled); + } + }; + retrievePatternText.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false, + 2, 1)); retrievePatternText.setToolTipText(TOOLTIP_RETRIEVE_PATTERN); retrieveSyncButton = new Button(this, SWT.CHECK); @@ -66,7 +88,7 @@ public class RetrieveComposite extends C 2, 1)); if (withConf) { - label = new Label(this, SWT.NONE); + Label label = new Label(this, SWT.NONE); label.setText("Configurations:"); confsText = new Text(this, SWT.SINGLE | SWT.BORDER); @@ -74,7 +96,7 @@ public class RetrieveComposite extends C confsText.setToolTipText(TOOLTIP_RETRIEVE_CONFS); } - label = new Label(this, SWT.NONE); + Label label = new Label(this, SWT.NONE); label.setText("Types:"); typesText = new Text(this, SWT.SINGLE | SWT.BORDER); @@ -86,7 +108,7 @@ public class RetrieveComposite extends C public RetrieveSetup getRetrieveSetup() { RetrieveSetup setup = new RetrieveSetup(); setup.setRetrieveSync(retrieveSyncButton.getSelection()); - setup.setRetrievePattern(retrievePatternText.getText()); + setup.setRetrievePattern(retrievePatternText.getText().getText()); if (confsText != null) { setup.setRetrieveConfs(confsText.getText()); } @@ -95,7 +117,7 @@ public class RetrieveComposite extends C } public void init(RetrieveSetup setup) { - retrievePatternText.setText(setup.getRetrievePattern()); + retrievePatternText.getText().setText(setup.getRetrievePattern()); retrieveSyncButton.setSelection(setup.isRetrieveSync()); if (confsText != null) { confsText.setText(setup.getRetrieveConfs()); Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/ClasspathSetupPreferencePage.java URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/ClasspathSetupPreferencePage.java?rev=1462982&r1=1462981&r2=1462982&view=diff ============================================================================== --- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/ClasspathSetupPreferencePage.java (original) +++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/ClasspathSetupPreferencePage.java Sun Mar 31 14:52:49 2013 @@ -44,7 +44,7 @@ public class ClasspathSetupPreferencePag } protected Control createContents(Composite parent) { - classpathSetupComposite = new ClasspathSetupEditor(parent, SWT.NONE); + classpathSetupComposite = new ClasspathSetupEditor(parent, SWT.NONE, null); classpathSetupComposite .setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, true)); Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/EditStandaloneRetrieveDialog.java URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/EditStandaloneRetrieveDialog.java?rev=1462982&r1=1462981&r2=1462982&view=diff ============================================================================== --- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/EditStandaloneRetrieveDialog.java (original) +++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/EditStandaloneRetrieveDialog.java Sun Mar 31 14:52:49 2013 @@ -111,7 +111,7 @@ public class EditStandaloneRetrieveDialo resolveInWorkspaceCheck .setToolTipText("Will replace jars on the classpath with workspace projects"); - retrieveComposite = new RetrieveComposite(body, SWT.NONE, true); + retrieveComposite = new RetrieveComposite(body, SWT.NONE, true, project); retrieveComposite.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false)); return body; Propchange: ant/ivy/ivyde/trunk/test/retrieve-var/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Mar 31 14:52:49 2013 @@ -0,0 +1,2 @@ +bin +lib Added: ant/ivy/ivyde/trunk/test/retrieve-var/.classpath URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/retrieve-var/.classpath?rev=1462982&view=auto ============================================================================== Binary file - no diff available. Propchange: ant/ivy/ivyde/trunk/test/retrieve-var/.classpath ------------------------------------------------------------------------------ svn:mime-type = application/xml Added: ant/ivy/ivyde/trunk/test/retrieve-var/.project URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/retrieve-var/.project?rev=1462982&view=auto ============================================================================== --- ant/ivy/ivyde/trunk/test/retrieve-var/.project (added) +++ ant/ivy/ivyde/trunk/test/retrieve-var/.project Sun Mar 31 14:52:49 2013 @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + 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. +--> +<projectDescription> + <name>ivydetest-retrieve-var</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> + <nature>org.apache.ivyde.eclipse.ivynature</nature> + </natures> +</projectDescription> Propchange: ant/ivy/ivyde/trunk/test/retrieve-var/.project ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ant/ivy/ivyde/trunk/test/retrieve-var/.project ------------------------------------------------------------------------------ svn:keywords = Date Revision Author HeadURL Id Propchange: ant/ivy/ivyde/trunk/test/retrieve-var/.project ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: ant/ivy/ivyde/trunk/test/retrieve-var/.settings/org.apache.ivyde.eclipse.prefs URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/retrieve-var/.settings/org.apache.ivyde.eclipse.prefs?rev=1462982&view=auto ============================================================================== --- ant/ivy/ivyde/trunk/test/retrieve-var/.settings/org.apache.ivyde.eclipse.prefs (added) +++ ant/ivy/ivyde/trunk/test/retrieve-var/.settings/org.apache.ivyde.eclipse.prefs Sun Mar 31 14:52:49 2013 @@ -0,0 +1,20 @@ +# *************************************************************** +# * 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. +# *************************************************************** +eclipse.preferences.version=1 +org.apache.ivyde.eclipse.standaloneretrieve=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><setuplist><setup name\="dependencies" resolveInWorkspace\="false"><ivysettings ivyUserDir\="" loadondemand\="false" path\="${workspace_loc\:ivydetest-retrieve-var/ivysettings.xml}"/><ivyxml path\="ivy.xml"/><retrieve confs\="*" pattern\="${workspace_loc\:ivydetest-retrieve-var/lib}/[artifact]-[revision](-[classifier]).[ext]" sync\="true" types\="*"/></setup></setuplist> Added: ant/ivy/ivyde/trunk/test/retrieve-var/ivy.xml URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/retrieve-var/ivy.xml?rev=1462982&view=auto ============================================================================== --- ant/ivy/ivyde/trunk/test/retrieve-var/ivy.xml (added) +++ ant/ivy/ivyde/trunk/test/retrieve-var/ivy.xml Sun Mar 31 14:52:49 2013 @@ -0,0 +1,31 @@ +<!-- + 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-var"> + <description> + Project that triggers a retrieve after resolve, with a pattern containing a variable + </description> + </info> + <configurations> + <conf name="default" /> + </configurations> + <dependencies> + <dependency org="myorg" name="mymodule" rev="1.1" conf="default" /> + </dependencies> +</ivy-module> Propchange: ant/ivy/ivyde/trunk/test/retrieve-var/ivy.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ant/ivy/ivyde/trunk/test/retrieve-var/ivy.xml ------------------------------------------------------------------------------ svn:keywords = Date Revision Author HeadURL Id Propchange: ant/ivy/ivyde/trunk/test/retrieve-var/ivy.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: ant/ivy/ivyde/trunk/test/retrieve-var/ivysettings.xml URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/retrieve-var/ivysettings.xml?rev=1462982&view=auto ============================================================================== --- ant/ivy/ivyde/trunk/test/retrieve-var/ivysettings.xml (added) +++ ant/ivy/ivyde/trunk/test/retrieve-var/ivysettings.xml Sun Mar 31 14:52:49 2013 @@ -0,0 +1,28 @@ +<!-- + 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. +--> +<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-var/ivysettings.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ant/ivy/ivyde/trunk/test/retrieve-var/ivysettings.xml ------------------------------------------------------------------------------ svn:keywords = Date Revision Author HeadURL Id Propchange: ant/ivy/ivyde/trunk/test/retrieve-var/ivysettings.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml