geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From de...@apache.org
Subject svn commit: r928964 - in /geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core: GeronimoServerRuntimeTargetHandler.java internal/Messages.java internal/Messages.properties
Date Tue, 30 Mar 2010 02:49:48 GMT
Author: delos
Date: Tue Mar 30 02:49:48 2010
New Revision: 928964

URL: http://svn.apache.org/viewvc?rev=928964&view=rev
Log:
GERONIMODEVTOOLS-607 update JSTL path and remove unused lib for v2.2 adapter

Modified:
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/GeronimoServerRuntimeTargetHandler.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/internal/Messages.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/internal/Messages.properties

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/GeronimoServerRuntimeTargetHandler.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/GeronimoServerRuntimeTargetHandler.java?rev=928964&r1=928963&r2=928964&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/GeronimoServerRuntimeTargetHandler.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/GeronimoServerRuntimeTargetHandler.java
Tue Mar 30 02:49:48 2010
@@ -45,8 +45,10 @@ public class GeronimoServerRuntimeTarget
             return Messages.target21runtime;
         }if (version.equals("2.2")) {
             return Messages.target22runtime;
+        }if (version.equals("3.0")) {
+            return Messages.target30runtime;
         }
-        return Messages.target22runtime;
+        return Messages.target30runtime;
     }
 
     /* (non-Javadoc)
@@ -126,21 +128,35 @@ public class GeronimoServerRuntimeTarget
             }if (version.startsWith("2.2")) {
             	 //TODO: review list here when server 2.2 is ready
             	 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 jstlSpec     = runtime.getLocation().append("repository/jstl/jstl/");
+            	 IPath jstlSpec     = runtime.getLocation().append("repository/javax/servlet/jstl");
             	 IPath myfacesSpec  = runtime.getLocation().append("repository/org/apache/myfaces/core/myfaces-api/");
             	 IPath myfacesImplSpec  = runtime.getLocation().append("repository/org/apache/myfaces/core/myfaces-impl/");
             	 IPath jdbcSpec     = runtime.getLocation().append("repository/org/apache/geronimo/framework/geronimo-jdbc/");
-            	 addLibraryEntries(list, javaMailSpec.toFile(), true);
-            	 addLibraryEntries(list, jaxbApiSpec.toFile(),  true);
+            	 addLibraryEntries(list, javaMailSpec.toFile(), true);            	 
             	 addLibraryEntries(list, jabxImplSpec.toFile(), true);
-            	 addLibraryEntries(list, jaxwsApiSpec.toFile(), true);
             	 addLibraryEntries(list, jstlSpec.toFile(),     true);
             	 addLibraryEntries(list, myfacesSpec.toFile(),  true);
             	 addLibraryEntries(list, myfacesImplSpec.toFile(),  true);
             	 addLibraryEntries(list, jdbcSpec.toFile(),     true);
+            }if (version.startsWith("3.0")) {
+	           	 //TODO: review list here when server 3.0 is ready
+	           	 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 jstlSpec     = runtime.getLocation().append("repository/jstl/jstl/");
+	           	 IPath myfacesSpec  = runtime.getLocation().append("repository/org/apache/myfaces/core/myfaces-api/");
+	           	 IPath myfacesImplSpec  = runtime.getLocation().append("repository/org/apache/myfaces/core/myfaces-impl/");
+	           	 IPath jdbcSpec     = runtime.getLocation().append("repository/org/apache/geronimo/framework/geronimo-jdbc/");
+	           	 addLibraryEntries(list, javaMailSpec.toFile(), true);
+	           	 addLibraryEntries(list, jaxbApiSpec.toFile(),  true);
+	           	 addLibraryEntries(list, jabxImplSpec.toFile(), true);
+	           	 addLibraryEntries(list, jaxwsApiSpec.toFile(), true);
+	           	 addLibraryEntries(list, jstlSpec.toFile(),     true);
+	           	 addLibraryEntries(list, myfacesSpec.toFile(),  true);
+	           	 addLibraryEntries(list, myfacesImplSpec.toFile(),  true);
+	           	 addLibraryEntries(list, jdbcSpec.toFile(),     true);
             }
         }
 

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/internal/Messages.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/internal/Messages.java?rev=928964&r1=928963&r2=928964&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/internal/Messages.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/internal/Messages.java
Tue Mar 30 02:49:48 2010
@@ -42,6 +42,7 @@ public class Messages extends NLS {
     public static String target20runtime;
     public static String target21runtime;
     public static String target22runtime;
+    public static String target30runtime;
 
     public static String incorrectVersion;
     public static String noVersion;

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/internal/Messages.properties
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/internal/Messages.properties?rev=928964&r1=928963&r2=928964&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/internal/Messages.properties
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/internal/Messages.properties
Tue Mar 30 02:49:48 2010
@@ -27,6 +27,7 @@ target11runtime=Geronimo v1.1 Runtime
 target20runtime=Geronimo v2.0 Runtime
 target21runtime=Geronimo v2.1 Runtime
 target22runtime=Geronimo v2.2 Runtime
+target30runtime=Geronimo v2.2 Runtime
 
 incorrectVersion=An incorrect version of {0} was detected.  Version {1} was expected, but
version {2} was found.
 noVersion=A {0} installation was detected, however the version could not be verified.



Mime
View raw message