Skip to content

Commit d9dc3c1

Browse files
author
Tim McConnell
committed
GERONIMODEVTOOLS-175,199,200 Fix missing spec jars in the classpath
git-svn-id: https://svn.apache.org/repos/asf/geronimo/devtools/eclipse-plugin/branches/2.0.0@574396 13f79535-47bb-0310-9956-ffa450edef68
1 parent 06ef387 commit d9dc3c1

File tree

2 files changed

+34
-13
lines changed

2 files changed

+34
-13
lines changed

‎eclipse/build.xml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,20 @@
2222
<project name="EuropaArtifacts">
2323

2424
<target name="init">
25-
<property name="europa_download_url" value="http://www.eclipse.org/downloads/download.php?file=/eclipse/downloads/drops/M20070829-0800/"/>
26-
<property name="dtp_download_url" value="http://www.eclipse.org/downloads/download.php?file=/datatools/downloads/drops/N_DTP_1.5.1/"/>
27-
<property name="emf_download_url" value="http://www.eclipse.org/downloads/download.php?file=/modeling/emf/emf/downloads/drops/2.3.1/M200708142030/"/>
28-
<property name="gef_download_url" value="http://www.eclipse.org/downloads/download.php?file=/tools/gef/downloads/drops/M20070814-1555/"/>
29-
<property name="wtp_download_url" value="http://www.eclipse.org/downloads/download.php?file=/webtools/downloads/drops/R2.0/M-2.0.1-20070830174756/"/>
30-
<property name="europa_jee_win32" value="eclipse-SDK-M20070829-0800-win32.zip"/>
31-
<property name="europa_jee_linux" value="eclipse-SDK-M20070829-0800-linux-gtk.tar"/>
32-
<property name="europa_jee_macos" value="eclipse-SDK-M20070829-0800-macosx-carbon.tar"/>
25+
<property name="europa_download_url" value="http://www.eclipse.org/downloads/download.php?file=/eclipse/downloads/drops/R-3.3-200706251500/"/>
26+
<property name="dtp_download_url" value="http://www.eclipse.org/downloads/download.php?file=/datatools/downloads/1.5/"/>
27+
<property name="emf_download_url" value="http://www.eclipse.org/downloads/download.php?file=/modeling/emf/emf/downloads/drops/2.3.0/R200706262000/"/>
28+
<property name="gef_download_url" value="http://www.eclipse.org/downloads/download.php?file=/tools/gef/downloads/drops/R-3.3-200706281000/"/>
29+
<property name="wtp_download_url" value="http://www.eclipse.org/downloads/download.php?file=/webtools/downloads/drops/R2.0/R-2.0-200706260303/"/>
30+
<property name="europa_jee_win32" value="eclipse-SDK-3.3-win32.zip"/>
31+
<property name="europa_jee_linux" value="eclipse-SDK-3.3-linux-gtk.tar"/>
32+
<property name="europa_jee_macos" value="eclipse-SDK-3.3-macosx-carbon.tar"/>
3333
<property name="europa_jee_linux_gz" value="${europa_jee_linux}.gz"/>
3434
<property name="europa_jee_macos_gz" value="${europa_jee_macos}.gz"/>
35-
<property name="dtp_sdk" value="dtp-sdk_1.5.1_N082907.zip"/>
36-
<property name="emf_sdo" value="emf-sdo-xsd-SDK-M200708142030.zip"/>
37-
<property name="gef_sdk" value="GEF-SDK-M20070814-1555.zip"/>
38-
<property name="wtp_sdk" value="wtp-sdk-M-2.0.1-20070830174756.zip"/>
35+
<property name="dtp_sdk" value="dtp-sdk_1.5.zip"/>
36+
<property name="emf_sdo" value="emf-sdo-xsd-SDK-2.3.0.zip"/>
37+
<property name="gef_sdk" value="GEF-SDK-3.3.zip"/>
38+
<property name="wtp_sdk" value="wtp-sdk-R-2.0-200706260303.zip"/>
3939
</target>
4040

4141
<target name="win32" depends="init,common" description="Download Windows-specific artifact(s)">
@@ -81,7 +81,7 @@
8181

8282
<target name="common" description="Download artifacts common to all OS'es">
8383
<antcall target="dtp"/>
84-
<antcall target="emf"/>
84+
<antcall target="emf"/>
8585
<antcall target="gef"/>
8686
<antcall target="wtp"/>
8787
</target>

‎plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerRuntimeTargetHandler.java

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,27 @@ public IClasspathEntry[] getServerClassPathEntry(IRuntime runtime) {
7878
} else {
7979
IPath specPath = runtime.getLocation().append("repository/org/apache/geronimo/specs/");
8080
addLibraryEntries(list, specPath.toFile(), true);
81+
//
82+
// Add spec jars that are not in the specs directory (per Geronimo configs jee-specs)
83+
//
84+
if (!version.startsWith("1")) {
85+
IPath javaMailSpec = runtime.getLocation().append("repository/org/apache/geronimo/javamail/geronimo-javamail_1.4_mail/");
86+
IPath jaxbApiSpec = runtime.getLocation().append("repository/javax/xml/bind/jaxb-api/");
87+
IPath jabxImplSpec = runtime.getLocation().append("repository/com/sun/xml/bind/jaxb-impl/");
88+
IPath jaxwsApiSpec = runtime.getLocation().append("repository/org/apache/axis2/axis2-jaxws-api/");
89+
IPath saajApiSpec = runtime.getLocation().append("repository/org/apache/axis2/axis2-saaj-api/");
90+
IPath jstlSpec = runtime.getLocation().append("repository/jstl/jstl/");
91+
IPath myfacesSpec = runtime.getLocation().append("repository/org/apache/myfaces/core/myfaces-api/");
92+
IPath jdbcSpec = runtime.getLocation().append("repository/org/apache/geronimo/modules/geronimo-jdbc/");
93+
addLibraryEntries(list, javaMailSpec.toFile(), true);
94+
addLibraryEntries(list, jaxbApiSpec.toFile(), true);
95+
addLibraryEntries(list, jabxImplSpec.toFile(), true);
96+
addLibraryEntries(list, jaxwsApiSpec.toFile(), true);
97+
addLibraryEntries(list, saajApiSpec.toFile(), true);
98+
addLibraryEntries(list, jstlSpec.toFile(), true);
99+
addLibraryEntries(list, myfacesSpec.toFile(), true);
100+
addLibraryEntries(list, jdbcSpec.toFile(), true);
101+
}
81102
}
82103

83104
return (IClasspathEntry[])list.toArray(new IClasspathEntry[list.size()]);

0 commit comments

Comments
 (0)