You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by sp...@apache.org on 2007/01/04 20:53:57 UTC
svn commit: r492707 - in /geronimo/devtools/eclipse-plugin/branches/1.2.1:
./ plugins/
plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/
plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/internal/
plugins/org.apache...
Author: sppatel
Date: Thu Jan 4 11:53:56 2007
New Revision: 492707
URL: http://svn.apache.org/viewvc?view=rev&rev=492707
Log:
add inital support for G 1.2?
Modified:
geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoRuntimeDelegate.java
geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerRuntimeTargetHandler.java
geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/internal/Messages.java
geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/internal/Messages.properties
geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.st.ui/plugin.xml
geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/pom.xml
geronimo/devtools/eclipse-plugin/branches/1.2.1/pom.xml
Modified: geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoRuntimeDelegate.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoRuntimeDelegate.java?view=diff&rev=492707&r1=492706&r2=492707
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoRuntimeDelegate.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoRuntimeDelegate.java Thu Jan 4 11:53:56 2007
@@ -36,6 +36,8 @@
import org.eclipse.osgi.util.NLS;
import org.eclipse.wst.server.core.model.RuntimeDelegate;
+import sun.security.action.GetLongAction;
+
/**
* @version $Rev$ $Date$
*/
@@ -190,6 +192,8 @@
return "org.apache.geronimo.runtime.tomcat.10";
} else if ("1.1".equals(version)) {
return "org.apache.geronimo.runtime.tomcat.11";
+ } else if ("1.2".equals(version)) {
+ return "org.apache.geronimo.runtime.tomcat.12";
}
return null;
}
@@ -203,6 +207,8 @@
return "org.apache.geronimo.runtime.jetty.10";
} else if ("1.1".equals(version)) {
return "org.apache.geronimo.runtime.jetty.11";
+ } else if ("1.2".equals(version)) {
+ return "org.apache.geronimo.runtime.jetty.12";
}
return null;
}
Modified: geronimo/devtools/eclipse-plugin/branches/1.2.1/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/1.2.1/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerRuntimeTargetHandler.java?view=diff&rev=492707&r1=492706&r2=492707
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerRuntimeTargetHandler.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerRuntimeTargetHandler.java Thu Jan 4 11:53:56 2007
@@ -40,8 +40,10 @@
return Messages.target10runtime;
} else if(version.equals("1.1")) {
return Messages.target11runtime;
+ } else if(version.equals("1.2")) {
+ return Messages.target12runtime;
}
- return Messages.target11runtime;
+ return Messages.target12runtime;
}
/* (non-Javadoc)
@@ -73,6 +75,8 @@
} else {
list.add(JavaCore.newLibraryEntry(specPath, null, null));
}
+ } else if(version.equals("1.2")) {
+ //TODO Geronimo 1.2 Support
}
return (IClasspathEntry[])list.toArray(new IClasspathEntry[list.size()]);
Modified: geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/internal/Messages.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/internal/Messages.java?view=diff&rev=492707&r1=492706&r2=492707
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/internal/Messages.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/internal/Messages.java Thu Jan 4 11:53:56 2007
@@ -40,6 +40,7 @@
public static String target10runtime;
public static String target11runtime;
+ public static String target12runtime;
public static String incorrectVersion;
public static String noVersion;
Modified: geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/internal/Messages.properties
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/internal/Messages.properties?view=diff&rev=492707&r1=492706&r2=492707
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/internal/Messages.properties (original)
+++ geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/internal/Messages.properties Thu Jan 4 11:53:56 2007
@@ -25,6 +25,7 @@
target10runtime=Geronimo v1.0 Runtime
target11runtime=Geronimo v1.1 Runtime
+target11runtime=Geronimo v1.2 Runtime
incorrectVersion=An incorrect version of Geronimo was detected. Version {0} was expected, but version {1} was found.
noVersion=A geronimo installation was detected, however the version could not be verified.
Modified: geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.st.ui/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.st.ui/plugin.xml?view=diff&rev=492707&r1=492706&r2=492707
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.st.ui/plugin.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.st.ui/plugin.xml Thu Jan 4 11:53:56 2007
@@ -43,6 +43,12 @@
<image id="org.apache.geronimo.server.image"
icon="icons/obj16/littleG.gif"
typeIds="org.apache.geronimo.server.11"/>
+ <image id="org.apache.geronimo.runtime.image"
+ icon="icons/obj16/littleG.gif"
+ typeIds="org.apache.geronimo.runtime.12"/>
+ <image id="org.apache.geronimo.server.image"
+ icon="icons/obj16/littleG.gif"
+ typeIds="org.apache.geronimo.server.12"/>
</extension>
<extension point="org.eclipse.wst.server.ui.wizardFragments">
@@ -57,6 +63,12 @@
class="org.apache.geronimo.st.ui.internal.GeronimoRuntimeWizardFragment"/>
<fragment id="org.apache.geronimo.server.11"
typeIds="org.apache.geronimo.server.11"
+ class="org.apache.geronimo.st.ui.internal.GeronimoServerWizardFragment"/>
+ <fragment id="org.apache.geronimo.runtime.12"
+ typeIds="org.apache.geronimo.runtime.12"
+ class="org.apache.geronimo.st.ui.internal.GeronimoRuntimeWizardFragment"/>
+ <fragment id="org.apache.geronimo.server.12"
+ typeIds="org.apache.geronimo.server.12"
class="org.apache.geronimo.st.ui.internal.GeronimoServerWizardFragment"/>
</extension>
Modified: geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/pom.xml?view=diff&rev=492707&r1=492706&r2=492707
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/pom.xml Thu Jan 4 11:53:56 2007
@@ -123,6 +123,7 @@
<module>org.apache.geronimo.st.core</module>
<module>org.apache.geronimo.st.v1.core</module>
<module>org.apache.geronimo.st.v11.core</module>
+ <module>org.apache.geronimo.st.v12.core</module>
<module>org.apache.geronimo.st.ui</module>
<module>org.apache.geronimo.st.v1.ui</module>
<module>org.apache.geronimo.st.v11.ui</module>
@@ -135,6 +136,6 @@
<module>org.apache.geronimo.runtime.common</module>
<module>org.apache.geronimo.runtime.v1</module>
<module>org.apache.geronimo.runtime.v11</module>
- <!--<module>org.apache.geronimo.runtime.v12</module>-->
+ <module>org.apache.geronimo.runtime.v12</module>
</modules>
</project>
Modified: geronimo/devtools/eclipse-plugin/branches/1.2.1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/1.2.1/pom.xml?view=diff&rev=492707&r1=492706&r2=492707
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/1.2.1/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/1.2.1/pom.xml Thu Jan 4 11:53:56 2007
@@ -73,6 +73,7 @@
<org.apache.geronimo.st.core_version>1.1.0</org.apache.geronimo.st.core_version>
<org.apache.geronimo.st.v1.core_version>1.1.0</org.apache.geronimo.st.v1.core_version>
<org.apache.geronimo.st.v11.core_version>1.1.0</org.apache.geronimo.st.v11.core_version>
+ <org.apache.geronimo.st.v12.core_version>1.0.0</org.apache.geronimo.st.v12.core_version>
<org.apache.geronimo.st.ui_version>1.1.0</org.apache.geronimo.st.ui_version>
<org.apache.geronimo.st.v1.ui_version>1.1.0</org.apache.geronimo.st.v1.ui_version>
<org.apache.geronimo.st.v11.ui_version>1.1.0</org.apache.geronimo.st.v11.ui_version>