You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by hi...@apache.org on 2009/11/15 20:25:38 UTC
svn commit: r836398 - in /ant/ivy/ivyde/trunk: ./
org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/
test/http-settings/
Author: hibou
Date: Sun Nov 15 19:25:38 2009
New Revision: 836398
URL: http://svn.apache.org/viewvc?rev=836398&view=rev
Log:
IVYDE-218 : make IvyDE don't try to parse the non file:... urls
Added:
ant/ivy/ivyde/trunk/test/http-settings/
ant/ivy/ivyde/trunk/test/http-settings/.classpath
ant/ivy/ivyde/trunk/test/http-settings/.project
ant/ivy/ivyde/trunk/test/http-settings/ivy.xml (with props)
Modified:
ant/ivy/ivyde/trunk/CHANGES.txt
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerConfAdapter.java
Modified: ant/ivy/ivyde/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/CHANGES.txt?rev=836398&r1=836397&r2=836398&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/CHANGES.txt (original)
+++ ant/ivy/ivyde/trunk/CHANGES.txt Sun Nov 15 19:25:38 2009
@@ -24,6 +24,7 @@
- FIX: Incorrect project:// path in the ivysettings configuration make the UI crash (IVYDE-203)
- FIX: conf attributes must not be null (IVYDE-209) (thanks to Ivica Loncar)
- FIX: Errors are not reported when multiple resolve are launched (IVYDE-219)
+- FIX: Ivy settings file cannot be loaded via http url (IVYDE-218)
version 2.0.0 final
==========================
Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerConfAdapter.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerConfAdapter.java?rev=836398&r1=836397&r2=836398&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerConfAdapter.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerConfAdapter.java Sun Nov 15 19:25:38 2009
@@ -208,6 +208,9 @@
} catch (MalformedURLException e) {
return value;
}
+ if (url.getProtocol() != null && !url.getProtocol().equals("file")) {
+ return value;
+ }
File file = new File(url.getPath());
if (file.exists()) {
return value;
Added: ant/ivy/ivyde/trunk/test/http-settings/.classpath
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/http-settings/.classpath?rev=836398&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/test/http-settings/.classpath (added)
+++ ant/ivy/ivyde/trunk/test/http-settings/.classpath Sun Nov 15 19:25:38 2009
@@ -0,0 +1,7 @@
+<?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&confs=*&ivySettingsPath=http%3A%2F%2Fpeople.apache.org%2F%7Ehibou%2Ftest-ivyde%2Fivysettings.xml&loadSettingsOnDemand=false&propertyFiles=&doRetrieve=false&retrievePattern=lib%2F%5Bconf%5D%2F%5Bartifact%5D.%5Bext%5D&retrieveSync=false&retrieveConfs=*&retrieveTypes=*&acceptedTypes=jar&sourceTypes=source&javadocTypes=javadoc&sourceSuffixes=-source%2C-sources%2C-src&javadocSuffixes=-javadoc%2C-javadocs%2C-doc%2C-docs&alphaOrder=false&resolveInWorkspace=false&resolveBeforeLaunch=false"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: ant/ivy/ivyde/trunk/test/http-settings/.project
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/http-settings/.project?rev=836398&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/test/http-settings/.project (added)
+++ ant/ivy/ivyde/trunk/test/http-settings/.project Sun Nov 15 19:25:38 2009
@@ -0,0 +1,35 @@
+<?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-http-settings</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/http-settings/ivy.xml
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/http-settings/ivy.xml?rev=836398&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/test/http-settings/ivy.xml (added)
+++ ant/ivy/ivyde/trunk/test/http-settings/ivy.xml Sun Nov 15 19:25:38 2009
@@ -0,0 +1,30 @@
+<!--
+ 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-http-settings">
+ <description>
+ Project with settings get from http
+ </description>
+ </info>
+ <configurations>
+ <conf name="default" />
+ </configurations>
+ <dependencies>
+ </dependencies>
+</ivy-module>
Propchange: ant/ivy/ivyde/trunk/test/http-settings/ivy.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ant/ivy/ivyde/trunk/test/http-settings/ivy.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/ivyde/trunk/test/http-settings/ivy.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml