You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by mc...@apache.org on 2007/09/11 00:43:56 UTC
svn commit: r574396 - in /geronimo/devtools/eclipse-plugin/branches/2.0.0:
eclipse/build.xml
plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerRuntimeTargetHandler.java
Author: mcconne
Date: Mon Sep 10 15:43:55 2007
New Revision: 574396
URL: http://svn.apache.org/viewvc?rev=574396&view=rev
Log:
GERONIMODEVTOOLS-175,199,200 Fix missing spec jars in the classpath
Modified:
geronimo/devtools/eclipse-plugin/branches/2.0.0/eclipse/build.xml
geronimo/devtools/eclipse-plugin/branches/2.0.0/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerRuntimeTargetHandler.java
Modified: geronimo/devtools/eclipse-plugin/branches/2.0.0/eclipse/build.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.0.0/eclipse/build.xml?rev=574396&r1=574395&r2=574396&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.0.0/eclipse/build.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.0.0/eclipse/build.xml Mon Sep 10 15:43:55 2007
@@ -22,20 +22,20 @@
<project name="EuropaArtifacts">
<target name="init">
- <property name="europa_download_url" value="http://www.eclipse.org/downloads/download.php?file=/eclipse/downloads/drops/M20070829-0800/"/>
- <property name="dtp_download_url" value="http://www.eclipse.org/downloads/download.php?file=/datatools/downloads/drops/N_DTP_1.5.1/"/>
- <property name="emf_download_url" value="http://www.eclipse.org/downloads/download.php?file=/modeling/emf/emf/downloads/drops/2.3.1/M200708142030/"/>
- <property name="gef_download_url" value="http://www.eclipse.org/downloads/download.php?file=/tools/gef/downloads/drops/M20070814-1555/"/>
- <property name="wtp_download_url" value="http://www.eclipse.org/downloads/download.php?file=/webtools/downloads/drops/R2.0/M-2.0.1-20070830174756/"/>
- <property name="europa_jee_win32" value="eclipse-SDK-M20070829-0800-win32.zip"/>
- <property name="europa_jee_linux" value="eclipse-SDK-M20070829-0800-linux-gtk.tar"/>
- <property name="europa_jee_macos" value="eclipse-SDK-M20070829-0800-macosx-carbon.tar"/>
+ <property name="europa_download_url" value="http://www.eclipse.org/downloads/download.php?file=/eclipse/downloads/drops/R-3.3-200706251500/"/>
+ <property name="dtp_download_url" value="http://www.eclipse.org/downloads/download.php?file=/datatools/downloads/1.5/"/>
+ <property name="emf_download_url" value="http://www.eclipse.org/downloads/download.php?file=/modeling/emf/emf/downloads/drops/2.3.0/R200706262000/"/>
+ <property name="gef_download_url" value="http://www.eclipse.org/downloads/download.php?file=/tools/gef/downloads/drops/R-3.3-200706281000/"/>
+ <property name="wtp_download_url" value="http://www.eclipse.org/downloads/download.php?file=/webtools/downloads/drops/R2.0/R-2.0-200706260303/"/>
+ <property name="europa_jee_win32" value="eclipse-SDK-3.3-win32.zip"/>
+ <property name="europa_jee_linux" value="eclipse-SDK-3.3-linux-gtk.tar"/>
+ <property name="europa_jee_macos" value="eclipse-SDK-3.3-macosx-carbon.tar"/>
<property name="europa_jee_linux_gz" value="${europa_jee_linux}.gz"/>
<property name="europa_jee_macos_gz" value="${europa_jee_macos}.gz"/>
- <property name="dtp_sdk" value="dtp-sdk_1.5.1_N082907.zip"/>
- <property name="emf_sdo" value="emf-sdo-xsd-SDK-M200708142030.zip"/>
- <property name="gef_sdk" value="GEF-SDK-M20070814-1555.zip"/>
- <property name="wtp_sdk" value="wtp-sdk-M-2.0.1-20070830174756.zip"/>
+ <property name="dtp_sdk" value="dtp-sdk_1.5.zip"/>
+ <property name="emf_sdo" value="emf-sdo-xsd-SDK-2.3.0.zip"/>
+ <property name="gef_sdk" value="GEF-SDK-3.3.zip"/>
+ <property name="wtp_sdk" value="wtp-sdk-R-2.0-200706260303.zip"/>
</target>
<target name="win32" depends="init,common" description="Download Windows-specific artifact(s)">
@@ -81,7 +81,7 @@
<target name="common" description="Download artifacts common to all OS'es">
<antcall target="dtp"/>
- <antcall target="emf"/>
+ <antcall target="emf"/>
<antcall target="gef"/>
<antcall target="wtp"/>
</target>
Modified: geronimo/devtools/eclipse-plugin/branches/2.0.0/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerRuntimeTargetHandler.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.0.0/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerRuntimeTargetHandler.java?rev=574396&r1=574395&r2=574396&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.0.0/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerRuntimeTargetHandler.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.0.0/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerRuntimeTargetHandler.java Mon Sep 10 15:43:55 2007
@@ -78,6 +78,27 @@
} else {
IPath specPath = runtime.getLocation().append("repository/org/apache/geronimo/specs/");
addLibraryEntries(list, specPath.toFile(), true);
+ //
+ // Add spec jars that are not in the specs directory (per Geronimo configs jee-specs)
+ //
+ if (!version.startsWith("1")) {
+ IPath javaMailSpec = runtime.getLocation().append("repository/org/apache/geronimo/javamail/geronimo-javamail_1.4_mail/");
+ IPath jaxbApiSpec = runtime.getLocation().append("repository/javax/xml/bind/jaxb-api/");
+ IPath jabxImplSpec = runtime.getLocation().append("repository/com/sun/xml/bind/jaxb-impl/");
+ IPath jaxwsApiSpec = runtime.getLocation().append("repository/org/apache/axis2/axis2-jaxws-api/");
+ IPath saajApiSpec = runtime.getLocation().append("repository/org/apache/axis2/axis2-saaj-api/");
+ IPath jstlSpec = runtime.getLocation().append("repository/jstl/jstl/");
+ IPath myfacesSpec = runtime.getLocation().append("repository/org/apache/myfaces/core/myfaces-api/");
+ IPath jdbcSpec = runtime.getLocation().append("repository/org/apache/geronimo/modules/geronimo-jdbc/");
+ addLibraryEntries(list, javaMailSpec.toFile(), true);
+ addLibraryEntries(list, jaxbApiSpec.toFile(), true);
+ addLibraryEntries(list, jabxImplSpec.toFile(), true);
+ addLibraryEntries(list, jaxwsApiSpec.toFile(), true);
+ addLibraryEntries(list, saajApiSpec.toFile(), true);
+ addLibraryEntries(list, jstlSpec.toFile(), true);
+ addLibraryEntries(list, myfacesSpec.toFile(), true);
+ addLibraryEntries(list, jdbcSpec.toFile(), true);
+ }
}
return (IClasspathEntry[])list.toArray(new IClasspathEntry[list.size()]);