[Swift-commit] Cog update
swift at ci.uchicago.edu
swift at ci.uchicago.edu
Sat Mar 24 04:00:06 CDT 2012
------------------------------------------------------------------------
r3365 | davidkelly999 | 2012-03-24 03:58:40 -0500 (Sat, 24 Mar 2012) | 5 lines
Fixes to get Swift loading into Eclipse without errors
Many modules had a classpath setup pointing to non-existent versions of log4j
Others modules were relying on Eclipse variables for the location of log4j
I think this is better - give each module a real jar it can use (but use relative symlinks to conserve space)
------------------------------------------------------------------------
Index: modules/provider-mpichg2/.classpath
===================================================================
--- modules/provider-mpichg2/.classpath (revision 3364)
+++ modules/provider-mpichg2/.classpath (working copy)
@@ -14,6 +14,6 @@
<accessrule kind="nonaccessible" pattern="**/CVS/*"/>
</accessrules>
</classpathentry>
- <classpathentry kind="lib" path="/util/lib/log4j-1.2.8.jar"/>
+ <classpathentry kind="lib" path="lib/log4j-1.2.16.jar"/>
<classpathentry kind="output" path=".build"/>
</classpath>
Index: modules/provider-mpichg2/lib/log4j-1.2.16.jar
===================================================================
--- modules/provider-mpichg2/lib/log4j-1.2.16.jar (revision 0)
+++ modules/provider-mpichg2/lib/log4j-1.2.16.jar (revision 3365)
@@ -0,0 +1 @@
+link ../../../lib/log4j-1.2.16.jar
\ No newline at end of file
Property changes on: modules/provider-mpichg2/lib/log4j-1.2.16.jar
___________________________________________________________________
Added: svn:special
+ *
Index: modules/provider-localscheduler/.classpath
===================================================================
--- modules/provider-localscheduler/.classpath (revision 3364)
+++ modules/provider-localscheduler/.classpath (working copy)
@@ -11,6 +11,6 @@
</classpathentry>
<classpathentry combineaccessrules="false" kind="src" path="/jglobus"/>
<classpathentry combineaccessrules="false" kind="src" path="/util"/>
- <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/log4j"/>
+ <classpathentry kind="lib" path="lib/log4j-1.2.16.jar"/>
<classpathentry kind="output" path=".build"/>
</classpath>
Index: modules/provider-localscheduler/lib/log4j-1.2.16.jar
===================================================================
--- modules/provider-localscheduler/lib/log4j-1.2.16.jar (revision 0)
+++ modules/provider-localscheduler/lib/log4j-1.2.16.jar (revision 3365)
@@ -0,0 +1 @@
+link ../../../lib/log4j-1.2.16.jar
\ No newline at end of file
Property changes on: modules/provider-localscheduler/lib/log4j-1.2.16.jar
___________________________________________________________________
Added: svn:special
+ *
Index: modules/provider-local/.classpath
===================================================================
--- modules/provider-local/.classpath (revision 3364)
+++ modules/provider-local/.classpath (working copy)
@@ -10,6 +10,6 @@
</accessrules>
</classpathentry>
<classpathentry combineaccessrules="false" kind="src" path="/jglobus"/>
- <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/log4j"/>
+ <classpathentry kind="lib" path="lib/log4j-1.2.16.jar"/>
<classpathentry kind="output" path=".build"/>
</classpath>
Index: modules/provider-local/lib/log4j-1.2.16.jar
===================================================================
--- modules/provider-local/lib/log4j-1.2.16.jar (revision 0)
+++ modules/provider-local/lib/log4j-1.2.16.jar (revision 3365)
@@ -0,0 +1 @@
+link ../../../lib/log4j-1.2.16.jar
\ No newline at end of file
Property changes on: modules/provider-local/lib/log4j-1.2.16.jar
___________________________________________________________________
Added: svn:special
+ *
Index: modules/provider-gt2/.classpath
===================================================================
--- modules/provider-gt2/.classpath (revision 3364)
+++ modules/provider-gt2/.classpath (working copy)
@@ -11,6 +11,6 @@
</classpathentry>
<classpathentry combineaccessrules="false" kind="src" path="/util"/>
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/jglobus"/>
- <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/log4j"/>
+ <classpathentry kind="lib" path="lib/log4j-1.2.16.jar"/>
<classpathentry kind="output" path=".build"/>
</classpath>
Index: modules/provider-gt2/lib/log4j-1.2.16.jar
===================================================================
--- modules/provider-gt2/lib/log4j-1.2.16.jar (revision 0)
+++ modules/provider-gt2/lib/log4j-1.2.16.jar (revision 3365)
@@ -0,0 +1 @@
+link ../../../lib/log4j-1.2.16.jar
\ No newline at end of file
Property changes on: modules/provider-gt2/lib/log4j-1.2.16.jar
___________________________________________________________________
Added: svn:special
+ *
Index: modules/provider-gt4_0_0/.classpath
===================================================================
--- modules/provider-gt4_0_0/.classpath (revision 3364)
+++ modules/provider-gt4_0_0/.classpath (working copy)
@@ -46,6 +46,6 @@
<classpathentry exported="true" kind="lib" path="lib/cog-provider-clref-gt4_0_0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/concurrent.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/jglobus"/>
- <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/log4j"/>
+ <classpathentry kind="lib" path="lib/log4j-1.2.16.jar"/>
<classpathentry kind="output" path=".build"/>
</classpath>
Index: modules/provider-gt4_0_0/lib/log4j-1.2.16.jar
===================================================================
--- modules/provider-gt4_0_0/lib/log4j-1.2.16.jar (revision 0)
+++ modules/provider-gt4_0_0/lib/log4j-1.2.16.jar (revision 3365)
@@ -0,0 +1 @@
+link ../../../lib/log4j-1.2.16.jar
\ No newline at end of file
Property changes on: modules/provider-gt4_0_0/lib/log4j-1.2.16.jar
___________________________________________________________________
Added: svn:special
+ *
Index: modules/provider-ssh/.classpath
===================================================================
--- modules/provider-ssh/.classpath (revision 3364)
+++ modules/provider-ssh/.classpath (working copy)
@@ -12,6 +12,7 @@
<classpathentry kind="lib" path="lib/j2ssh-common-0.2.2.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/jglobus"/>
<classpathentry kind="lib" path="lib/j2ssh-core-0.2.2-patch-b.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/log4j"/>
+ <classpathentry kind="lib" path="lib/log4j-1.2.16.jar"/>
+ <classpathentry kind="src" path="/abstraction-provider-local"/>
<classpathentry kind="output" path=".build"/>
</classpath>
Index: modules/provider-ssh/lib/log4j-1.2.16.jar
===================================================================
--- modules/provider-ssh/lib/log4j-1.2.16.jar (revision 0)
+++ modules/provider-ssh/lib/log4j-1.2.16.jar (revision 3365)
@@ -0,0 +1 @@
+link ../../../lib/log4j-1.2.16.jar
\ No newline at end of file
Property changes on: modules/provider-ssh/lib/log4j-1.2.16.jar
___________________________________________________________________
Added: svn:special
+ *
Index: modules/provider-coaster/.classpath
===================================================================
--- modules/provider-coaster/.classpath (revision 3364)
+++ modules/provider-coaster/.classpath (working copy)
@@ -13,6 +13,6 @@
<classpathentry combineaccessrules="false" kind="src" path="/jglobus"/>
<classpathentry kind="src" path="/abstraction-provider-local"/>
<classpathentry kind="src" path="/util"/>
- <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/log4j"/>
+ <classpathentry kind="lib" path="lib/log4j-1.2.16.jar"/>
<classpathentry kind="output" path=".build"/>
</classpath>
Index: modules/provider-coaster/lib/log4j-1.2.16.jar
===================================================================
--- modules/provider-coaster/lib/log4j-1.2.16.jar (revision 0)
+++ modules/provider-coaster/lib/log4j-1.2.16.jar (revision 3365)
@@ -0,0 +1 @@
+link ../../../lib/log4j-1.2.16.jar
\ No newline at end of file
Property changes on: modules/provider-coaster/lib/log4j-1.2.16.jar
___________________________________________________________________
Added: svn:special
+ *
Index: modules/abstraction-common/.classpath
===================================================================
--- modules/abstraction-common/.classpath (revision 3364)
+++ modules/abstraction-common/.classpath (working copy)
@@ -4,8 +4,8 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="etc"/>
<classpathentry kind="lib" path="lib/castor-0.9.6.jar"/>
+ <classpathentry kind="lib" path="lib/log4j-1.2.16.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/util"/>
<classpathentry combineaccessrules="false" kind="src" path="/jglobus"/>
- <classpathentry exported="true" kind="con" path="org.eclipse.jdt.USER_LIBRARY/log4j"/>
<classpathentry kind="output" path=".build"/>
</classpath>
Index: modules/abstraction-common/lib/log4j-1.2.16.jar
===================================================================
--- modules/abstraction-common/lib/log4j-1.2.16.jar (revision 0)
+++ modules/abstraction-common/lib/log4j-1.2.16.jar (revision 3365)
@@ -0,0 +1 @@
+link ../../../lib/log4j-1.2.16.jar
\ No newline at end of file
Property changes on: modules/abstraction-common/lib/log4j-1.2.16.jar
___________________________________________________________________
Added: svn:special
+ *
Index: modules/provider-dcache/.classpath
===================================================================
--- modules/provider-dcache/.classpath (revision 3364)
+++ modules/provider-dcache/.classpath (working copy)
@@ -4,6 +4,6 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src" path="/abstraction-common"/>
<classpathentry combineaccessrules="false" kind="src" path="/abstraction-provider-local"/>
- <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/log4j"/>
+ <classpathentry kind="lib" path="lib/log4j-1.2.16.jar"/>
<classpathentry kind="output" path=".build"/>
</classpath>
Index: modules/provider-dcache/lib/log4j-1.2.16.jar
===================================================================
--- modules/provider-dcache/lib/log4j-1.2.16.jar (revision 0)
+++ modules/provider-dcache/lib/log4j-1.2.16.jar (revision 3365)
@@ -0,0 +1 @@
+link ../../../lib/log4j-1.2.16.jar
\ No newline at end of file
Property changes on: modules/provider-dcache/lib/log4j-1.2.16.jar
___________________________________________________________________
Added: svn:special
+ *
Index: modules/setup/.classpath
===================================================================
--- modules/setup/.classpath (revision 3364)
+++ modules/setup/.classpath (working copy)
@@ -7,6 +7,6 @@
<classpathentry exported="true" kind="src" path="/resources"/>
<classpathentry exported="true" kind="src" path="/util"/>
<classpathentry exported="true" kind="src" path="/jglobus"/>
- <classpathentry kind="lib" path="/util/lib/log4j-1.2.8.jar"/>
+ <classpathentry kind="lib" path="lib/log4j-1.2.16.jar"/>
<classpathentry kind="output" path=".build"/>
</classpath>
Index: modules/setup/lib/log4j-1.2.16.jar
===================================================================
--- modules/setup/lib/log4j-1.2.16.jar (revision 0)
+++ modules/setup/lib/log4j-1.2.16.jar (revision 3365)
@@ -0,0 +1 @@
+link ../../../lib/log4j-1.2.16.jar
\ No newline at end of file
Property changes on: modules/setup/lib/log4j-1.2.16.jar
___________________________________________________________________
Added: svn:special
+ *
Index: modules/provider-webdav/.classpath
===================================================================
--- modules/provider-webdav/.classpath (revision 3364)
+++ modules/provider-webdav/.classpath (working copy)
@@ -11,6 +11,6 @@
<accessrule kind="nonaccessible" pattern="**/CVS/*"/>
</accessrules>
</classpathentry>
- <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/log4j"/>
+ <classpathentry kind="lib" path="lib/log4j-1.2.16.jar"/>
<classpathentry kind="output" path=".build"/>
</classpath>
Index: modules/provider-webdav/lib/log4j-1.2.16.jar
===================================================================
--- modules/provider-webdav/lib/log4j-1.2.16.jar (revision 0)
+++ modules/provider-webdav/lib/log4j-1.2.16.jar (revision 3365)
@@ -0,0 +1 @@
+link ../../../lib/log4j-1.2.16.jar
\ No newline at end of file
Property changes on: modules/provider-webdav/lib/log4j-1.2.16.jar
___________________________________________________________________
Added: svn:special
+ *
Index: modules/provider-slocal/.classpath
===================================================================
--- modules/provider-slocal/.classpath (revision 3364)
+++ modules/provider-slocal/.classpath (working copy)
@@ -12,6 +12,6 @@
<classpathentry combineaccessrules="false" kind="src" path="/util"/>
<classpathentry combineaccessrules="false" kind="src" path="/abstraction-provider-local"/>
<classpathentry combineaccessrules="false" kind="src" path="/jglobus"/>
- <classpathentry kind="lib" path="/util/lib/log4j-1.2.8.jar"/>
+ <classpathentry kind="lib" path="lib/log4j-1.2.16.jar"/>
<classpathentry kind="output" path=".build"/>
</classpath>
Index: modules/provider-slocal/lib/log4j-1.2.16.jar
===================================================================
--- modules/provider-slocal/lib/log4j-1.2.16.jar (revision 0)
+++ modules/provider-slocal/lib/log4j-1.2.16.jar (revision 3365)
@@ -0,0 +1 @@
+link ../../../lib/log4j-1.2.16.jar
\ No newline at end of file
Property changes on: modules/provider-slocal/lib/log4j-1.2.16.jar
___________________________________________________________________
Added: svn:special
+ *
Index: modules/certrequest/.classpath
===================================================================
--- modules/certrequest/.classpath (revision 3364)
+++ modules/certrequest/.classpath (working copy)
@@ -8,6 +8,6 @@
<accessrule kind="nonaccessible" pattern="**/CVS/*"/>
</accessrules>
</classpathentry>
- <classpathentry kind="lib" path="/util/lib/log4j-1.2.8.jar"/>
+ <classpathentry kind="lib" path="lib/log4j-1.2.16.jar"/>
<classpathentry kind="output" path=".build"/>
</classpath>
Index: modules/certrequest/lib/log4j-1.2.16.jar
===================================================================
--- modules/certrequest/lib/log4j-1.2.16.jar (revision 0)
+++ modules/certrequest/lib/log4j-1.2.16.jar (revision 3365)
@@ -0,0 +1 @@
+link ../../../lib/log4j-1.2.16.jar
\ No newline at end of file
Property changes on: modules/certrequest/lib/log4j-1.2.16.jar
___________________________________________________________________
Added: svn:special
+ *
Index: modules/karajan/.classpath
===================================================================
--- modules/karajan/.classpath (revision 3364)
+++ modules/karajan/.classpath (working copy)
@@ -11,6 +11,6 @@
<classpathentry combineaccessrules="false" kind="src" path="/abstraction-provider-gt2"/>
<classpathentry combineaccessrules="false" kind="src" path="/jglobus"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/backport-util-concurrent"/>
- <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/log4j"/>
+ <classpathentry kind="lib" path="lib/log4j-1.2.16.jar"/>
<classpathentry kind="output" path=".build"/>
</classpath>
Index: modules/karajan/lib/log4j-1.2.16.jar
===================================================================
--- modules/karajan/lib/log4j-1.2.16.jar (revision 0)
+++ modules/karajan/lib/log4j-1.2.16.jar (revision 3365)
@@ -0,0 +1 @@
+link ../../../lib/log4j-1.2.16.jar
\ No newline at end of file
Property changes on: modules/karajan/lib/log4j-1.2.16.jar
___________________________________________________________________
Added: svn:special
+ *
Index: modules/grapheditor/.classpath
===================================================================
--- modules/grapheditor/.classpath (revision 3364)
+++ modules/grapheditor/.classpath (working copy)
@@ -6,9 +6,8 @@
<classpathentry excluding="**/CVS/*" kind="src" path="resources"/>
<classpathentry exported="true" kind="src" path="/resources"/>
<classpathentry exported="true" kind="src" path="/util"/>
- <classpathentry exported="true" kind="con" path="org.eclipse.jdt.USER_LIBRARY/log4j-1.2.8"/>
+ <classpathentry kind="lib" path="lib/log4j-1.2.16.jar"/>
<classpathentry exported="true" kind="con" path="org.eclipse.jdt.USER_LIBRARY/ant"/>
- <classpathentry kind="lib" path="/util/lib/log4j-1.2.8.jar"/>
<classpathentry kind="lib" path="/util/lib/ant.jar"/>
<classpathentry kind="output" path=".build"/>
</classpath>
Index: modules/grapheditor/lib/log4j-1.2.16.jar
===================================================================
--- modules/grapheditor/lib/log4j-1.2.16.jar (revision 0)
+++ modules/grapheditor/lib/log4j-1.2.16.jar (revision 3365)
@@ -0,0 +1 @@
+link ../../../lib/log4j-1.2.16.jar
\ No newline at end of file
Property changes on: modules/grapheditor/lib/log4j-1.2.16.jar
___________________________________________________________________
Added: svn:special
+ *
Index: modules/all/.classpath
===================================================================
--- modules/all/.classpath (revision 3364)
+++ modules/all/.classpath (working copy)
@@ -2,9 +2,10 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="lib" path="lib/log4j-1.2.16.jar"/>
<classpathentry kind="output" path=".build"/>
<classpathentry kind="lib" path="etc"/>
- <classpathentry exported="true" excluding="**/CVS/*" kind="src" path="/core"/>
+ <!-- <classpathentry exported="true" excluding="**/CVS/*" kind="src" path="/core"/> -->
<classpathentry exported="true" excluding="**/CVS/*" kind="src" path="/resources"/>
<classpathentry exported="true" excluding="**/CVS/*" kind="src" path="/util"/>
<classpathentry exported="true" excluding="**/CVS/*" kind="src" path="/grapheditor"/>
Index: modules/all/lib/log4j-1.2.16.jar
===================================================================
--- modules/all/lib/log4j-1.2.16.jar (revision 0)
+++ modules/all/lib/log4j-1.2.16.jar (revision 3365)
@@ -0,0 +1 @@
+link ../../../lib/log4j-1.2.16.jar
\ No newline at end of file
Property changes on: modules/all/lib/log4j-1.2.16.jar
___________________________________________________________________
Added: svn:special
+ *
Index: modules/provider-condor/.classpath
===================================================================
--- modules/provider-condor/.classpath (revision 3364)
+++ modules/provider-condor/.classpath (working copy)
@@ -9,6 +9,6 @@
<accessrule kind="nonaccessible" pattern="**/CVS/*"/>
</accessrules>
</classpathentry>
- <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/log4j"/>
+ <classpathentry kind="lib" path="lib/log4j-1.2.16.jar"/>
<classpathentry kind="output" path=".build"/>
</classpath>
Index: modules/provider-condor/lib/log4j-1.2.16.jar
===================================================================
--- modules/provider-condor/lib/log4j-1.2.16.jar (revision 0)
+++ modules/provider-condor/lib/log4j-1.2.16.jar (revision 3365)
@@ -0,0 +1 @@
+link ../../../lib/log4j-1.2.16.jar
\ No newline at end of file
Property changes on: modules/provider-condor/lib/log4j-1.2.16.jar
___________________________________________________________________
Added: svn:special
+ *
Index: modules/util/.classpath
===================================================================
--- modules/util/.classpath (revision 3364)
+++ modules/util/.classpath (working copy)
@@ -4,6 +4,6 @@
<classpathentry kind="lib" path="etc"/>
<classpathentry exported="true" kind="lib" path="lib/jakarta-regexp-1.2.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/log4j"/>
+ <classpathentry kind="lib" path="lib/log4j-1.2.16.jar"/>
<classpathentry kind="output" path=".build"/>
</classpath>
Index: modules/util/lib/log4j-1.2.16.jar
===================================================================
--- modules/util/lib/log4j-1.2.16.jar (revision 0)
+++ modules/util/lib/log4j-1.2.16.jar (revision 3365)
@@ -0,0 +1 @@
+link ../../../lib/log4j-1.2.16.jar
\ No newline at end of file
Property changes on: modules/util/lib/log4j-1.2.16.jar
___________________________________________________________________
Added: svn:special
+ *
Index: modules/examples/.classpath
===================================================================
--- modules/examples/.classpath (revision 3364)
+++ modules/examples/.classpath (working copy)
@@ -8,7 +8,6 @@
<classpathentry combineaccessrules="false" kind="src" path="/abstraction-provider-gt2"/>
<classpathentry kind="lib" path="/abstraction/etc"/>
<classpathentry exported="true" kind="con" path="org.eclipse.jdt.USER_LIBRARY/junit"/>
- <classpathentry exported="true" kind="con" path="org.eclipse.jdt.USER_LIBRARY/log4j-1.2.8"/>
- <classpathentry kind="lib" path="/util/lib/log4j-1.2.8.jar"/>
+ <classpathentry kind="lib" path="lib/log4j-1.2.16.jar"/>
<classpathentry kind="output" path=".build"/>
</classpath>
Index: modules/examples/lib/log4j-1.2.16.jar
===================================================================
--- modules/examples/lib/log4j-1.2.16.jar (revision 0)
+++ modules/examples/lib/log4j-1.2.16.jar (revision 3365)
@@ -0,0 +1 @@
+link ../../../lib/log4j-1.2.16.jar
\ No newline at end of file
Property changes on: modules/examples/lib/log4j-1.2.16.jar
___________________________________________________________________
Added: svn:special
+ *
More information about the Swift-commit
mailing list