rpms/eclipse/devel eclipse-dontgeneratehelpindices.patch, NONE, 1.1 eclipse-filenamepatterns.txt, NONE, 1.1 eclipse-tomcat5.patch, NONE, 1.1 eclipse-build-activeHelpSample.jar.patch, 1.3, 1.4 eclipse-build.patch, 1.1, 1.2 eclipse-updatehomedir.patch, 1.3, 1.4 eclipse.spec, 1.143, 1.144 eclipse-build.xml-typo.patch, 1.1, NONE eclipse-combo-bug-backport.patch, 1.1, NONE eclipse-gtk-launcher.patch, 1.3, NONE eclipse-icon.patch, 1.2, NONE eclipse-importArchivedProj.patch, 1.1, NONE eclipse-jnigen.patch, 1.6, NONE eclipse-libswt-mozilla2.patch, 1.1, NONE eclipse-org.eclipse.core.resources-Makefile.patch, 1.3, NONE eclipse-org.eclipse.help.appserver-host.patch, 1.3, NONE eclipse-platformOptions.patch, 1.1, NONE eclipse-search.patch, 1.1, NONE eclipse-swt-libgcjawt.patch, 1.1, NONE eclipse-textsearch.patch, 1.2, NONE eclipse-welcome-screen.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Jun 20 21:14:03 UTC 2005
Author: overholt
Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16063
Modified Files:
eclipse-build-activeHelpSample.jar.patch eclipse-build.patch
eclipse-updatehomedir.patch eclipse.spec
Added Files:
eclipse-dontgeneratehelpindices.patch
eclipse-filenamepatterns.txt eclipse-tomcat5.patch
Removed Files:
eclipse-build.xml-typo.patch eclipse-combo-bug-backport.patch
eclipse-gtk-launcher.patch eclipse-icon.patch
eclipse-importArchivedProj.patch eclipse-jnigen.patch
eclipse-libswt-mozilla2.patch
eclipse-org.eclipse.core.resources-Makefile.patch
eclipse-org.eclipse.help.appserver-host.patch
eclipse-platformOptions.patch eclipse-search.patch
eclipse-swt-libgcjawt.patch eclipse-textsearch.patch
eclipse-welcome-screen.patch
Log Message:
* Mon Jun 20 2005 Andrew Overholt <overholt at redhat.com> 3.1.0_fc-0.RC3.1
- Import 3.1RC3.
- Use FileInitializer (e.o#90535) - this should eliminate .sos in ~/.eclipse.
- Add eclipse-filenamepatterns.txt ("*.so" currently) for above.
- Symlink JNI libraries.
* Fri Jun 17 2005 Andrew Overholt <overholt at redhat.com> 3.1.0_fc-0.RC2.2
- Update to new naming scheme for resulting gzipped tarball.
- Add patch to not generate help indices (it seems to hang).
* Thu Jun 16 2005 Andrew Overholt <overholt at redhat.com> 3.1.0_fc-0.RC2.1
- Import 3.1RC2.
- Add RCP sub-package. Unsure about its dependencies ATM.
eclipse-dontgeneratehelpindices.patch:
org.eclipse.jdt.doc.isv/buildDoc.xml | 8 ++++----
org.eclipse.jdt.doc.user/build.xml | 8 ++++----
org.eclipse.pde.doc.user/buildDoc.xml | 8 ++++----
org.eclipse.platform.doc.isv/buildDoc.xml | 8 ++++----
org.eclipse.platform.doc.user/build.xml | 6 +++---
5 files changed, 19 insertions(+), 19 deletions(-)
--- NEW FILE eclipse-dontgeneratehelpindices.patch ---
diff -uNr plugins.orig/org.eclipse.jdt.doc.isv/buildDoc.xml plugins/org.eclipse.jdt.doc.isv/buildDoc.xml
--- plugins.orig/org.eclipse.jdt.doc.isv/buildDoc.xml 2005-06-17 14:13:34.000000000 -0400
+++ plugins/org.eclipse.jdt.doc.isv/buildDoc.xml 2005-06-17 14:14:28.000000000 -0400
@@ -9,14 +9,14 @@
<antcall target="convertSchemaToHtml" />
<antcall target="examplesDocCopy" />
<antcall target="generateJavadoc" />
- <antcall target="build.index" />
+<!-- <antcall target="build.index" />-->
<antcall target="createDocZip" />
</target>
-<target name="build.index" description="Builds search index for the plug-in: org.eclipse.jdt.doc.isv" if="eclipse.running">
- <help.buildHelpIndex manifest="${basedir}/plugin.xml" destination="${basedir}"/>
-</target>
+<!--<target name="build.index" description="Builds search index for the plug-in: org.eclipse.jdt.doc.isv" if="eclipse.running">-->
+<!-- <help.buildHelpIndex manifest="${basedir}/plugin.xml" destination="${basedir}"/>-->
+<!--</target>-->
<target name="convertSchemaToHtml" if="eclipse.running">
<property name="dest" value="reference/extension-points" />
diff -uNr plugins.orig/org.eclipse.jdt.doc.user/build.xml plugins/org.eclipse.jdt.doc.user/build.xml
--- plugins.orig/org.eclipse.jdt.doc.user/build.xml 2005-06-17 14:13:49.000000000 -0400
+++ plugins/org.eclipse.jdt.doc.user/build.xml 2005-06-17 14:15:43.000000000 -0400
@@ -43,7 +43,7 @@
</target>
<target name="build.doc.zip" depends="init" unless="doc.zip.present">
- <antcall target="build.index"/>
+ <!--<antcall target="build.index"/>-->
<zip zipfile="${plugin.destination}/doc.zip"
basedir="${plugin.destination}"
includes="*.css, cpy.png, notices.html, about.html, concepts/**, gettingStarted/**, images/**, reference/**, tasks/**, tips/**, whatsNew/**"
@@ -53,9 +53,9 @@
<target name="build.jars" depends="init" description="Build all the jars for the plug-in: org.eclipse.jdt.doc.user.">
</target>
- <target name="build.index" depends="init" description="Builds search index for the plug-in: org.eclipse.jdt.doc.user." if="eclipse.running">
- <help.buildHelpIndex manifest="plugin.xml" destination="."/>
- </target>
+ <!--<target name="build.index" depends="init" description="Builds search index for the plug-in: org.eclipse.jdt.doc.user." if="eclipse.running">-->
+ <!-- <help.buildHelpIndex manifest="plugin.xml" destination="."/>-->
+ <!--</target>-->
<target name="build.sources" depends="init">
</target>
diff -uNr plugins.orig/org.eclipse.pde.doc.user/buildDoc.xml plugins/org.eclipse.pde.doc.user/buildDoc.xml
--- plugins.orig/org.eclipse.pde.doc.user/buildDoc.xml 2005-06-17 14:13:34.000000000 -0400
+++ plugins/org.eclipse.pde.doc.user/buildDoc.xml 2005-06-17 14:16:00.000000000 -0400
@@ -7,13 +7,13 @@
<target name="all" depends="init" unless="doc.zip.present">
<antcall target="convertSchemaToHtml" />
<antcall target="generateJavadoc" />
- <antcall target="build.index" />
+<!-- <antcall target="build.index" />-->
<antcall target="createDocZip" />
</target>
- <target name="build.index" description="Builds search index for the plug-in: org.eclipse.pde.doc.user." if="eclipse.running">
- <help.buildHelpIndex manifest="${basedir}/plugin.xml" destination="${basedir}"/>
- </target>
+<!-- <target name="build.index" description="Builds search index for the plug-in: org.eclipse.pde.doc.user." if="eclipse.running">-->
+<!-- <help.buildHelpIndex manifest="${basedir}/plugin.xml" destination="${basedir}"/>-->
+<!-- </target>-->
<target name="convertSchemaToHtml" if="eclipse.running">
<property name="dest" value="reference/extension-points" />
diff -uNr plugins.orig/org.eclipse.platform.doc.isv/buildDoc.xml plugins/org.eclipse.platform.doc.isv/buildDoc.xml
--- plugins.orig/org.eclipse.platform.doc.isv/buildDoc.xml 2005-06-17 14:13:34.000000000 -0400
+++ plugins/org.eclipse.platform.doc.isv/buildDoc.xml 2005-06-17 14:17:09.000000000 -0400
@@ -8,14 +8,14 @@
<antcall target="convertSchemaToHtml" />
<antcall target="examplesDocCopy" />
<antcall target="generateJavadoc" />
- <antcall target="build.index" />
+<!-- <antcall target="build.index" />-->
<antcall target="createDocZip" />
</target>
-<target name="build.index" description="Builds search index for the plug-in: org.eclipse.jdt.doc.isv" if="eclipse.running">
- <help.buildHelpIndex manifest="${basedir}/plugin.xml" destination="${basedir}"/>
-</target>
+<!--<target name="build.index" description="Builds search index for the plug-in: org.eclipse.jdt.doc.isv" if="eclipse.running">-->
+<!-- <help.buildHelpIndex manifest="${basedir}/plugin.xml" destination="${basedir}"/>-->
+<!--</target>-->
<target name="convertSchemaToHtml" if="eclipse.running">
<property name="dest" value="reference/extension-points" />
diff -uNr plugins.orig/org.eclipse.platform.doc.user/build.xml plugins/org.eclipse.platform.doc.user/build.xml
--- plugins.orig/org.eclipse.platform.doc.user/build.xml 2005-06-17 14:13:49.000000000 -0400
+++ plugins/org.eclipse.platform.doc.user/build.xml 2005-06-17 14:17:39.000000000 -0400
@@ -43,7 +43,7 @@
</target>
<target name="build.doc.zip" depends="init" unless="doc.zip.present">
- <antcall target="build.index"/>
+ <!--<antcall target="build.index"/>-->
<zip zipfile="${plugin.destination}/doc.zip"
basedir="${plugin.destination}"
includes="book.css, about.html, notices.html, cpy.png, no_help_exists.htm, concepts/**, gettingStarted/**, images/**, reference/**, tasks/**, tips/**, whatsNew/**"
@@ -53,9 +53,9 @@
<target name="build.jars" depends="init" description="Build all the jars for the plug-in: org.eclipse.platform.doc.user.">
</target>
- <target name="build.index" depends="init" description="Builds search index for the plug-in: org.eclipse.platform.doc.user." if="eclipse.running">
+ <!--<target name="build.index" depends="init" description="Builds search index for the plug-in: org.eclipse.platform.doc.user." if="eclipse.running">
<help.buildHelpIndex manifest="plugin.xml" destination="."/>
- </target>
+ </target>-->
<target name="build.sources" depends="init">
</target>
--- NEW FILE eclipse-filenamepatterns.txt ---
*.so
eclipse-tomcat5.patch:
.classpath | 54 ++++++++------
META-INF/MANIFEST.MF | 65 +++++++++--------
about.html | 45 +++++++-----
src/org/eclipse/tomcat/internal/TomcatAppServer.java | 69 +++++++++----------
4 files changed, 128 insertions(+), 105 deletions(-)
--- NEW FILE eclipse-tomcat5.patch ---
Index: .classpath
===================================================================
RCS file: /home/eclipse/org.eclipse.tomcat/.classpath,v
retrieving revision 1.20
diff -u -r1.20 .classpath
--- .classpath 21 Apr 2005 23:31:58 -0000 1.20
+++ .classpath 14 Jun 2005 15:48:35 -0000
@@ -1,29 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="catalina.jar"/>
- <classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="bootstrap.jar"/>
- <classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="commons-beanutils.jar"/>
- <classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="commons-collections.jar"/>
- <classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="commons-digester.jar"/>
- <classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="commons-logging-api.jar"/>
- <classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="commons-modeler.jar"/>
- <classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="jakarta-regexp-1.3.jar"/>
- <classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="jasper-compiler.jar"/>
- <classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="jasper-runtime.jar"/>
- <classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="mx4j-jmx.jar"/>
- <classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="naming-common.jar"/>
- <classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="naming-factory.jar"/>
- <classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="naming-resources.jar"/>
- <classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="servlet.jar"/>
- <classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="servlets-common.jar"/>
- <classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="servlets-default.jar"/>
- <classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="servlets-invoker.jar"/>
- <classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="servlets-manager.jar"/>
- <classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="tomcat-coyote.jar"/>
- <classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="tomcat-http11.jar"/>
- <classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="tomcat-util.jar"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="lib" path="bootstrap.jar"/>
+ <classpathentry kind="lib" path="catalina.jar"/>
+ <classpathentry kind="lib" path="catalina-optional.jar"/>
+ <classpathentry kind="lib" path="jakarta-commons-beanutils.jar"/>
+ <classpathentry kind="lib" path="jakarta-commons-collections.jar"/>
+ <classpathentry kind="lib" path="jakarta-commons-dbcp.jar"/>
+ <classpathentry kind="lib" path="jakarta-commons-digester.jar"/>
+ <classpathentry kind="lib" path="jakarta-commons-digester-rss.jar"/>
+ <classpathentry kind="lib" path="jakarta-commons-el.jar"/>
+ <classpathentry kind="lib" path="jakarta-commons-fileupload.jar"/>
+ <classpathentry kind="lib" path="jakarta-commons-launcher.jar"/>
+ <classpathentry kind="lib" path="jakarta-commons-logging.jar"/>
+ <classpathentry kind="lib" path="jakarta-commons-modeler.jar"/>
+ <classpathentry kind="lib" path="jakarta-commons-pool.jar"/>
+ <classpathentry kind="lib" path="jasper5-compiler.jar"/>
+ <classpathentry kind="lib" path="jasper5-runtime.jar"/>
+ <classpathentry kind="lib" path="jspapi.jar"/>
+ <classpathentry kind="lib" path="mx4j.jar"/>
+ <classpathentry kind="lib" path="mx4j-impl.jar"/>
+ <classpathentry kind="lib" path="mx4j-jmx.jar"/>
+ <classpathentry kind="lib" path="naming-common.jar"/>
+ <classpathentry kind="lib" path="naming-factory.jar"/>
+ <classpathentry kind="lib" path="naming-java.jar"/>
+ <classpathentry kind="lib" path="naming-resources.jar"/>
+ <classpathentry kind="lib" path="servletapi5.jar"/>
+ <classpathentry kind="lib" path="servlets-common.jar"/>
+ <classpathentry kind="lib" path="servlets-default.jar"/>
+ <classpathentry kind="lib" path="servlets-invoker.jar"/>
+ <classpathentry kind="lib" path="tomcat-coyote.jar"/>
+ <classpathentry kind="lib" path="tomcat-http11.jar"/>
+ <classpathentry kind="lib" path="tomcat-util.jar"/>
+ <classpathentry kind="lib" path="regexp.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Index: about.html
===================================================================
RCS file: /home/eclipse/org.eclipse.tomcat/about.html,v
retrieving revision 1.23
diff -u -r1.23 about.html
--- about.html 25 Feb 2005 18:17:04 -0000 1.23
+++ about.html 14 Jun 2005 19:13:47 -0000
@@ -7,7 +7,7 @@
<body lang="EN-US">
<h2>About This Content</h2>
-<p>February 24, 2005</p>
+<p>February 24, 2005 (modified June 14, 2005 with update to Tomcat 5.0.30)</p>
<h3>License</h3>
<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
@@ -22,7 +22,7 @@
<p>The Content includes items that have been sourced from third parties as follows:</p>
-<p><b>Tomcat 4.1.30</b></p>
+<p><b>Tomcat 5.0.30</b></p>
<p>The plug-in is based on software developed by The Apache Software Foundation as part of the Jakarta project. Therefore:</p>
<blockquote>
@@ -34,24 +34,31 @@
<ul type="disc">
<li>bootstrap.jar</li>
<li>catalina.jar</li>
- <li>commons-beanutils.jar</li>
- <li>commons-collections.jar</li>
- <li>commons-digester.jar</li>
- <li>commons-logging.jar</li>
- <li>commons-logging-api.jar</li>
- <li>commons-modeler.jar</li>
- <li>jakarta-regexp-1.3.jar</li>
- <li>jasper-compiler.jar</li>
- <li>jasper-runtime.jar</li>
+ <li>catalina-optional.jar</li>
+ <li>jakarta-commons-beanutils.jar</li>
+ <li>jakarta-commons-collections.jar</li>
+ <li>jakarta-commons-dbcp.jar</li>
+ <li>jakarta-commons-digester.jar</li>
+ <li>jakarta-commons-digester-rss.jar</li>
+ <li>jakarta-commons-el.jar</li>
+ <li>jakarta-commons-fileupload.jar</li>
+ <li>jakarta-commons-launcher.jar</li>
+ <li>jakarta-commons-logging.jar</li>
+ <li>jakarta-commons-modeler.jar</li>
+ <li>jakarta-commons-pool.jar</li>
+ <li>jasper5-compiler.jar</li>
+ <li>jasper5-runtime.jar</li>
+ <li>mx4j.jar</li>
+ <li>mx4j-impl.jar</li>
<li>mx4j-jmx.jar</li>
<li>naming-common.jar</li>
<li>naming-factory.jar</li>
<li>naming-resources.jar</li>
- <li>servlet.jar</li>
+ <li>regexp.jar</li>
+ <li>servletapi5.jar</li>
<li>servlets-common.jar</li>
<li>servlets-default.jar</li>
<li>servlets-invoker.jar</li>
- <li>servlets-manager.jar</li>
<li>tomcat-coyote.jar</li>
<li>tomcat-http11.jar</li>
<li>tomcat-util.jar</li>
@@ -65,10 +72,10 @@
<p>Tomcat is:</p>
-<blockquote>Copyright (c) 1999, 2000 The Apache Software Foundation. All rights reserved.</blockquote>
+<blockquote>Copyright (c) 1999-2003 The Apache Software Foundation. All rights reserved.</blockquote>
-<p>Your use of the Tomcat code is subject to the terms and conditions of the Apache Software License 1.1 which is available at
-<a href="http://www.apache.org/licenses/LICENSE-1.1">http://www.apache.org/licenses/LICENSE-1.1</a>. More specifically:</p>
+<p>Your use of the Tomcat code is subject to the terms and conditions of the Apache Software License 2.0 which is available at
+<a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>. More specifically:</p>
<blockquote>
1. Redistributions of source code must retain the above copyright notice, this list of<br>
conditions and the following disclaimer.<br>
@@ -106,11 +113,11 @@
<p>Source code for Tomcat is available at <a href="http://jakarta.apache.org/tomcat/">http://jakarta.apache.org/tomcat/</a>.</p>
-<strong>MX4J 1.1.1</strong>
+<strong>MX4J 2.1.0</strong>
-<p></p>Tomcat 4.1.30 includes mx4j-jmx.jar from MX4J 1.1.1. MX4J is:</p>
+<p></p>Tomcat 5.0.30 includes mx4j.jar, mx4j-jmx.jar and mx4j-impl.jar from MX4J 2.1.0. MX4J is:</p>
-<blockquote>Copyright (c) 2001 MX4J. All rights reserved.</blockquote>
+<blockquote>Copyright (c) 2001-2004 MX4J contributors. All rights reserved.</blockquote>
<p>Your use of the MX4J code is subject to the terms and conditions of the MX4J License, Version 1.0, a copy of which is included
with the Content in the file <a href="mx4j.license">mx4j.license</a>. More specifically: </p>
Index: META-INF/MANIFEST.MF
===================================================================
RCS file: /home/eclipse/org.eclipse.tomcat/META-INF/MANIFEST.MF,v
retrieving revision 1.14
diff -u -r1.14 MANIFEST.MF
--- META-INF/MANIFEST.MF 19 May 2005 04:05:11 -0000 1.14
+++ META-INF/MANIFEST.MF 14 Jun 2005 15:48:41 -0000
@@ -2,30 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.tomcat; singleton:=true
-Bundle-Version: 4.1.30.1
-Bundle-ClassPath: tomcatwrapper.jar,
- catalina.jar,
- bootstrap.jar,
- commons-beanutils.jar,
- commons-collections.jar,
- commons-digester.jar,
- commons-logging-api.jar,
- commons-modeler.jar,
- jakarta-regexp-1.3.jar,
- jasper-compiler.jar,
- jasper-runtime.jar,
- mx4j-jmx.jar,
- naming-common.jar,
- naming-factory.jar,
- naming-resources.jar,
- servlet.jar,
- servlets-common.jar,
- servlets-default.jar,
- servlets-invoker.jar,
- servlets-manager.jar,
- tomcat-coyote.jar,
- tomcat-http11.jar,
- tomcat-util.jar
+Bundle-Version: 5.0.30
Bundle-Activator: org.eclipse.tomcat.internal.TomcatPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -54,8 +31,6 @@
mx4j.util;x-internal:=true,
org.apache.catalina;x-internal:=true,
org.apache.catalina.connector;x-internal:=true,
- org.apache.catalina.connector.http;x-internal:=true,
- org.apache.catalina.connector.http10;x-internal:=true,
org.apache.catalina.realm;x-internal:=true,
org.apache.catalina.servlets;x-internal:=true,
org.apache.commons.beanutils;x-internal:=true,
@@ -79,10 +54,9 @@
org.apache.coyote.http11;x-internal:=true,
org.apache.coyote.http11.filters;x-internal:=true,
org.apache.coyote.memory;x-internal:=true,
- org.apache.coyote.tomcat4;x-internal:=true,
+ org.apache.coyote.tomcat5;x-internal:=true,
org.apache.jasper;x-internal:=true,
org.apache.jasper.compiler;x-internal:=true,
- org.apache.jasper.logging;x-internal:=true,
org.apache.jasper.runtime;x-internal:=true,
org.apache.jasper.servlet;x-internal:=true,
org.apache.jasper.util;x-internal:=true,
@@ -96,14 +70,45 @@
org.apache.tomcat.util.buf;x-internal:=true,
org.apache.tomcat.util.collections;x-internal:=true,
org.apache.tomcat.util.compat;x-internal:=true,
- org.apache.tomcat.util.handler;x-internal:=true,
org.apache.tomcat.util.http;x-internal:=true,
org.apache.tomcat.util.http.mapper;x-internal:=true,
org.apache.tomcat.util.log;x-internal:=true,
- org.apache.tomcat.util.mx;x-internal:=true,
org.apache.tomcat.util.net;x-internal:=true,
org.apache.tomcat.util.net.jsse;x-internal:=true,
org.apache.tomcat.util.res;x-internal:=true,
org.apache.tomcat.util.threads;x-internal:=true,
org.eclipse.tomcat.internal;x-internal:=true,
org.eclipse.tomcat.internal.extensions;x-internal:=true
+Bundle-ClassPath: tomcatwrapper.jar,
+ bootstrap.jar,
+ catalina.jar,
+ catalina-optional.jar,
+ jakarta-commons-beanutils.jar,
+ jakarta-commons-collections.jar,
+ jakarta-commons-dbcp.jar,
+ jakarta-commons-digester.jar,
+ jakarta-commons-digester-rss.jar,
+ jakarta-commons-el.jar,
+ jakarta-commons-fileupload.jar,
+ jakarta-commons-launcher.jar,
+ jakarta-commons-logging.jar,
+ jakarta-commons-modeler.jar,
+ jakarta-commons-pool.jar,
+ jasper-compiler.jar,
+ jasper-runtime.jar,
+ jspapi.jar,
+ mx4j.jar,
+ mx4j-impl.jar,
+ mx4j-jmx.jar,
+ naming-common.jar,
+ naming-factory.jar,
+ naming-java.jar,
+ naming-resources.jar,
+ regexp.jar,
+ servletapi5.jar,
+ servlets-common.jar,
+ servlets-default.jar,
+ servlets-invoker.jar,
+ tomcat-coyote.jar,
+ tomcat-http11.jar,
+ tomcat-util.jar
Index: src/org/eclipse/tomcat/internal/TomcatAppServer.java
===================================================================
RCS file: /home/eclipse/org.eclipse.tomcat/src/org/eclipse/tomcat/internal/TomcatAppServer.java,v
retrieving revision 1.42
diff -u -r1.42 TomcatAppServer.java
--- src/org/eclipse/tomcat/internal/TomcatAppServer.java 23 May 2005 03:58:30 -0000 1.42
+++ src/org/eclipse/tomcat/internal/TomcatAppServer.java 14 Jun 2005 15:48:41 -0000
@@ -30,8 +30,8 @@
import org.apache.catalina.logger.FileLogger;
import org.apache.catalina.realm.MemoryRealm;
import org.apache.catalina.startup.Embedded;
-import org.apache.coyote.tomcat4.CoyoteConnector;
-import org.apache.coyote.tomcat4.CoyoteServerSocketFactory;
+import org.apache.coyote.tomcat5.CoyoteConnector;
+import org.apache.coyote.tomcat5.CoyoteServerSocketFactory;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IExtension;
@@ -120,9 +120,6 @@
embedded.setRealm(realm);
}
- // start now, and then add all the contexts..
- embedded.start();
-
// Create a very basic container hierarchy
engine = embedded.createEngine();
@@ -136,18 +133,7 @@
.setErrorReportValveClass("org.eclipse.tomcat.internal.EclipseErrorReportValve"); //$NON-NLS-1$
}
engine.addChild(host);
-
- // Install the assembled container hierarchy
- PrintStream sysOut = System.out;
- // reassign standard output to prevent Tomcat from writing
- // its version message there.
- System.setOut(new PrintStream(new ByteArrayOutputStream()));
- try {
- embedded.addEngine(engine);
- } finally {
- System.setOut(sysOut);
- }
-
+
// Root context
Context root = embedded.createContext("", home + "/webapps/ROOT"); //$NON-NLS-1$ //$NON-NLS-2$
// this line should be replaced once tomcat provides support
@@ -156,12 +142,25 @@
((StandardContext) root)
.setWorkDir(getWorkingDirectory("ROOT")); //$NON-NLS-1$
}
+
root.setLoader(embedded.createLoader(this.getClass()
.getClassLoader()));
contexts.add(root);
host.addChild(root);
-
+
+ // Install the assembled container hierarchy
+ PrintStream sysOut = System.out;
+ // reassign standard output to prevent Tomcat from writing
+ // its version message there.
+ System.setOut(new PrintStream(new ByteArrayOutputStream()));
+ try {
+ embedded.addEngine(engine);
+ } finally {
+ System.setOut(sysOut);
+ }
+
InetAddress iAddress = null;
+
if (this.hostAddress != null) {
try {
iAddress = InetAddress.getByName(this.hostAddress);
@@ -169,6 +168,7 @@
// will default to all interfaces
}
}
+
updateSslPort(iAddress);
if (this.port == 0) {
this.port = SocketUtil.findUnusedLocalPort(iAddress); //$NON-NLS-1$
@@ -183,9 +183,17 @@
}
}
+ if (this.sslPort > 0) {
+ createSSLConnector(iAddress, this.sslPort);
+ }
+
+ // if null passed for hostAddress, use local host
+ if (this.hostAddress == null) {
+ this.hostAddress = "127.0.0.1"; //$NON-NLS-1$
+ }
+
// Create Connector
- Connector connector = embedded.createConnector(null, this.port,
- false);
+ Connector connector = embedded.createConnector((InetAddress) null, this.port, false);
// Override defaults on CoyoteConnector
if (connector instanceof CoyoteConnector) {
CoyoteConnector connectorImpl = (CoyoteConnector) connector;
@@ -215,8 +223,8 @@
connectorImpl.setRedirectPort(this.sslPort);
connectorImpl.setEnableLookups(true);
connectorImpl.setConnectionTimeout(20000);
- connectorImpl.setUseURIValidationHack(false);
connectorImpl.setDisableUploadTimeout(true);
+ connectorImpl.setUseBodyEncodingForURI(false);
}
// connectorImpl.setDebug(0);
// If there is problem in embedded.addConnector()
@@ -228,7 +236,7 @@
}
});
}
-
+
// add Connector to Tomcat
PrintStream sysErr = System.err;
// reassign standard error to prevent Coyote from writing
@@ -240,15 +248,9 @@
} finally {
System.setErr(sysErr);
}
-
- if (this.sslPort > 0) {
- createSSLConnector(iAddress, this.sslPort);
- }
-
- // if null passed for hostAddress, use local host
- if (this.hostAddress == null) {
- this.hostAddress = "127.0.0.1"; //$NON-NLS-1$
- }
+
+ // start now, and then add all the contexts..
+ embedded.start();
// running = true;
TomcatPlugin.getDefault().setAppserver(this);
@@ -308,7 +310,7 @@
private void createSSLConnector(InetAddress iAddress, int sslport)
throws CoreException {
// Create Connector
- this.sslConnector = embedded.createConnector(null, sslport, false);
+ this.sslConnector = embedded.createConnector((InetAddress) null, sslport, false);
// Override defaults on CoyoteConnector
if (this.sslConnector instanceof CoyoteConnector) {
CoyoteConnector connectorImpl = (CoyoteConnector) this.sslConnector;
@@ -331,7 +333,6 @@
if (minProcessors > 0) {
connectorImpl.setMinProcessors(minProcessors);
}
- connectorImpl.setUseURIValidationHack(false);
connectorImpl.setDisableUploadTimeout(true);
connectorImpl.setSecure(true);
String scheme = pref.getString(TomcatPlugin.PREF_SSL_SCHEME);
@@ -340,7 +341,7 @@
}
connectorImpl.setEnableLookups(true);
CoyoteServerSocketFactory factory = new CoyoteServerSocketFactory();
- factory.setClientAuth(false);
+ factory.setClientAuth("false"); //$NON-NLS-1$
String protocol = pref.getString(TomcatPlugin.PREF_SSL_PROTOCOL);
if ((protocol != null) && (!("".equals(protocol.trim())))) { //$NON-NLS-1$
factory.setProtocol(protocol);
eclipse-build-activeHelpSample.jar.patch:
build.xml | 50 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 49 insertions(+), 1 deletion(-)
Index: eclipse-build-activeHelpSample.jar.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-build-activeHelpSample.jar.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- eclipse-build-activeHelpSample.jar.patch 23 May 2005 17:01:40 -0000 1.3
+++ eclipse-build-activeHelpSample.jar.patch 20 Jun 2005 21:14:00 -0000 1.4
@@ -3,13 +3,12 @@
RCS file: /home/eclipse/org.eclipse.platform.doc.isv/build.xml,v
retrieving revision 1.27
diff -u -r1.27 build.xml
---- build.xml 6 May 2005 17:42:20 -0000 1.27
-+++ build.xml 18 May 2005 03:51:14 -0000
+--- build.xml.orig 2005-06-10 18:18:00.000000000 -0400
++++ build.xml 2005-06-16 11:25:32.000000000 -0400
@@ -1,6 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="org.eclipse.platform.doc.isv" default="build.jars" basedir=".">
--
-+
+
+ <property name="bootclasspath" value=""/>
+ <property name="basews" value="${ws}"/>
+ <property name="baseos" value="${os}"/>
@@ -26,10 +25,9 @@
<property name="plugin" value="org.eclipse.platform.doc.isv"/>
<property name="version.suffix" value="_3.1.0"/>
@@ -21,6 +33,39 @@
- <zip zipfile="${plugin.destination}/${full.name}.jar" basedir="${temp.folder}/${full.name}" filesonly="false"/>
<delete dir="${temp.folder}"/>
</target>
-+
+
+ <target name="activeHelpSample.jar" depends="init" unless="activeHelpSample.jar" description="Create jar: activeHelpSample.jar.">
+ <delete dir="${temp.folder}/activeHelpSample.jar.bin"/>
+ <mkdir dir="${temp.folder}/activeHelpSample.jar.bin"/>
@@ -62,19 +60,20 @@
+ <jar destfile="${build.result.folder}/activeHelpSample.jar" basedir="${temp.folder}/activeHelpSample.jar.bin"/>
+ <delete dir="${temp.folder}/activeHelpSample.jar.bin"/>
+ </target>
-
++
<target name="gather.bin.parts" depends="init" if="destination.temp.folder" >
- <antcall target="build.index"/>
-@@ -36,6 +81,8 @@
+ <ant antfile="buildDoc.xml" />
+ <mkdir dir="${destination.temp.folder}/${full.name}"/>
+@@ -30,6 +75,8 @@
</target>
- <target name="build.jars" depends="init" >
+ <target name="build.jars" depends="init">
+ <available property="activeHelpSample.jar" file="${build.result.folder}/activeHelpSample.jar"/>
+ <antcall target="activeHelpSample.jar"/>
</target>
-
- <target name="build.index" depends="init" description="Builds search index for the plug-in: org.eclipse.platform.doc.isv." if="eclipse.running">
-@@ -51,7 +98,8 @@
+
+ <target name="gather.sources" depends="init" if="destination.temp.folder">
+@@ -41,7 +88,8 @@
<target name="gather.logs" depends="init" if="destination.temp.folder">
</target>
eclipse-build.patch:
build.xml | 14 ++++++++++++++
1 files changed, 14 insertions(+)
Index: eclipse-build.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-build.patch 21 Feb 2005 00:31:37 -0000 1.1
+++ eclipse-build.patch 20 Jun 2005 21:14:00 -0000 1.2
@@ -1,9 +1,14 @@
---- build.xml.orig 2005-02-19 11:43:10.000000000 -0500
-+++ build.xml 2005-02-19 11:44:30.000000000 -0500
-@@ -91,6 +91,15 @@
- <arg line="build.sh"/>
+--- build.xml.orig 2005-06-07 16:53:26.000000000 -0400
++++ build.xml 2005-06-16 16:07:11.000000000 -0400
+@@ -72,6 +72,20 @@
+ <arg line="build.sh" />
</exec>
- <move file="${launcherlibs}/library/${installWs}/eclipse" todir="${launcherlibs}/"/>
+ <move file="${launcherlibs}/library/${installWs}/eclipse" todir="${launcherlibs}/" />
++
++ <delete dir="${launcherlibs}/library"/>
++
++ <!-- Copy icon for un-supported platforms -->
++ <copy file="features/org.eclipse.platform.launchers/bin/gtk/linux/x86/icon.xpm" todir="${launcherlibs}/"/>
+
+ <!-- Build JNI libs -->
+ <!-- libcore -->
@@ -14,5 +19,3 @@
+ <ant dir="plugins/org.eclipse.update.core.linux/src" antfile="build.xml" />
+
</target>
-
-
eclipse-updatehomedir.patch:
ModeSelectionPage.java | 10 +++++
TargetPage.java | 83 +++++++++++++++++++++++++++++++++++++------------
2 files changed, 72 insertions(+), 21 deletions(-)
Index: eclipse-updatehomedir.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-updatehomedir.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- eclipse-updatehomedir.patch 23 May 2005 17:01:40 -0000 1.3
+++ eclipse-updatehomedir.patch 20 Jun 2005 21:14:00 -0000 1.4
@@ -1,41 +1,15 @@
-Index: src/org/eclipse/update/internal/ui/wizards/ModeSelectionPage.java
-===================================================================
-RCS file: /home/eclipse/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/ModeSelectionPage.java,v
-retrieving revision 1.18
-diff -u -r1.18 ModeSelectionPage.java
---- src/org/eclipse/update/internal/ui/wizards/ModeSelectionPage.java 11 Apr 2005 22:45:30 -0000 1.18
-+++ src/org/eclipse/update/internal/ui/wizards/ModeSelectionPage.java 18 May 2005 01:18:01 -0000
-@@ -10,17 +10,23 @@
+diff -uNr src/org/eclipse/update/internal/ui/wizards/ModeSelectionPage.java src.orig/org/eclipse/update/internal/ui/wizards/ModeSelectionPage.java
+--- src/org/eclipse/update/internal/ui/wizards/ModeSelectionPage.java 2005-06-10 18:27:12.000000000 -0400
++++ src.orig/org/eclipse/update/internal/ui/wizards/ModeSelectionPage.java 2005-06-16 12:08:30.000000000 -0400
+@@ -10,6 +10,7 @@
*******************************************************************************/
package org.eclipse.update.internal.ui.wizards;
--import org.eclipse.jface.dialogs.*;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.jface.dialogs.Dialog;
-+import org.eclipse.jface.dialogs.IDialogSettings;
+ import org.eclipse.jface.dialogs.IDialogSettings;
import org.eclipse.swt.SWT;
--import org.eclipse.swt.events.*;
--import org.eclipse.swt.layout.*;
--import org.eclipse.swt.widgets.*;
--import org.eclipse.ui.*;
-+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;
-+import org.eclipse.swt.widgets.Composite;
-+import org.eclipse.swt.widgets.Control;
-+import org.eclipse.swt.widgets.Label;
-+import org.eclipse.ui.PlatformUI;
- import org.eclipse.update.internal.operations.UpdateUtils;
- import org.eclipse.update.internal.ui.UpdateUI;
- import org.eclipse.update.internal.ui.UpdateUIMessages;
--import org.eclipse.update.search.*;
-+import org.eclipse.update.search.UpdateSearchRequest;
-
- /**
- */
-@@ -65,10 +71,17 @@
+@@ -70,10 +71,17 @@
GridLayout layout = new GridLayout();
composite.setLayout(layout);
updatesButton = new Button(composite, SWT.RADIO);
@@ -54,33 +28,36 @@
final Label updatesText = new Label(composite, SWT.WRAP);
updatesText.setText(UpdateUIMessages.ModeSelectionPage_updatesText);
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-Index: src/org/eclipse/update/internal/ui/wizards/TargetPage.java
-===================================================================
-RCS file: /home/eclipse/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/TargetPage.java,v
-retrieving revision 1.71
-diff -u -r1.71 TargetPage.java
---- src/org/eclipse/update/internal/ui/wizards/TargetPage.java 28 Apr 2005 18:22:31 -0000 1.71
-+++ src/org/eclipse/update/internal/ui/wizards/TargetPage.java 18 May 2005 01:18:01 -0000
-@@ -1,420 +1,463 @@
--/*******************************************************************************
-- * Copyright (c) 2000, 2005 IBM Corporation and others.
-- * All rights reserved. This program and the accompanying materials
-- * are made available under the terms of the Eclipse Public License v1.0
-- * which accompanies this distribution, and is available at
-- * http://www.eclipse.org/legal/epl-v10.html
-- *
-- * Contributors:
-- * IBM Corporation - initial API and implementation
-- *******************************************************************************/
--package org.eclipse.update.internal.ui.wizards;
--
+diff -uNr src/org/eclipse/update/internal/ui/wizards/TargetPage.java src.orig/org/eclipse/update/internal/ui/wizards/TargetPage.java
+--- src/org/eclipse/update/internal/ui/wizards/TargetPage.java 2005-06-10 18:29:01.000000000 -0400
++++ src.orig/org/eclipse/update/internal/ui/wizards/TargetPage.java 2005-06-16 12:09:05.000000000 -0400
+@@ -10,25 +10,48 @@
+ *******************************************************************************/
+ package org.eclipse.update.internal.ui.wizards;
+
-import java.io.*;
-import java.util.*;
-
--import org.eclipse.jface.dialogs.Dialog;
++import java.io.File;
++import java.util.HashSet;
++import java.util.Iterator;
++
++import org.eclipse.core.runtime.CoreException;
++import org.eclipse.core.runtime.IStatus;
++import org.eclipse.core.runtime.Platform;
+ import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.resource.*;
-import org.eclipse.jface.viewers.*;
--import org.eclipse.osgi.util.NLS;
++import org.eclipse.jface.resource.ImageDescriptor;
++import org.eclipse.jface.viewers.ISelectionChangedListener;
++import org.eclipse.jface.viewers.IStructuredContentProvider;
++import org.eclipse.jface.viewers.IStructuredSelection;
++import org.eclipse.jface.viewers.ITableLabelProvider;
++import org.eclipse.jface.viewers.LabelProvider;
++import org.eclipse.jface.viewers.SelectionChangedEvent;
++import org.eclipse.jface.viewers.StructuredSelection;
++import org.eclipse.jface.viewers.TableViewer;
+ import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.*;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.graphics.*;
@@ -93,855 +70,78 @@
-import org.eclipse.update.internal.ui.*;
-import org.eclipse.update.internal.ui.parts.*;
-import org.eclipse.update.operations.*;
--
--public class TargetPage extends BannerPage implements IDynamicPage {
-- private TableViewer jobViewer;
-- private IInstallConfiguration config;
-- private ConfigListener configListener;
-- private Label requiredSpaceLabel;
-- private Label availableSpaceLabel;
-- private IInstallFeatureOperation[] jobs;
-- //private IInstallFeatureOperation currentJob;
-- private Label installLocation;
-- private Button changeLocation;
-- static HashSet added;
--
-- class JobsContentProvider
-- extends DefaultContentProvider
-- implements IStructuredContentProvider {
-- public Object[] getElements(Object parent) {
-- return jobs;
-- }
-- }
--
-- class JobsLabelProvider
-- extends LabelProvider
-- implements ITableLabelProvider {
--
-- public Image getColumnImage(Object obj, int col) {
-- UpdateLabelProvider provider = UpdateUI.getDefault().getLabelProvider();
--
-- IInstallFeatureOperation job = (IInstallFeatureOperation) obj;
-- ImageDescriptor base =
-- job.getFeature().isPatch()
-- ? UpdateUIImages.DESC_EFIX_OBJ
-- : UpdateUIImages.DESC_FEATURE_OBJ;
-- int flags = 0;
-- if (job.getTargetSite() == null)
-- flags = UpdateLabelProvider.F_ERROR;
-- return provider.get(base, flags);
-- }
--
-- public String getColumnText(Object obj, int col) {
-- if (col == 0) {
-- IFeature feature = ((IInstallFeatureOperation) obj).getFeature();
-- return feature.getLabel()
-- + " " //$NON-NLS-1$
-- + feature.getVersionedIdentifier().getVersion().toString();
-- }
-- return null;
-- }
-- }
--
-- class ConfigListener implements IInstallConfigurationChangedListener {
-- public void installSiteAdded(IConfiguredSite csite) {
--
-- // set the site as target for all jobs without a target
-- for (int i=0; jobs != null && i<jobs.length; i++)
-- if (jobs[i].getTargetSite() == null && getSiteVisibility(csite, jobs[i])) {
-- jobs[i].setTargetSite(csite);
-- }
--
-- jobViewer.refresh();
-- }
--
-- public void installSiteRemoved(IConfiguredSite csite) {
-- // remove the target site for all jobs that use it
-- // set the site as target for all jobs without a target
-- boolean refreshJobs = false;
-- for (int i=0; jobs != null && i<jobs.length; i++)
-- if (jobs[i].getTargetSite() == csite) {
-- jobs[i].setTargetSite(null);
-- refreshJobs = true;
-- }
--
-- pageChanged();
--
-- jobViewer.refresh();
-- if (refreshJobs) {
-- jobViewer.getControl().setFocus();
-- }
-- }
-- }
--
-- /**
-- * Constructor for ReviewPage2
-- */
-- public TargetPage(IInstallConfiguration config) {
-- super("Target"); //$NON-NLS-1$
-- setTitle(UpdateUIMessages.InstallWizard_TargetPage_title);
-- setDescription(UpdateUIMessages.InstallWizard_TargetPage_desc);
-- this.config = config;
-- UpdateUI.getDefault().getLabelProvider().connect(this);
-- configListener = new ConfigListener();
-- }
--
-- public void setJobs(IInstallFeatureOperation[] jobs) {
-- this.jobs = jobs;
-- }
--
-- public void dispose() {
-- UpdateUI.getDefault().getLabelProvider().disconnect(this);
--// config.removeInstallConfigurationChangedListener(configListener);
-- super.dispose();
-- }
--
-- public Control createContents(Composite parent) {
-- Composite client = new Composite(parent, SWT.NULL);
-- GridLayout layout = new GridLayout();
-- layout.numColumns = 3;
-- layout.marginWidth = layout.marginHeight = 0;
-- client.setLayout(layout);
-- client.setLayoutData(new GridData(GridData.FILL_BOTH));
--
-- Label label = new Label(client, SWT.NULL);
-- label.setText(UpdateUIMessages.InstallWizard_TargetPage_jobsLabel);
-- createJobViewer(client);
--
-- label = new Label(client, SWT.NULL);
-- label.setText(UpdateUIMessages.InstallWizard_TargetPage_location);
-- GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
-- label.setLayoutData(gd);
--
-- installLocation = new Label(client, SWT.NULL);
-- installLocation.setText("foo");
-- gd = new GridData(GridData.FILL_HORIZONTAL);
-- installLocation.setLayoutData(gd);
--
-- changeLocation = new Button(client, SWT.PUSH);
-- changeLocation.setText(UpdateUIMessages.InstallWizard_TargetPage_location_change);
-- changeLocation.addSelectionListener(new SelectionAdapter() {
-- public void widgetSelected(SelectionEvent e) {
-- IStructuredSelection selection = (IStructuredSelection) jobViewer.getSelection();
-- if (selection == null)
-- return;
-- IInstallFeatureOperation job = (IInstallFeatureOperation) selection.getFirstElement();
-- if (job == null)
-- return;
--
-- TargetSiteDialog dialog = new TargetSiteDialog(getShell(), config, job, configListener);
-- dialog.create();
--
-- SWTUtil.setDialogSize(dialog, 400, 300);
--
-- dialog.getShell().setText(UpdateUIMessages.SitePage_new);
-- dialog.open();
-- setTargetLocation(job);
-- pageChanged();
-- jobViewer.refresh();
-- updateStatus(job.getTargetSite());
-- }
-- });
--
-- Composite status = new Composite(client, SWT.NULL);
-- gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-- gd.horizontalSpan = 3;
-- status.setLayoutData(gd);
-- layout = new GridLayout();
-- layout.numColumns = 2;
-- status.setLayout(layout);
-- label = new Label(status, SWT.NULL);
-- label.setText(UpdateUIMessages.InstallWizard_TargetPage_requiredSpace);
-- requiredSpaceLabel = new Label(status, SWT.NULL);
-- requiredSpaceLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-- label = new Label(status, SWT.NULL);
-- label.setText(UpdateUIMessages.InstallWizard_TargetPage_availableSpace);
-- availableSpaceLabel = new Label(status, SWT.NULL);
-- availableSpaceLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
--
-- PlatformUI.getWorkbench().getHelpSystem().setHelp(client, "org.eclipse.update.ui.MultiTargetPage2"); //$NON-NLS-1$
--
-- Dialog.applyDialogFont(parent);
--
-- return client;
-- }
--
-- private void createJobViewer(Composite parent) {
-- jobViewer = new TableViewer(parent, SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
-- GridData gd = new GridData(GridData.FILL_BOTH);
-- gd.horizontalSpan = 3;
-- gd.widthHint = 150;
-- jobViewer.getTable().setLayoutData(gd);
-- jobViewer.setContentProvider(new JobsContentProvider());
-- jobViewer.setLabelProvider(new JobsLabelProvider());
--
-- jobViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-- public void selectionChanged(SelectionChangedEvent event) {
-- IStructuredSelection selection = (IStructuredSelection) event.getSelection();
-- IInstallFeatureOperation job = (IInstallFeatureOperation) selection.getFirstElement();
-- setTargetLocation(job);
-- }
-- });
-- }
--
-- public void setVisible(boolean visible) {
-- if (visible) {
-- initializeDefaultTargetSites();
-- jobViewer.setInput(jobs);
-- if (jobViewer.getSelection().isEmpty() && jobs.length > 0)
-- jobViewer.setSelection(new StructuredSelection(jobs[0]));
-- }
--
-- super.setVisible(visible);
-- }
--
-- private void verifyNotEmpty(boolean empty) {
-- String errorMessage = null;
-- if (empty)
-- errorMessage = UpdateUIMessages.InstallWizard_TargetPage_location_empty;
-- setErrorMessage(errorMessage);
-- setPageComplete(!empty);
-- }
--
--
-- private void updateStatus(Object element) {
-- if (element == null) {
-- requiredSpaceLabel.setText(""); //$NON-NLS-1$
-- availableSpaceLabel.setText(""); //$NON-NLS-1$
-- return;
-- }
-- IConfiguredSite site = (IConfiguredSite) element;
-- File file = new File(site.getSite().getURL().getFile());
-- long available = LocalSystemInfo.getFreeSpace(file);
-- long required = computeRequiredSizeFor(site);
-- if (required <= 0)
-- requiredSpaceLabel.setText(UpdateUIMessages.InstallWizard_TargetPage_unknownSize);
-- else
-- requiredSpaceLabel.setText(
-- NLS.bind(UpdateUIMessages.InstallWizard_TargetPage_size, "" + required)); //$NON-NLS-1$
--
-- if (available == LocalSystemInfo.SIZE_UNKNOWN)
-- availableSpaceLabel.setText(UpdateUIMessages.InstallWizard_TargetPage_unknownSize);
-- else
-- availableSpaceLabel.setText(
-- NLS.bind(UpdateUIMessages.InstallWizard_TargetPage_size, "" + available)); //$NON-NLS-1$
-- }
--
-- private long computeRequiredSizeFor(IConfiguredSite site) {
-- long totalSize = 0;
-- for (int i = 0; i < jobs.length; i++) {
-- if (site.equals(jobs[i].getTargetSite())) {
-- long jobSize = site.getSite().getInstallSizeFor(jobs[i].getFeature());
-- if (jobSize == -1)
-- return -1;
-- totalSize += jobSize;
-- }
-- }
-- return totalSize;
-- }
--
-- private void pageChanged() {
-- boolean empty = false;
-- for (int i=0; jobs!=null && i<jobs.length; i++) {
-- if (jobs[i].getTargetSite() == null) {
-- empty = true;
-- break;
-- }
--
-- IFeature feature = jobs[i].getFeature();
-- if (feature.isPatch()) {
-- // Patches must go together with the features
-- // they are patching.
--
-- // Check current jobs
-- IInstallFeatureOperation patchedFeatureJob = findPatchedFeature(feature);
-- if (patchedFeatureJob != null
-- && patchedFeatureJob.getTargetSite() != null
-- && !jobs[i].getTargetSite().equals(patchedFeatureJob.getTargetSite())) {
-- String msg = NLS.bind(UpdateUIMessages.InstallWizard_TargetPage_patchError, (new String[] {
-- feature.getLabel(),
-- patchedFeatureJob.getFeature().getLabel()}));
-- setErrorMessage(msg);
-- setPageComplete(false);
-- return;
-- }
-- // Check installed features
-- IFeature patchedFeature = UpdateUtils.getPatchedFeature(feature);
-- if (patchedFeature != null
-- && !jobs[i].getTargetSite().equals(patchedFeature.getSite().getCurrentConfiguredSite())) {
-- String msg = NLS.bind(UpdateUIMessages.InstallWizard_TargetPage_patchError2, (new String[] {
-- feature.getLabel(),
-- patchedFeature.getLabel(),
-- patchedFeature.getSite().getCurrentConfiguredSite().getSite().getURL().getFile()}));
-- setErrorMessage(msg);
-- setPageComplete(false);
-- return;
-- }
-- }
-- }
-- verifyNotEmpty(empty);
-- }
--
--
-- private boolean getSiteVisibility(IConfiguredSite site, IInstallFeatureOperation job) {
-- // Do not allow installing into a non-updateable site
-- if (!site.isUpdatable())
-- return false;
--
-- // If affinity site is known, only it should be shown
-- IConfiguredSite affinitySite = UpdateUtils.getAffinitySite(config, job.getFeature());
-- if (affinitySite != null) {
-- // Must compare referenced sites because
-- // configured sites themselves may come from
-- // different configurations
-- return site.getSite().equals(affinitySite.getSite());
-- }
--
-- // Co-locate updates with the old feature
-- if (job.getOldFeature() != null) {
-- IConfiguredSite oldSite = UpdateUtils.getSiteWithFeature(config, job.getOldFeature().getVersionedIdentifier().getIdentifier());
-- return (site == oldSite);
-- }
--
-- // Allow installing into any site that is updateable and there is no affinity specified
-- return true;
-- }
--
-- private void initializeDefaultTargetSites() {
-- for (int i = 0; i < jobs.length; i++) {
-- if (jobs[i].getTargetSite() != null)
-- continue;
--
-- IConfiguredSite affinitySite = UpdateUtils.getAffinitySite(config, jobs[i].getFeature());
-- if (affinitySite != null) {
-- jobs[i].setTargetSite(affinitySite);
-- continue;
-- }
--
-- IConfiguredSite defaultSite = UpdateUtils.getDefaultTargetSite(config, jobs[i], false);
-- if (defaultSite != null) {
-- jobs[i].setTargetSite(defaultSite);
-- continue;
-- }
--
++import org.eclipse.swt.SWT;
++import org.eclipse.swt.events.SelectionAdapter;
++import org.eclipse.swt.events.SelectionEvent;
++import org.eclipse.swt.graphics.Image;
++import org.eclipse.swt.layout.GridData;
++import org.eclipse.swt.layout.GridLayout;
++import org.eclipse.swt.widgets.Button;
++import org.eclipse.swt.widgets.Composite;
++import org.eclipse.swt.widgets.Control;
++import org.eclipse.swt.widgets.Label;
++import org.eclipse.ui.PlatformUI;
++import org.eclipse.update.configuration.IConfiguredSite;
++import org.eclipse.update.configuration.IInstallConfiguration;
++import org.eclipse.update.configuration.IInstallConfigurationChangedListener;
++import org.eclipse.update.configuration.LocalSystemInfo;
++import org.eclipse.update.core.IFeature;
++import org.eclipse.update.internal.operations.UpdateUtils;
++import org.eclipse.update.internal.ui.UpdateLabelProvider;
++import org.eclipse.update.internal.ui.UpdateUI;
++import org.eclipse.update.internal.ui.UpdateUIImages;
++import org.eclipse.update.internal.ui.UpdateUIMessages;
++import org.eclipse.update.internal.ui.parts.DefaultContentProvider;
++import org.eclipse.update.internal.ui.parts.SWTUtil;
++import org.eclipse.update.operations.IInstallFeatureOperation;
+
+ public class TargetPage extends BannerPage implements IDynamicPage {
+ private TableViewer jobViewer;
+@@ -150,7 +173,7 @@
+ label.setLayoutData(gd);
+
+ installLocation = new Label(client, SWT.NULL);
+- installLocation.setText("foo"); //$NON-NLS-1$
++ installLocation.setText("");
+ gd = new GridData(GridData.FILL_HORIZONTAL);
+ installLocation.setLayoutData(gd);
+
+@@ -359,8 +382,28 @@
+ jobs[i].setTargetSite(defaultSite);
+ continue;
+ }
++
++ IConfiguredSite csite = getFirstTargetSite(jobs[i]);
++ if (csite == null && Platform.getInstallLocation().isReadOnly()) {
++ // there are no updateable sites and the installation location is read only
++ // make an update site in the user's home direcotry
++ String sitePath = System.getProperty("user.home") + File.separator + ".eclipse" + File.separator +
++ Platform.getProduct().getId() + File.separator + "updates"; //$NON-NLS-1$ //$NON-NLS-2$
++
++ try {
++ csite = config.createConfiguredSite(new File(sitePath));
++ config.addConfiguredSite(csite);
++ IStatus status = csite.verifyUpdatableStatus();
++ if (!status.isOK())
++ throw new CoreException(status);
++
++ } catch (CoreException e) {
++ // there was a problem, the user must choose an installation site
++ csite = null;
++ }
++ }
+
- jobs[i].setTargetSite(getFirstTargetSite(jobs[i]));
--
-- }
-- }
--
--
-- private IConfiguredSite getFirstTargetSite(IInstallFeatureOperation job) {
-- IConfiguredSite[] sites = config.getConfiguredSites();
-- for (int i = 0; i < sites.length; i++) {
-- IConfiguredSite csite = sites[i];
++ jobs[i].setTargetSite(csite);
+
+ }
+ }
+@@ -370,7 +413,7 @@
+ IConfiguredSite[] sites = config.getConfiguredSites();
+ for (int i = 0; i < sites.length; i++) {
+ IConfiguredSite csite = sites[i];
- if (getSiteVisibility(csite, job))
-- return csite;
-- }
-- return null;
-- }
--
-- public IInstallFeatureOperation findPatchedFeature(IFeature patch) {
-- for (int i=0; i<jobs.length; i++) {
-- IFeature target = jobs[i].getFeature();
-- if (!target.equals(patch) && UpdateUtils.isPatch(target, patch))
-- return jobs[i];
-- }
-- return null;
-- }
--
--
-- void removeAddedSites() {
-- if (added != null) {
-- while (!added.isEmpty()) {
-- Iterator it = added.iterator();
-- if (it.hasNext())
-- config.removeConfiguredSite((IConfiguredSite) it.next());
-- }
-- }
-- }
--
-- /* (non-Javadoc)
-- * @see org.eclipse.jface.wizard.IWizardPage#isPageComplete()
-- */
-- public boolean isPageComplete() {
-- // check if all jobs have a target site set
-- for (int i = 0; jobs != null && i < jobs.length; i++) {
-- if (jobs[i].getTargetSite() == null)
-- return false;
-- }
-- return super.isPageComplete();
-- }
--
-- /**
-- * @param job
-- */
-- private void setTargetLocation(IInstallFeatureOperation job) {
-- if (job != null && job.getTargetSite() != null) {
-- installLocation.setText(new File(job.getTargetSite().getSite().getURL().getFile()).toString());
-- updateStatus(job.getTargetSite());
-- }
-- }
--}
-+/*******************************************************************************
-+ * Copyright (c) 2000, 2005 IBM Corporation and others.
-+ * All rights reserved. This program and the accompanying materials
-+ * are made available under the terms of the Eclipse Public License v1.0
-+ * which accompanies this distribution, and is available at
-+ * http://www.eclipse.org/legal/epl-v10.html
-+ *
-+ * Contributors:
-+ * IBM Corporation - initial API and implementation
-+ *******************************************************************************/
-+package org.eclipse.update.internal.ui.wizards;
-+
-+import java.io.File;
-+import java.util.HashSet;
-+import java.util.Iterator;
-+
-+import org.eclipse.core.runtime.CoreException;
-+import org.eclipse.core.runtime.IStatus;
-+import org.eclipse.core.runtime.Platform;
-+import org.eclipse.jface.dialogs.Dialog;
-+import org.eclipse.jface.resource.ImageDescriptor;
-+import org.eclipse.jface.viewers.ISelectionChangedListener;
-+import org.eclipse.jface.viewers.IStructuredContentProvider;
-+import org.eclipse.jface.viewers.IStructuredSelection;
-+import org.eclipse.jface.viewers.ITableLabelProvider;
-+import org.eclipse.jface.viewers.LabelProvider;
-+import org.eclipse.jface.viewers.SelectionChangedEvent;
-+import org.eclipse.jface.viewers.StructuredSelection;
-+import org.eclipse.jface.viewers.TableViewer;
-+import org.eclipse.osgi.util.NLS;
-+import org.eclipse.swt.SWT;
-+import org.eclipse.swt.events.SelectionAdapter;
-+import org.eclipse.swt.events.SelectionEvent;
-+import org.eclipse.swt.graphics.Image;
-+import org.eclipse.swt.layout.GridData;
-+import org.eclipse.swt.layout.GridLayout;
-+import org.eclipse.swt.widgets.Button;
-+import org.eclipse.swt.widgets.Composite;
-+import org.eclipse.swt.widgets.Control;
-+import org.eclipse.swt.widgets.Label;
-+import org.eclipse.ui.PlatformUI;
-+import org.eclipse.update.configuration.IConfiguredSite;
-+import org.eclipse.update.configuration.IInstallConfiguration;
-+import org.eclipse.update.configuration.IInstallConfigurationChangedListener;
-+import org.eclipse.update.configuration.LocalSystemInfo;
-+import org.eclipse.update.core.IFeature;
-+import org.eclipse.update.internal.operations.UpdateUtils;
-+import org.eclipse.update.internal.ui.UpdateLabelProvider;
-+import org.eclipse.update.internal.ui.UpdateUI;
-+import org.eclipse.update.internal.ui.UpdateUIImages;
-+import org.eclipse.update.internal.ui.UpdateUIMessages;
-+import org.eclipse.update.internal.ui.parts.DefaultContentProvider;
-+import org.eclipse.update.internal.ui.parts.SWTUtil;
-+import org.eclipse.update.operations.IInstallFeatureOperation;
-+
-+public class TargetPage extends BannerPage implements IDynamicPage {
-+ private TableViewer jobViewer;
-+ private IInstallConfiguration config;
-+ private ConfigListener configListener;
-+ private Label requiredSpaceLabel;
-+ private Label availableSpaceLabel;
-+ private IInstallFeatureOperation[] jobs;
-+ //private IInstallFeatureOperation currentJob;
-+ private Label installLocation;
-+ private Button changeLocation;
-+ static HashSet added;
-+
-+ class JobsContentProvider
-+ extends DefaultContentProvider
-+ implements IStructuredContentProvider {
-+ public Object[] getElements(Object parent) {
-+ return jobs;
-+ }
-+ }
-+
-+ class JobsLabelProvider
-+ extends LabelProvider
-+ implements ITableLabelProvider {
-+
-+ public Image getColumnImage(Object obj, int col) {
-+ UpdateLabelProvider provider = UpdateUI.getDefault().getLabelProvider();
-+
-+ IInstallFeatureOperation job = (IInstallFeatureOperation) obj;
-+ ImageDescriptor base =
-+ job.getFeature().isPatch()
-+ ? UpdateUIImages.DESC_EFIX_OBJ
-+ : UpdateUIImages.DESC_FEATURE_OBJ;
-+ int flags = 0;
-+ if (job.getTargetSite() == null)
-+ flags = UpdateLabelProvider.F_ERROR;
-+ return provider.get(base, flags);
-+ }
-+
-+ public String getColumnText(Object obj, int col) {
-+ if (col == 0) {
-+ IFeature feature = ((IInstallFeatureOperation) obj).getFeature();
-+ return feature.getLabel()
-+ + " " //$NON-NLS-1$
-+ + feature.getVersionedIdentifier().getVersion().toString();
-+ }
-+ return null;
-+ }
-+ }
-+
-+ class ConfigListener implements IInstallConfigurationChangedListener {
-+ public void installSiteAdded(IConfiguredSite csite) {
-+
-+ // set the site as target for all jobs without a target
-+ for (int i=0; jobs != null && i<jobs.length; i++)
-+ if (jobs[i].getTargetSite() == null && getSiteVisibility(csite, jobs[i])) {
-+ jobs[i].setTargetSite(csite);
-+ }
-+
-+ jobViewer.refresh();
-+ }
-+
-+ public void installSiteRemoved(IConfiguredSite csite) {
-+ // remove the target site for all jobs that use it
-+ // set the site as target for all jobs without a target
-+ boolean refreshJobs = false;
-+ for (int i=0; jobs != null && i<jobs.length; i++)
-+ if (jobs[i].getTargetSite() == csite) {
-+ jobs[i].setTargetSite(null);
-+ refreshJobs = true;
-+ }
-+
-+ pageChanged();
-+
-+ jobViewer.refresh();
-+ if (refreshJobs) {
-+ jobViewer.getControl().setFocus();
-+ }
-+ }
-+ }
-+
-+ /**
-+ * Constructor for ReviewPage2
-+ */
-+ public TargetPage(IInstallConfiguration config) {
-+ super("Target"); //$NON-NLS-1$
-+ setTitle(UpdateUIMessages.InstallWizard_TargetPage_title);
-+ setDescription(UpdateUIMessages.InstallWizard_TargetPage_desc);
-+ this.config = config;
-+ UpdateUI.getDefault().getLabelProvider().connect(this);
-+ configListener = new ConfigListener();
-+ }
-+
-+ public void setJobs(IInstallFeatureOperation[] jobs) {
-+ this.jobs = jobs;
-+ }
-+
-+ public void dispose() {
-+ UpdateUI.getDefault().getLabelProvider().disconnect(this);
-+// config.removeInstallConfigurationChangedListener(configListener);
-+ super.dispose();
-+ }
-+
-+ public Control createContents(Composite parent) {
-+ Composite client = new Composite(parent, SWT.NULL);
-+ GridLayout layout = new GridLayout();
-+ layout.numColumns = 3;
-+ layout.marginWidth = layout.marginHeight = 0;
-+ client.setLayout(layout);
-+ client.setLayoutData(new GridData(GridData.FILL_BOTH));
-+
-+ Label label = new Label(client, SWT.NULL);
-+ label.setText(UpdateUIMessages.InstallWizard_TargetPage_jobsLabel);
-+ createJobViewer(client);
-+
-+ label = new Label(client, SWT.NULL);
-+ label.setText(UpdateUIMessages.InstallWizard_TargetPage_location);
-+ GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
-+ label.setLayoutData(gd);
-+
-+ installLocation = new Label(client, SWT.NULL);
-+ installLocation.setText("");
-+ gd = new GridData(GridData.FILL_HORIZONTAL);
-+ installLocation.setLayoutData(gd);
-+
-+ changeLocation = new Button(client, SWT.PUSH);
-+ changeLocation.setText(UpdateUIMessages.InstallWizard_TargetPage_location_change);
-+ changeLocation.addSelectionListener(new SelectionAdapter() {
-+ public void widgetSelected(SelectionEvent e) {
-+ IStructuredSelection selection = (IStructuredSelection) jobViewer.getSelection();
-+ if (selection == null)
-+ return;
-+ IInstallFeatureOperation job = (IInstallFeatureOperation) selection.getFirstElement();
-+ if (job == null)
-+ return;
-+
-+ TargetSiteDialog dialog = new TargetSiteDialog(getShell(), config, job, configListener);
-+ dialog.create();
-+
-+ SWTUtil.setDialogSize(dialog, 400, 300);
-+
-+ dialog.getShell().setText(UpdateUIMessages.SitePage_new);
-+ dialog.open();
-+ setTargetLocation(job);
-+ pageChanged();
-+ jobViewer.refresh();
-+ updateStatus(job.getTargetSite());
-+ }
-+ });
-+
-+ Composite status = new Composite(client, SWT.NULL);
-+ gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-+ gd.horizontalSpan = 3;
-+ status.setLayoutData(gd);
-+ layout = new GridLayout();
-+ layout.numColumns = 2;
-+ status.setLayout(layout);
-+ label = new Label(status, SWT.NULL);
-+ label.setText(UpdateUIMessages.InstallWizard_TargetPage_requiredSpace);
-+ requiredSpaceLabel = new Label(status, SWT.NULL);
-+ requiredSpaceLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-+ label = new Label(status, SWT.NULL);
-+ label.setText(UpdateUIMessages.InstallWizard_TargetPage_availableSpace);
-+ availableSpaceLabel = new Label(status, SWT.NULL);
-+ availableSpaceLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-+
-+ PlatformUI.getWorkbench().getHelpSystem().setHelp(client, "org.eclipse.update.ui.MultiTargetPage2"); //$NON-NLS-1$
-+
-+ Dialog.applyDialogFont(parent);
-+
-+ return client;
-+ }
-+
-+ private void createJobViewer(Composite parent) {
-+ jobViewer = new TableViewer(parent, SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
-+ GridData gd = new GridData(GridData.FILL_BOTH);
-+ gd.horizontalSpan = 3;
-+ gd.widthHint = 150;
-+ jobViewer.getTable().setLayoutData(gd);
-+ jobViewer.setContentProvider(new JobsContentProvider());
-+ jobViewer.setLabelProvider(new JobsLabelProvider());
-+
-+ jobViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-+ public void selectionChanged(SelectionChangedEvent event) {
-+ IStructuredSelection selection = (IStructuredSelection) event.getSelection();
-+ IInstallFeatureOperation job = (IInstallFeatureOperation) selection.getFirstElement();
-+ setTargetLocation(job);
-+ }
-+ });
-+ }
-+
-+ public void setVisible(boolean visible) {
-+ if (visible) {
-+ initializeDefaultTargetSites();
-+ jobViewer.setInput(jobs);
-+ if (jobViewer.getSelection().isEmpty() && jobs.length > 0)
-+ jobViewer.setSelection(new StructuredSelection(jobs[0]));
-+ }
-+
-+ super.setVisible(visible);
-+ }
-+
-+ private void verifyNotEmpty(boolean empty) {
-+ String errorMessage = null;
-+ if (empty)
-+ errorMessage = UpdateUIMessages.InstallWizard_TargetPage_location_empty;
-+ setErrorMessage(errorMessage);
-+ setPageComplete(!empty);
-+ }
-+
-+
-+ private void updateStatus(Object element) {
-+ if (element == null) {
-+ requiredSpaceLabel.setText(""); //$NON-NLS-1$
-+ availableSpaceLabel.setText(""); //$NON-NLS-1$
-+ return;
-+ }
-+ IConfiguredSite site = (IConfiguredSite) element;
-+ File file = new File(site.getSite().getURL().getFile());
-+ long available = LocalSystemInfo.getFreeSpace(file);
-+ long required = computeRequiredSizeFor(site);
-+ if (required <= 0)
-+ requiredSpaceLabel.setText(UpdateUIMessages.InstallWizard_TargetPage_unknownSize);
-+ else
-+ requiredSpaceLabel.setText(
-+ NLS.bind(UpdateUIMessages.InstallWizard_TargetPage_size, "" + required)); //$NON-NLS-1$
-+
-+ if (available == LocalSystemInfo.SIZE_UNKNOWN)
-+ availableSpaceLabel.setText(UpdateUIMessages.InstallWizard_TargetPage_unknownSize);
-+ else
-+ availableSpaceLabel.setText(
-+ NLS.bind(UpdateUIMessages.InstallWizard_TargetPage_size, "" + available)); //$NON-NLS-1$
-+ }
-+
-+ private long computeRequiredSizeFor(IConfiguredSite site) {
-+ long totalSize = 0;
-+ for (int i = 0; i < jobs.length; i++) {
-+ if (site.equals(jobs[i].getTargetSite())) {
-+ long jobSize = site.getSite().getInstallSizeFor(jobs[i].getFeature());
-+ if (jobSize == -1)
-+ return -1;
-+ totalSize += jobSize;
-+ }
-+ }
-+ return totalSize;
-+ }
-+
-+ private void pageChanged() {
-+ boolean empty = false;
-+ for (int i=0; jobs!=null && i<jobs.length; i++) {
-+ if (jobs[i].getTargetSite() == null) {
-+ empty = true;
-+ break;
-+ }
-+
-+ IFeature feature = jobs[i].getFeature();
-+ if (feature.isPatch()) {
-+ // Patches must go together with the features
-+ // they are patching.
-+
-+ // Check current jobs
-+ IInstallFeatureOperation patchedFeatureJob = findPatchedFeature(feature);
-+ if (patchedFeatureJob != null
-+ && patchedFeatureJob.getTargetSite() != null
-+ && !jobs[i].getTargetSite().equals(patchedFeatureJob.getTargetSite())) {
-+ String msg = NLS.bind(UpdateUIMessages.InstallWizard_TargetPage_patchError, (new String[] {
-+ feature.getLabel(),
-+ patchedFeatureJob.getFeature().getLabel()}));
-+ setErrorMessage(msg);
-+ setPageComplete(false);
-+ return;
-+ }
-+ // Check installed features
-+ IFeature patchedFeature = UpdateUtils.getPatchedFeature(feature);
-+ if (patchedFeature != null
-+ && !jobs[i].getTargetSite().equals(patchedFeature.getSite().getCurrentConfiguredSite())) {
-+ String msg = NLS.bind(UpdateUIMessages.InstallWizard_TargetPage_patchError2, (new String[] {
-+ feature.getLabel(),
-+ patchedFeature.getLabel(),
-+ patchedFeature.getSite().getCurrentConfiguredSite().getSite().getURL().getFile()}));
-+ setErrorMessage(msg);
-+ setPageComplete(false);
-+ return;
-+ }
-+ }
-+ }
-+ verifyNotEmpty(empty);
-+ }
-+
-+
-+ private boolean getSiteVisibility(IConfiguredSite site, IInstallFeatureOperation job) {
-+ // Do not allow installing into a non-updateable site
-+ if (!site.isUpdatable())
-+ return false;
-+
-+ // If affinity site is known, only it should be shown
-+ IConfiguredSite affinitySite = UpdateUtils.getAffinitySite(config, job.getFeature());
-+ if (affinitySite != null) {
-+ // Must compare referenced sites because
-+ // configured sites themselves may come from
-+ // different configurations
-+ return site.getSite().equals(affinitySite.getSite());
-+ }
-+
-+ // Co-locate updates with the old feature
-+ if (job.getOldFeature() != null) {
-+ IConfiguredSite oldSite = UpdateUtils.getSiteWithFeature(config, job.getOldFeature().getVersionedIdentifier().getIdentifier());
-+ return (site == oldSite);
-+ }
-+
-+ // Allow installing into any site that is updateable and there is no affinity specified
-+ return true;
-+ }
-+
-+ private void initializeDefaultTargetSites() {
-+ for (int i = 0; i < jobs.length; i++) {
-+ if (jobs[i].getTargetSite() != null)
-+ continue;
-+
-+ IConfiguredSite affinitySite = UpdateUtils.getAffinitySite(config, jobs[i].getFeature());
-+ if (affinitySite != null) {
-+ jobs[i].setTargetSite(affinitySite);
-+ continue;
-+ }
-+
-+ IConfiguredSite defaultSite = UpdateUtils.getDefaultTargetSite(config, jobs[i], false);
-+ if (defaultSite != null) {
-+ jobs[i].setTargetSite(defaultSite);
-+ continue;
-+ }
-+
-+ IConfiguredSite csite = getFirstTargetSite(jobs[i]);
-+ if (csite == null && Platform.getInstallLocation().isReadOnly()) {
-+ // there are no updateable sites and the installation location is read only
-+ // make an update site in the user's home direcotry
-+ String sitePath = System.getProperty("user.home") + File.separator + ".eclipse" + File.separator +
-+ Platform.getProduct().getId() + File.separator + "updates"; //$NON-NLS-1$ //$NON-NLS-2$
-+
-+ try {
-+ csite = config.createConfiguredSite(new File(sitePath));
-+ config.addConfiguredSite(csite);
-+ IStatus status = csite.verifyUpdatableStatus();
-+ if (!status.isOK())
-+ throw new CoreException(status);
-+
-+ } catch (CoreException e) {
-+ // there was a problem, the user must choose an installation site
-+ csite = null;
-+ }
-+ }
-+
-+ jobs[i].setTargetSite(csite);
-+
-+ }
-+ }
-+
-+
-+ private IConfiguredSite getFirstTargetSite(IInstallFeatureOperation job) {
-+ IConfiguredSite[] sites = config.getConfiguredSites();
-+ for (int i = 0; i < sites.length; i++) {
-+ IConfiguredSite csite = sites[i];
-+ if (getSiteVisibility(csite, job) && csite.verifyUpdatableStatus().isOK() == true)
-+ return csite;
-+ }
-+ return null;
-+ }
-+
-+ public IInstallFeatureOperation findPatchedFeature(IFeature patch) {
-+ for (int i=0; i<jobs.length; i++) {
-+ IFeature target = jobs[i].getFeature();
-+ if (!target.equals(patch) && UpdateUtils.isPatch(target, patch))
-+ return jobs[i];
-+ }
-+ return null;
-+ }
-+
-+
-+ void removeAddedSites() {
-+ if (added != null) {
-+ while (!added.isEmpty()) {
-+ Iterator it = added.iterator();
-+ if (it.hasNext())
-+ config.removeConfiguredSite((IConfiguredSite) it.next());
-+ }
-+ }
-+ }
-+
-+ /* (non-Javadoc)
-+ * @see org.eclipse.jface.wizard.IWizardPage#isPageComplete()
-+ */
-+ public boolean isPageComplete() {
-+ // check if all jobs have a target site set
-+ for (int i = 0; jobs != null && i < jobs.length; i++) {
-+ if (jobs[i].getTargetSite() == null)
-+ return false;
-+ }
-+ return super.isPageComplete();
-+ }
-+
-+ /**
-+ * @param job
-+ */
-+ private void setTargetLocation(IInstallFeatureOperation job) {
-+ if (job != null && job.getTargetSite() != null) {
-+ installLocation.setText(new File(job.getTargetSite().getSite().getURL().getFile()).toString());
-+ updateStatus(job.getTargetSite());
-+ }
-+ }
-+}
++ if (getSiteVisibility(csite, job) && csite.verifyUpdatableStatus().isOK() == true)
+ return csite;
+ }
+ return null;
Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- eclipse.spec 16 Jun 2005 16:02:07 -0000 1.143
+++ eclipse.spec 20 Jun 2005 21:14:00 -0000 1.144
@@ -5,14 +5,14 @@
%define tomcatlibdir %{_var}/lib/tomcat5
%define pkg_summary An open, extensible IDE
%define section free
-%define swt_version 3135
+%define swt_version 3138
%define eclipse_major 3
%define eclipse_minor 1
%define eclipse_majmin %{eclipse_major}.%{eclipse_minor}
%define eclipse_micro 0
%define eclipse_oldmajminmic 3.0.0
%define libname libswt3
-%define build_id I20050513-1415
+%define build_id S-3.1RC3-200506171618
# All arches line up except i386 -> x86
%ifarch %{ix86}
@@ -24,11 +24,11 @@
Summary: %{pkg_summary}
Name: eclipse
Version: %{eclipse_majmin}.%{eclipse_micro}_fc
-Release: 0.M7.9
+Release: 0.RC3.1
License: EPL
Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/
-Source0: http://download.eclipse.org/eclipse/downloads/drops/S-3.1M7-200505131415/eclipse-sourceBuild-srcIncluded-3.1M7.zip
+Source0: http://download.eclipse.org/eclipse/downloads/drops/S-3.1RC3-200506171618/eclipse-sourceBuild-srcIncluded-3.1RC3.zip
Source1: %{name}.script
Source2: %{name}.desktop
Source5: %{name}-48.png
@@ -45,6 +45,7 @@
Source17: %{name}-efj-wrapper.sh
# this zip was taken from the M6 source drop
Source18: ecj-M5.zip
+Source19: %{name}-filenamepatterns.txt
# Build libswt-mozilla
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=71637
@@ -53,11 +54,12 @@
# FIXME: these should be built by upstream build method
# http://www.bagu.org/eclipse/plugin-source-drops.html
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=71637
+# https://bugs.eclipse.org/bugs/show_bug.cgi?id=86848
+# GNU XML issue identified by Michael Koch
Patch2: %{name}-build.patch
+Patch3: %{name}-dontgeneratehelpindices.patch
Patch4: %{name}-libupdatebuild.patch
Patch5: %{name}-libupdatebuild2.patch
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=86848
-Patch10: %{name}-icon.patch
# Use installed mozilla libs and headers
Patch11: %{name}-libswt-mozilla.patch
# We can't really commit to doing builds for these arches upstream, but we
@@ -85,16 +87,12 @@
Patch22: %{name}-updatehomedir.patch
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=90535
Patch24: %{name}-fileinitializer.patch
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=95690
-Patch25: %{name}-build.xml-typo.patch
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=88364
Patch26: %{name}-ecj-options.patch
-# work around for http://gcc.gnu.org/bugzilla/show_bug.cgi?id=21637
-Patch27: %{name}-startup-url.openStream.patch
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=98371
-Patch28: %{name}-tomcat5.m7.patch
-Patch29: %{name}-tomcat5-build.m7.patch
-Patch30: %{name}-tomcat5-build.2.m7.patch
+Patch28: %{name}-tomcat5.patch
+Patch29: %{name}-tomcat5-build.patch
+Patch30: %{name}-tomcat5-build.2.patch
Patch31: %{name}-webapp-tomcat5.patch
%if %{gcj_support}
@@ -258,6 +256,28 @@
%description -n %{libname}-gtk2
SWT Library for GTK2.
+%package rcp
+Summary: Eclipse Rich Client Platform
+Group: Development/Languages
+%if %{gcj_support}
+Requires: libgcj >= 4.0.0-2
+Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_24rh
+%else
+Requires: java >= 1.4.2
+%endif
+
+%description rcp
+Eclipse Rich Client Platform
+
+%package rcp-devel
+Summary: Eclipse RCP Source
+Group: Text Editors/Integrated Development Environments (IDE)
+Requires: %{name}-rcp = %{epoch}:%{version}-%{release}
+Requires: %{name}-jdt-devel = %{epoch}:%{version}-%{release}
+
+%description rcp-devel
+Source for RCP for use within Eclipse.
+
%prep
%setup -q -c
@@ -270,9 +290,9 @@
%endif
popd
%patch2 -p0
+%patch3 -p0
%patch4 -p0
%patch5 -p0
-%patch10 -p0
%if %{gcj_support}
#%patch13 -p1
%endif
@@ -299,13 +319,6 @@
pushd plugins/org.eclipse.core.runtime
%patch24 -p0
popd
-%patch25 -p2
-pushd plugins/org.eclipse.jdt.core
-%patch26 -p0
-popd
-pushd plugins/org.eclipse.platform
-%patch27 -p0
-popd
pushd plugins/org.eclipse.tomcat
%patch28 -p0
%patch29 -p0
@@ -531,7 +544,7 @@
%if %{gcj_support}
pushd result
# De-compress resulting tarball
- tar zxf org.eclipse.sdk-%{build_id}-linux.gtk.%{eclipse_arch}.tar.gz
+ tar zxf linux-gtk-%{eclipse_arch}-sdk.tar.gz
pushd eclipse
@@ -632,11 +645,15 @@
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
tar -C $RPM_BUILD_ROOT%{_datadir} -zxf \
- result/org.eclipse.sdk-%{build_id}-linux.gtk.%{eclipse_arch}.tar.gz
+ result/linux-gtk-%{eclipse_arch}-sdk.tar.gz
# extract jdtCompilerAdapter.jar from org.eclipse.jdt.core_3.1.0.jar (again)
pushd $RPM_BUILD_ROOT%{_datadir}/%{name}
unzip -d plugins plugins/org.eclipse.jdt.core_3.1.0.jar jdtCompilerAdapter.jar
+
+# Extract .so files
+# https://bugs.eclipse.org/bugs/show_bug.cgi?id=90535
+java -cp startup.jar org.eclipse.core.launcher.Main -consolelog -application org.eclipse.core.runtime.initializer -fileInitializer %{SOURCE19}
popd
# Binaries, libraries, and natively-built shared libraries
@@ -667,38 +684,29 @@
pushd $RPM_BUILD_ROOT%{_datadir}/%{name}
ln -sf %{_libdir}/%{name}/eclipse eclipse
-## JNI libraries
-#cp -p plugins/org.eclipse.update.core.linux_%{eclipse_oldmajminmic}/os/linux/%{eclipse_arch}/libupdate.so \
-# $RPM_BUILD_ROOT%{_libdir}/%{name}/
-#cp -p plugins/org.eclipse.core.resources.linux_%{eclipse_oldmajminmic}/os/linux/%{eclipse_arch}/libcore_*.so \
-# $RPM_BUILD_ROOT%{_libdir}/%{name}/
-#suff=
-#%ifarch alpha ia64 ppc64 sparc64 x86_64
-#suff=64
-#%endif
-#cp -p plugins/org.eclipse.swt.gtk${suff}_%{eclipse_majmin}.%{eclipse_micro}/os/linux/%{eclipse_arch}/libswt*.so \
-# $RPM_BUILD_ROOT%{_libdir}/%{name}/
+# Symlink JNI libraries
+for l in `find configuration -name \*.so`; do
+ mv $l $RPM_BUILD_ROOT%{_libdir}/%{name};
+ pushd `dirname $l`;
+ ln -sf %{_libdir}/%{name}/`basename $l`;
+ popd
+done
popd
pushd $RPM_BUILD_ROOT%{_libdir}/%{name}
chmod -R 755 eclipse *.so
popd
-#### begin libswt-gtk2 symlinks
-#pushd $RPM_BUILD_ROOT%{_libdir}
-#for base in awt-gtk mozilla-gtk atk-gtk gnome-gtk gtk pi-gtk; do
-# ln -sf %{_libdir}/%{name}/libswt-${base}-%{swt_version}.so \
-# libswt-${base}-%{swt_version}.so
-#done
-#popd
-
+### begin libswt-gtk2 symlinks
+pushd $RPM_BUILD_ROOT%{_libdir}
+for base in awt-gtk atk-gtk mozilla-gtk gnome-gtk gtk pi-gtk; do
+ ln -sf %{_libdir}/%{name}/libswt-${base}-%{swt_version}.so \
+ libswt-${base}-%{swt_version}.so
+done
+popd
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-
pushd $RPM_BUILD_ROOT%{_javadir}
ln -sf %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_%{eclipse_majmin}.%{eclipse_micro}.jar swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.jar
-#ln -sf %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk${suff}_%{eclipse_majmin}.%{eclipse_micro}/ws/gtk/swt-pi.jar swt-pi-gtk-%{version}.jar
-#ln -sf %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk${suff}_%{eclipse_majmin}.%{eclipse_micro}/ws/gtk/swt-mozilla.jar swt-mozilla-%{version}.jar
-#ln -sf %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk${suff}_%{eclipse_majmin}.%{eclipse_micro}/ws/gtk/swt-cairo.jar swt-cairo-%{version}.jar
popd
### end libswt-gtk2 symlinks
@@ -870,6 +878,7 @@
gcj-dbtool -n $gcjdbdir/%{name}-platform.db 80000
gcj-dbtool -n $gcjdbdir/%{name}-jdt.db 80000
gcj-dbtool -n $gcjdbdir/%{name}-pde.db 80000
+gcj-dbtool -n $gcjdbdir/%{name}-rcp.db 80000
# ecj db
gcj-dbtool -f $gcjdbdir/%{name}-ecj.db \
@@ -901,6 +910,16 @@
done;
done
+# rcp db
+for j in `find $RPM_BUILD_ROOT/%{_datadir}/%{name}/plugins/org.eclipse.rcp_3.* \
+ -name \*.jar`; do
+ lib=`echo $j | sed "s:%{_datadir}:%{_libdir}:"`.so;
+ if [ -f $lib ]; then
+ gcj-dbtool -f $gcjdbdir/%{name}-rcp.db \
+ $j `echo $lib | sed "s:$RPM_BUILD_ROOT/::"`;
+ fi;
+done
+
# platform db
for dir in `cat %{SOURCE9}`; do
for j in `find $RPM_BUILD_ROOT/$dir -name \*.jar`; do
@@ -937,6 +956,9 @@
%post pde
%{_bindir}/rebuild-gcj-db %{_libdir}
+%post rcp
+%{_bindir}/rebuild-gcj-db %{_libdir}
+
%post -n %{libname}-gtk2
%{_bindir}/rebuild-gcj-db %{_libdir}
%endif
@@ -960,6 +982,9 @@
%postun pde
%{_bindir}/rebuild-gcj-db %{_libdir}
+%postun rcp
+%{_bindir}/rebuild-gcj-db %{_libdir}
+
%postun -n %{libname}-gtk2
%{_bindir}/rebuild-gcj-db %{_libdir}
%endif
@@ -996,17 +1021,10 @@
%dir %{_datadir}/%{name}/plugins
%dir %{_datadir}/%{name}/features
%dir %{_datadir}/%{name}/configuration
-#%{_libdir}/%{name}/libswt-gnome-gtk-*.so
-#%{_libdir}/%{name}/libswt-gtk-*.so
-#%{_libdir}/%{name}/libswt-pi-gtk-*.so
-#%{_libdir}/%{name}/libswt-atk-gtk-*.so
-#%{_libdir}/%{name}/libswt-awt-gtk-*.so
-#%{_libdir}/%{name}/libswt-mozilla-gtk-*.so
-#%{_libdir}/libswt-*.so
+%{_datadir}/%{name}/configuration/org.eclipse.osgi/bundles/37
+%{_libdir}/%{name}/libswt-*.so
+%{_libdir}/libswt-*.so
%{_javadir}/swt-gtk*.jar
-#%{_javadir}/swt-pi-gtk*.jar
-#%{_javadir}/swt-mozilla*.jar
-#%{_javadir}/swt-cairo*.jar
%if %{gcj_support}
# Native bits
%{_libdir}/gcj-4.0.0/classmap.db.d/libswt3-gtk2.db
@@ -1055,13 +1073,28 @@
%{_datadir}/%{name}/plugins/org.eclipse.pde.source_3.*
%{_datadir}/%{name}/features/org.eclipse.pde.source_3.*
+%files rcp
+%{_datadir}/%{name}/features/org.eclipse.rcp_3.*
+%{_datadir}/%{name}/plugins/org.eclipse.rcp_3.*
+%if %{gcj_support}
+# Native bits
+%{_libdir}/gcj-4.0.0/classmap.db.d/%{name}-rcp.db
+%{_libdir}/%{name}/plugins/org.eclipse.rcp_3.1.0.jar.so
+%endif
+
+%files rcp-devel
+%{_datadir}/%{name}/plugins/org.eclipse.rcp.source_3.*
+%{_datadir}/%{name}/plugins/org.eclipse.rcp.source.linux*
+%{_datadir}/%{name}/features/org.eclipse.rcp.source_3.*
+
%files platform -f %{name}-platform.install
%{_datadir}/%{name}/.eclipseproduct
%{_datadir}/%{name}/startup.jar
%{_datadir}/%{name}/buildscripts
%{_libdir}/%{name}/eclipse
-#%{_libdir}/%{name}/libcore*
-#%{_libdir}/%{name}/libupdate*
+%{_libdir}/%{name}/libcore*
+%{_libdir}/%{name}/libupdate*
+%{_datadir}/%{name}/configuration
%{_datadir}/%{name}/eclipse
%{_bindir}/eclipse
%{_datadir}/applications/*
@@ -1094,7 +1127,7 @@
%{_libdir}/%{name}/plugins/org.eclipse.osgi_3.1.0.jar.so.bak
%{_libdir}/%{name}/plugins/org.eclipse.ant.core_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.compare_3.1.0.jar.so
-%{_libdir}/%{name}/plugins/org.eclipse.core.boot_3.0.0.jar.so
+%{_libdir}/%{name}/plugins/org.eclipse.core.boot_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.core.filebuffers_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.core.resources_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.core.resources.linux_3.1.0.jar.so
@@ -1103,8 +1136,8 @@
%{_libdir}/%{name}/plugins/org.eclipse.debug.ui_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.ltk.ui.refactoring_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.ltk.core.refactoring_3.1.0.jar.so
-%{_libdir}/%{name}/plugins/org.eclipse.osgi.services_3.0.0.jar.so
-%{_libdir}/%{name}/plugins/org.eclipse.osgi.util_3.0.0.jar.so
+%{_libdir}/%{name}/plugins/org.eclipse.osgi.services_3.1.0.jar.so
+%{_libdir}/%{name}/plugins/org.eclipse.osgi.util_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.platform.doc.isv_3.1.0
%{_libdir}/%{name}/plugins/org.eclipse.platform_3.1.0
%{_libdir}/%{name}/plugins/org.eclipse.search_3.1.0.jar.so
@@ -1112,7 +1145,7 @@
%{_libdir}/%{name}/plugins/org.eclipse.team.cvs.core_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.team.cvs.ui_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.team.cvs.ssh_3.1.0.jar.so
-%{_libdir}/%{name}/plugins/org.eclipse.team.cvs.ssh2_3.1.0.jar.so
+%{_libdir}/%{name}/plugins/org.eclipse.team.cvs.ssh2_3.1.0
%{_libdir}/%{name}/plugins/org.eclipse.team.ui_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.text_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.ui.browser_3.1.0.jar.so
@@ -1134,6 +1167,20 @@
%{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_3.1.0
%changelog
+* Mon Jun 20 2005 Andrew Overholt <overholt at redhat.com> 3.1.0_fc-0.RC3.1
+- Import 3.1RC3.
+- Use FileInitializer (e.o#90535) - this should eliminate .sos in ~/.eclipse.
+- Add eclipse-filenamepatterns.txt ("*.so" currently) for above.
+- Symlink JNI libraries.
+
+* Fri Jun 17 2005 Andrew Overholt <overholt at redhat.com> 3.1.0_fc-0.RC2.2
+- Update to new naming scheme for resulting gzipped tarball.
+- Add patch to not generate help indices (it seems to hang).
+
+* Thu Jun 16 2005 Andrew Overholt <overholt at redhat.com> 3.1.0_fc-0.RC2.1
+- Import 3.1RC2.
+- Add RCP sub-package. Unsure about its dependencies ATM.
+
* Tue Jun 14 2005 Andrew Overholt <overholt at redhat.com> 3.1.0_fc-0.M7.9
- Add tomcat5 patch and symlinks.
--- eclipse-build.xml-typo.patch DELETED ---
--- eclipse-combo-bug-backport.patch DELETED ---
--- eclipse-gtk-launcher.patch DELETED ---
--- eclipse-icon.patch DELETED ---
--- eclipse-importArchivedProj.patch DELETED ---
--- eclipse-jnigen.patch DELETED ---
--- eclipse-libswt-mozilla2.patch DELETED ---
--- eclipse-org.eclipse.core.resources-Makefile.patch DELETED ---
--- eclipse-org.eclipse.help.appserver-host.patch DELETED ---
--- eclipse-platformOptions.patch DELETED ---
--- eclipse-search.patch DELETED ---
--- eclipse-swt-libgcjawt.patch DELETED ---
--- eclipse-textsearch.patch DELETED ---
--- eclipse-welcome-screen.patch DELETED ---
More information about the fedora-cvs-commits
mailing list