geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcco...@apache.org
Subject svn commit: r938901 - in /geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core: ./ META-INF/ src/main/java/org/apache/geronimo/st/core/ src/main/java/org/apache/geronimo/st/core/internal/
Date Wed, 28 Apr 2010 11:12:19 GMT
Author: mcconne
Date: Wed Apr 28 11:12:19 2010
New Revision: 938901

URL: http://svn.apache.org/viewvc?rev=938901&view=rev
Log:
Rebase on v30

Modified:
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/plugin.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/pom.xml
    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/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/META-INF/MANIFEST.MF?rev=938901&r1=938900&r2=938901&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/META-INF/MANIFEST.MF
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/META-INF/MANIFEST.MF
Wed Apr 28 11:12:19 2010
@@ -8,7 +8,7 @@ Bundle-Vendor: Apache Software Foundatio
 Bundle-Localization: plugin
 Require-Bundle: 
  org.apache.geronimo.runtime.common,
- org.apache.geronimo.runtime.v30,
+ org.apache.geronimo.runtime.v22,
  org.apache.geronimo.jee.v21.jaxbmodel,
  org.eclipse.core.runtime,
  org.eclipse.wst.server.core,
@@ -16,7 +16,6 @@ Require-Bundle: 
  org.eclipse.jst.j2ee.web,
  org.eclipse.jst.j2ee.ejb,
  org.eclipse.jst.j2ee.jca,
- org.eclipse.core.runtime,
  org.eclipse.wst.common.frameworks;visibility:=reexport,
  org.eclipse.core.commands;visibility:=reexport,
  org.eclipse.wst.server.core,

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/plugin.xml?rev=938901&r1=938900&r2=938901&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/plugin.xml
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/plugin.xml
Wed Apr 28 11:12:19 2010
@@ -130,10 +130,9 @@
             <facet id="jst.connector"   version="1.0,1.5,1.6"/>
             <facet id="jst.appclient"   version="1.2,1.3,1.4,5.0"/>
             <facet id="jst.utility"     version="1.0"/>
-            <facet id="osgi.app"        version="1.0"/>
-            <facet id="osgi.bundle"     version="1.0"/>
-            <facet id="osgi.comp"       version="1.0"/>
-        </supported>
+            <facet id="osgi.app"        version="1.0"/>     
+            <facet id="osgi.bundle"     version="1.0"/>  
+         </supported>
     </extension>
     
     
@@ -146,7 +145,10 @@
     <!-- =======================================================================================
-->
     <extension point="org.eclipse.jst.server.core.runtimeClasspathProviders">
         <runtimeClasspathProvider id="org.apache.geronimo.runtimeClasspathProvider"
-            runtimeTypeIds="org.apache.geronimo.runtime.*"
+            runtimeTypeIds="org.apache.geronimo.runtime.11,
+                            org.apache.geronimo.runtime.20,
+                            org.apache.geronimo.runtime.21,
+                            org.apache.geronimo.runtime.22"
             class="org.apache.geronimo.st.core.GeronimoServerRuntimeTargetHandler"/>
     </extension>
     

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/pom.xml?rev=938901&r1=938900&r2=938901&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/pom.xml Wed
Apr 28 11:12:19 2010
@@ -146,7 +146,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
-            <artifactId>org.apache.geronimo.runtime.v30</artifactId>
+            <artifactId>org.apache.geronimo.runtime.v22</artifactId>
             <version>${version}</version>
         </dependency>
         <dependency>

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=938901&r1=938900&r2=938901&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
Wed Apr 28 11:12:19 2010
@@ -45,10 +45,8 @@ public class GeronimoServerRuntimeTarget
             return Messages.target21runtime;
         }if (version.equals("2.2")) {
             return Messages.target22runtime;
-        }if (version.equals("3.0")) {
-            return Messages.target30runtime;
         }
-        return Messages.target30runtime;
+        return Messages.target22runtime;
     }
 
     /* (non-Javadoc)
@@ -139,18 +137,6 @@ public class GeronimoServerRuntimeTarget
             	 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 jstlSpec     = runtime.getLocation().append("repository/org/apache/geronimo/bundles/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, 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=938901&r1=938900&r2=938901&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
Wed Apr 28 11:12:19 2010
@@ -42,7 +42,6 @@ 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=938901&r1=938900&r2=938901&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
Wed Apr 28 11:12:19 2010
@@ -27,7 +27,6 @@ target11runtime=Geronimo v1.1 Runtime
 target20runtime=Geronimo v2.0 Runtime
 target21runtime=Geronimo v2.1 Runtime
 target22runtime=Geronimo v2.2 Runtime
-target30runtime=Geronimo v3.0 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