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/01/06 14:02:27 UTC
svn commit: r731932 - in /ant/ivy/ivyde/trunk: org.apache.ivyde.eclipse/
org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/
test/exported/ test/exported/src/ test/exported/src/org/
test/exported/src/org/apache/ test/exported/src/or...
Author: hibou
Date: Tue Jan 6 05:02:24 2009
New Revision: 731932
URL: http://svn.apache.org/viewvc?rev=731932&view=rev
Log:
IVYDE-149:
- on edition, keep the 'exported' attribute
Added:
ant/ivy/ivyde/trunk/test/exported/ (with props)
ant/ivy/ivyde/trunk/test/exported/.classpath
ant/ivy/ivyde/trunk/test/exported/.project
ant/ivy/ivyde/trunk/test/exported/ivy.xml (with props)
ant/ivy/ivyde/trunk/test/exported/src/
ant/ivy/ivyde/trunk/test/exported/src/org/
ant/ivy/ivyde/trunk/test/exported/src/org/apache/
ant/ivy/ivyde/trunk/test/exported/src/org/apache/ivyde/
ant/ivy/ivyde/trunk/test/exported/src/org/apache/ivyde/test/
ant/ivy/ivyde/trunk/test/exported/src/org/apache/ivyde/test/Test.java (with props)
ant/ivy/ivyde/trunk/test/imported/
ant/ivy/ivyde/trunk/test/imported/.classpath
ant/ivy/ivyde/trunk/test/imported/.project
ant/ivy/ivyde/trunk/test/imported/bin/
ant/ivy/ivyde/trunk/test/imported/bin/org/
ant/ivy/ivyde/trunk/test/imported/bin/org/apache/
ant/ivy/ivyde/trunk/test/imported/bin/org/apache/ivyde/
ant/ivy/ivyde/trunk/test/imported/bin/org/apache/ivyde/test/
ant/ivy/ivyde/trunk/test/imported/bin/org/apache/ivyde/test/Test.class (with props)
ant/ivy/ivyde/trunk/test/imported/ivy.xml (with props)
ant/ivy/ivyde/trunk/test/imported/src/
ant/ivy/ivyde/trunk/test/imported/src/org/
ant/ivy/ivyde/trunk/test/imported/src/org/apache/
ant/ivy/ivyde/trunk/test/imported/src/org/apache/ivyde/
ant/ivy/ivyde/trunk/test/imported/src/org/apache/ivyde/test/
ant/ivy/ivyde/trunk/test/imported/src/org/apache/ivyde/test/Test.java (with props)
Modified:
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/IvydeContainerPage.java
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=731932&r1=731931&r2=731932&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/CHANGES.txt (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/CHANGES.txt Tue Jan 6 05:02:24 2009
@@ -20,6 +20,7 @@
- FIX: Retrieve after resolve task fails because of wrong resolve configuration (IVYDE-140) (thanks to Daniel Becheanu)
- FIX: Conversion from "file:" to "project:" fails (IVYDE-143) (thanks to Will Gorman)
- FIX: The decorators can throw a NPE at startup (IVYDE-133)
+- FIX: Changing any setting for the classpath container loses the "exported" setting of the classpath container (IVYDE-149)
version 2.0.0 beta1
==========================
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=731932&r1=731931&r2=731932&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 Jan 6 05:02:24 2009
@@ -31,7 +31,6 @@
import org.apache.ivyde.eclipse.ui.SettingsEditor.SettingsEditorListener;
import org.apache.ivyde.eclipse.ui.preferences.ClasspathPreferencePage;
import org.apache.ivyde.eclipse.ui.preferences.IvyDEPreferenceStoreHelper;
-import org.apache.ivyde.eclipse.ui.preferences.IvyPreferencePage;
import org.apache.ivyde.eclipse.ui.preferences.RetrievePreferencePage;
import org.apache.ivyde.eclipse.ui.preferences.SettingsPreferencePage;
import org.eclipse.core.runtime.IStatus;
@@ -94,6 +93,8 @@
private Link retrieveGeneralSettingsLink;
+ private boolean exported;
+
/**
* Constructor
*/
@@ -173,7 +174,7 @@
} else {
conf.isAdvancedProjectSpecific = false;
}
- entry = JavaCore.newContainerEntry(conf.getPath());
+ entry = JavaCore.newContainerEntry(conf.getPath(), exported);
return true;
}
@@ -184,8 +185,10 @@
public void setSelection(IClasspathEntry entry) {
if (entry == null) {
conf = new IvyClasspathContainerConfiguration(project, "ivy.xml", true);
+ exported = false;
} else {
conf = new IvyClasspathContainerConfiguration(project, entry.getPath(), true);
+ exported = entry.isExported();
}
}
Propchange: ant/ivy/ivyde/trunk/test/exported/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Jan 6 05:02:24 2009
@@ -0,0 +1,2 @@
+bin
+bin
Added: ant/ivy/ivyde/trunk/test/exported/.classpath
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/exported/.classpath?rev=731932&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/test/exported/.classpath (added)
+++ ant/ivy/ivyde/trunk/test/exported/.classpath Tue Jan 6 05:02:24 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 exported="true" kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?ivyXmlPath=ivy.xml&confs=*&ivySettingsPath=&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=true&resolveInWorkspace=false"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: ant/ivy/ivyde/trunk/test/exported/.project
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/exported/.project?rev=731932&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/test/exported/.project (added)
+++ ant/ivy/ivyde/trunk/test/exported/.project Tue Jan 6 05:02:24 2009
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>ivydetest-exported</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/exported/ivy.xml
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/exported/ivy.xml?rev=731932&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/test/exported/ivy.xml (added)
+++ ant/ivy/ivyde/trunk/test/exported/ivy.xml Tue Jan 6 05:02:24 2009
@@ -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-exported">
+ <description>
+ Project having a ivyde classpath container exported from the project
+ </description>
+ </info>
+ <configurations>
+ <conf name="default" />
+ </configurations>
+ <dependencies>
+ <dependency org="commons-logging" name="commons-logging" rev="1.+" conf="default" />
+ </dependencies>
+</ivy-module>
Propchange: ant/ivy/ivyde/trunk/test/exported/ivy.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ant/ivy/ivyde/trunk/test/exported/ivy.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/ivyde/trunk/test/exported/ivy.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: ant/ivy/ivyde/trunk/test/exported/src/org/apache/ivyde/test/Test.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/exported/src/org/apache/ivyde/test/Test.java?rev=731932&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/test/exported/src/org/apache/ivyde/test/Test.java (added)
+++ ant/ivy/ivyde/trunk/test/exported/src/org/apache/ivyde/test/Test.java Tue Jan 6 05:02:24 2009
@@ -0,0 +1,27 @@
+/*
+ * 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.
+ *
+ */
+package org.apache.ivyde.test;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+public class Test {
+
+ private static final Log log = LogFactory.getLog(Test.class);
+
+}
Propchange: ant/ivy/ivyde/trunk/test/exported/src/org/apache/ivyde/test/Test.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ant/ivy/ivyde/trunk/test/exported/src/org/apache/ivyde/test/Test.java
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/ivyde/trunk/test/exported/src/org/apache/ivyde/test/Test.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ant/ivy/ivyde/trunk/test/imported/.classpath
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/imported/.classpath?rev=731932&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/test/imported/.classpath (added)
+++ ant/ivy/ivyde/trunk/test/imported/.classpath Tue Jan 6 05:02:24 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 combineaccessrules="false" kind="src" path="/ivydetest-exported"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: ant/ivy/ivyde/trunk/test/imported/.project
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/imported/.project?rev=731932&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/test/imported/.project (added)
+++ ant/ivy/ivyde/trunk/test/imported/.project Tue Jan 6 05:02:24 2009
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>ivydetest-imported</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/imported/bin/org/apache/ivyde/test/Test.class
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/imported/bin/org/apache/ivyde/test/Test.class?rev=731932&view=auto
==============================================================================
Binary file - no diff available.
Propchange: ant/ivy/ivyde/trunk/test/imported/bin/org/apache/ivyde/test/Test.class
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: ant/ivy/ivyde/trunk/test/imported/ivy.xml
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/imported/ivy.xml?rev=731932&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/test/imported/ivy.xml (added)
+++ ant/ivy/ivyde/trunk/test/imported/ivy.xml Tue Jan 6 05:02:24 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-imported">
+ <description>
+ Project depending on another project that exports an ivyde classpath container
+ </description>
+ </info>
+ <configurations>
+ <conf name="default" />
+ </configurations>
+ <dependencies>
+ </dependencies>
+</ivy-module>
Propchange: ant/ivy/ivyde/trunk/test/imported/ivy.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ant/ivy/ivyde/trunk/test/imported/ivy.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/ivyde/trunk/test/imported/ivy.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: ant/ivy/ivyde/trunk/test/imported/src/org/apache/ivyde/test/Test.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/imported/src/org/apache/ivyde/test/Test.java?rev=731932&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/test/imported/src/org/apache/ivyde/test/Test.java (added)
+++ ant/ivy/ivyde/trunk/test/imported/src/org/apache/ivyde/test/Test.java Tue Jan 6 05:02:24 2009
@@ -0,0 +1,27 @@
+/*
+ * 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.
+ *
+ */
+package org.apache.ivyde.test;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+public class Test {
+
+ private static final Log log = LogFactory.getLog(Test.class);
+
+}
Propchange: ant/ivy/ivyde/trunk/test/imported/src/org/apache/ivyde/test/Test.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ant/ivy/ivyde/trunk/test/imported/src/org/apache/ivyde/test/Test.java
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/ivyde/trunk/test/imported/src/org/apache/ivyde/test/Test.java
------------------------------------------------------------------------------
svn:mime-type = text/plain