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 2010/05/05 05:36:09 UTC
svn commit: r941142 - in /geronimo/devtools/eclipse-plugin/trunk: ./
plugins/org.apache.geronimo.runtime.common/
plugins/org.apache.geronimo.runtime.common/META-INF/
plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/internal...
Author: mcconne
Date: Wed May 5 03:36:08 2010
New Revision: 941142
URL: http://svn.apache.org/viewvc?rev=941142&view=rev
Log:
Fix v30 JAXB problems
Added:
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/jaxb/JAXBUtilsProvider.java
- copied, changed from r941133, geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/jaxb/JAXB21Utils.java
Removed:
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/jaxb/JAXB21Utils.java
Modified:
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/.classpath
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/META-INF/MANIFEST.MF
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/internal/Trace.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/plugin.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/Trace.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/internal/Trace.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/internal/Trace.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/internal/Trace.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/internal/Trace.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/plugin.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/internal/Trace.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/plugin.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/internal/Trace.java
geronimo/devtools/eclipse-plugin/trunk/pom.xml
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/.classpath
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/.classpath?rev=941142&r1=941141&r2=941142&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/.classpath (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/.classpath Wed May 5 03:36:08 2010
@@ -24,6 +24,6 @@
<classpathentry exported="true" kind="lib" path="lib/geronimo-activation_1.1_spec-1.0.3-SNAPSHOT.jar"/>
<classpathentry exported="true" kind="lib" path="lib/geronimo-j2ee-deployment_1.1_spec-1.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/geronimo-stax-api_1.0_spec-1.0.1.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/jaxb-api-2.2.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/jaxb-impl-2.2.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/jaxb-api-2.0.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/jaxb-impl-2.0.5.jar"/>
</classpath>
\ No newline at end of file
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/META-INF/MANIFEST.MF?rev=941142&r1=941141&r2=941142&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/META-INF/MANIFEST.MF Wed May 5 03:36:08 2010
@@ -7,8 +7,8 @@ Bundle-ClassPath:
lib/geronimo-j2ee-deployment_1.1_spec-1.1.jar,
lib/commons-logging-1.1.1.jar,
lib/cglib-nodep-2.1_3.jar,
- lib/jaxb-api-2.2.jar,
- lib/jaxb-impl-2.2.jar,
+ lib/jaxb-api-2.0.jar,
+ lib/jaxb-impl-2.0.5.jar,
lib/geronimo-stax-api_1.0_spec-1.0.1.jar,
lib/geronimo-activation_1.1_spec-1.0.3-SNAPSHOT.jar
Export-Package:
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/internal/Trace.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/Trace.java?rev=941142&r1=941141&r2=941142&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/internal/Trace.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/internal/Trace.java Wed May 5 03:36:08 2010
@@ -26,91 +26,90 @@ import org.eclipse.core.runtime.IStatus;
*/
public class Trace {
- /**
- * Finest trace event.
- */
- public static byte INFO = 0;
-
- /**
- * Warning trace event.
- */
- public static byte WARNING = 1;
-
- /**
- * Severe trace event.
- */
- public static byte SEVERE = 2;
-
- /**
- * Trace constructor comment.
- */
- private Trace() {
- super();
- }
-
- /**
- * Trace the given text.
- *
- * @param level
- * the trace level
- * @param s
- * a message
- */
- public static void trace(byte level, String s) {
- trace(level, s, null, false);
- }
-
- public static void trace(byte level, String s, boolean newLine) {
- trace(level, s, null, newLine);
- }
-
- public static void trace(byte level, String s, Throwable t) {
- trace(level, s, null, false);
- }
-
- public static void trace(byte level, String s, Throwable t, boolean newLine) {
- if (Activator.getDefault() == null
- || !Activator.getDefault().isDebugging())
- return;
-
- if (newLine) {
- System.out.println();
- }
-
- System.out.println(Activator.PLUGIN_ID + ": " + s);
- if (t != null)
- t.printStackTrace();
- }
-
- /**
- * Trace the given message
- *
- * @param tracePoint
- * The trace point (e.g., "Exit", "Entry", "Constructor", etc....
- *
- * @param classDotMethod
- * The class name + method name (e.g., "Class.method()")
- *
- * @param parms
- * Method parameter(s) if the trace point is an "Entry" or Return
- * value if the trace point is an "Exit"
- */
- public static void tracePoint(String tracePoint, String classDotMethod) {
- trace(Trace.INFO, tracePoint + ": " + classDotMethod + "()");
- }
-
- public static void tracePoint(String tracePoint, String classDotMethod,
- Object... parms) {
- if (parms == null) {
- trace(Trace.INFO, tracePoint + ": " + classDotMethod + "( null )");
- } else {
- trace(Trace.INFO, tracePoint + ": " + classDotMethod + "(");
- for (int ii = 0; ii < parms.length; ii++) {
- Object parm = parms[ii];
- trace(Trace.INFO, " parm" + (ii + 1) + "=["
- + (parm == null ? null : parm.toString()) + "]");
- }
- trace(Trace.INFO, ")");
- }
- }
+ /**
+ * Finest trace event.
+ */
+ public static byte INFO = 0;
+
+ /**
+ * Warning trace event.
+ */
+ public static byte WARNING = 1;
+
+ /**
+ * Severe trace event.
+ */
+ public static byte SEVERE = 2;
+
+ /**
+ * Trace constructor comment.
+ */
+ private Trace() {
+ super();
+ }
+
+ /**
+ * Trace the given text.
+ *
+ * @param level
+ * the trace level
+ * @param s
+ * a message
+ */
+ public static void trace(byte level, String s) {
+ trace(level, s, null, false);
+ }
+
+ public static void trace(byte level, String s, boolean newLine) {
+ trace(level, s, null, newLine);
+ }
+
+ public static void trace(byte level, String s, Throwable t) {
+ trace(level, s, null, false);
+ }
+
+ public static void trace(byte level, String s, Throwable t, boolean newLine) {
+ if (Activator.getDefault() == null || !Activator.getDefault().isDebugging())
+ return;
+
+ if (newLine) {
+ System.out.println();
+ }
+
+ System.out.println(Activator.PLUGIN_ID + ": " + s);
+ if (t != null)
+ t.printStackTrace();
+ }
+
+ /**
+ * Trace the given message
+ *
+ * @param tracePoint
+ * The trace point (e.g., "Exit", "Entry", "Constructor", etc....
+ *
+ * @param classDotMethod
+ * The class name + method name (e.g., "Class.method()")
+ *
+ * @param parms
+ * Method parameter(s) if the trace point is an "Entry" or Return
+ * value if the trace point is an "Exit"
+ */
+ public static void tracePoint(String tracePoint, String classDotMethod) {
+ trace(Trace.INFO, tracePoint + ": " + classDotMethod + "()");
+ }
+
+ public static void tracePoint(String tracePoint, String classDotMethod,
+ Object... parms) {
+ if (parms == null) {
+ trace(Trace.INFO, tracePoint + ": " + classDotMethod + "( null )");
+ } else {
+ trace(Trace.INFO, tracePoint + ": " + classDotMethod + "(");
+ for (int ii = 0; ii < parms.length; ii++) {
+ Object parm = parms[ii];
+ trace(Trace.INFO, " parm" + (ii + 1) + "=["
+ + (parm == null ? null : parm.toString()) + "]");
+ }
+ trace(Trace.INFO, ")");
+ }
+ }
}
\ No newline at end of file
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/plugin.xml?rev=941142&r1=941141&r2=941142&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/plugin.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/plugin.xml Wed May 5 03:36:08 2010
@@ -21,7 +21,7 @@
<plugin>
- <extension-point id="loader" name="Source Path Computer Mapping" schema="schema/loader.exsd"/>
+ <extension-point id="loader" name="Geronimo Deployment Plan Form Loader" schema="schema/loader.exsd"/>
<extension-point id="actionURLs" name="Action ID and URL" schema="schema/actionURLs.exsd"/>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/Trace.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/Trace.java?rev=941142&r1=941141&r2=941142&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/Trace.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/Trace.java Wed May 5 03:36:08 2010
@@ -72,7 +72,7 @@ public class Trace {
* a throwable
*/
public static void trace(byte level, String s, Throwable t) {
- if (!Activator.getDefault().isDebugging())
+ if (Activator.getDefault() == null || !Activator.getDefault().isDebugging())
return;
System.out.println(Activator.PLUGIN_ID + ": " + s);
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/internal/Trace.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/internal/Trace.java?rev=941142&r1=941141&r2=941142&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/internal/Trace.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/internal/Trace.java Wed May 5 03:36:08 2010
@@ -25,60 +25,60 @@ import org.apache.geronimo.st.v11.core.A
*/
public class Trace {
- /**
- * Finest trace event.
- */
- public static byte INFO = 0;
-
- /**
- * Warning trace event.
- */
- public static byte WARNING = 1;
-
- /**
- * Severe trace event.
- */
- public static byte SEVERE = 2;
-
- /**
- * Trace constructor comment.
- */
- private Trace() {
- super();
- }
-
- /**
- * Trace the given text.
- *
- * @param level
- * the trace level
- * @param s
- * a message
- */
- public static void trace(byte level, String s) {
- trace(level, s, null);
- }
-
- /**
- * Trace the given message and exception.
- *
- * @param level
- * the trace level
- * @param s
- * a message
- * @param t
- * a throwable
- */
- public static void trace(byte level, String s, Throwable t) {
- if (!Activator.getDefault().isDebugging())
- return;
-
- System.out.println(Activator.PLUGIN_ID + ": " + s);
- if (t != null)
- t.printStackTrace();
- }
-
- /**
+ /**
+ * Finest trace event.
+ */
+ public static byte INFO = 0;
+
+ /**
+ * Warning trace event.
+ */
+ public static byte WARNING = 1;
+
+ /**
+ * Severe trace event.
+ */
+ public static byte SEVERE = 2;
+
+ /**
+ * Trace constructor comment.
+ */
+ private Trace() {
+ super();
+ }
+
+ /**
+ * Trace the given text.
+ *
+ * @param level
+ * the trace level
+ * @param s
+ * a message
+ */
+ public static void trace(byte level, String s) {
+ trace(level, s, null);
+ }
+
+ /**
+ * Trace the given message and exception.
+ *
+ * @param level
+ * the trace level
+ * @param s
+ * a message
+ * @param t
+ * a throwable
+ */
+ public static void trace(byte level, String s, Throwable t) {
+ if (Activator.getDefault() == null || !Activator.getDefault().isDebugging())
+ return;
+
+ System.out.println(Activator.PLUGIN_ID + ": " + s);
+ if (t != null)
+ t.printStackTrace();
+ }
+
+ /**
* Trace the given message
*
* @param tracePoint
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/internal/Trace.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/internal/Trace.java?rev=941142&r1=941141&r2=941142&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/internal/Trace.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/internal/Trace.java Wed May 5 03:36:08 2010
@@ -70,7 +70,7 @@ public class Trace {
* a throwable
*/
public static void trace(byte level, String s, Throwable t) {
- if (!Activator.getDefault().isDebugging())
+ if (Activator.getDefault() == null || !Activator.getDefault().isDebugging())
return;
System.out.println(Activator.PLUGIN_ID + ": " + s);
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/internal/Trace.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/internal/Trace.java?rev=941142&r1=941141&r2=941142&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/internal/Trace.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/internal/Trace.java Wed May 5 03:36:08 2010
@@ -71,7 +71,7 @@ public class Trace {
* a throwable
*/
public static void trace(byte level, String s, Throwable t) {
- if (!Activator.getDefault().isDebugging())
+ if (Activator.getDefault() == null || !Activator.getDefault().isDebugging())
return;
System.out.println(Activator.PLUGIN_ID + ": " + s);
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/internal/Trace.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/internal/Trace.java?rev=941142&r1=941141&r2=941142&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/internal/Trace.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/internal/Trace.java Wed May 5 03:36:08 2010
@@ -71,7 +71,7 @@ public class Trace {
* a throwable
*/
public static void trace(byte level, String s, Throwable t) {
- if (!Activator.getDefault().isDebugging())
+ if (Activator.getDefault() == null || !Activator.getDefault().isDebugging())
return;
System.out.println(Activator.PLUGIN_ID + ": " + s);
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/plugin.xml?rev=941142&r1=941141&r2=941142&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/plugin.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/plugin.xml Wed May 5 03:36:08 2010
@@ -418,4 +418,18 @@
</operationExtension>
</extension>
+
+
+ <!--
+ ###################################################################################################################
+ ## ##
+ ## Geronimo JAXB Utils - Define the JAXB Utils Provider for this plugin and the corresponding ui plugin ##
+ ## ##
+ ###################################################################################################################
+ -->
+ <extension-point id="JAXBUtilsProvider" name="Geronimo JAXB Utils" schema="schema/JAXBUtilsProvider.exsd"/>
+ <extension point="org.apache.geronimo.st.v30.core.JAXBUtilsProvider">
+ <provider class="org.apache.geronimo.st.v30.core.jaxb.JAXBUtilsProvider" version="3.0"/>
+ </extension>
+
</plugin>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/internal/Trace.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/internal/Trace.java?rev=941142&r1=941141&r2=941142&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/internal/Trace.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/internal/Trace.java Wed May 5 03:36:08 2010
@@ -71,7 +71,7 @@ public class Trace {
* a throwable
*/
public static void trace(byte level, String s, Throwable t) {
- if (!Activator.getDefault().isDebugging())
+ if (Activator.getDefault() == null || !Activator.getDefault().isDebugging())
return;
System.out.println(Activator.PLUGIN_ID + ": " + s);
Copied: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/jaxb/JAXBUtilsProvider.java (from r941133, geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/jaxb/JAXB21Utils.java)
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/jaxb/JAXBUtilsProvider.java?p2=geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/jaxb/JAXBUtilsProvider.java&p1=geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/jaxb/JAXB21Utils.java&r1=941133&r2=941142&rev=941142&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/jaxb/JAXB21Utils.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/jaxb/JAXBUtilsProvider.java Wed May 5 03:36:08 2010
@@ -58,13 +58,13 @@ import org.xml.sax.SAXException;
/**
* @version $Rev$ $Date$
*/
-public class JAXB21Utils implements IJAXBUtilsProvider{
+public class JAXBUtilsProvider implements IJAXBUtilsProvider{
// JAXBContext instantiation is costly - must be done only once!
private static final JAXBContext jaxbContext = newJAXBContext();
private static final JAXBContext jaxbPluginContext = newJAXBPluginContext();
private static final MarshallerListener marshallerListener = new MarshallerListener();
- //private static JAXB21Utils _instance = new JAXB21Utils();
+ //private static JAXBUtilsProvider _instance = new JAXBUtilsProvider();
private static JAXBContext newJAXBContext() {
try {
@@ -85,10 +85,10 @@ public class JAXB21Utils implements IJAX
return null;
}
- /*private JAXB21Utils(){
+ /*private JAXBUtilsProvider(){
}
- public static JAXB21Utils getInstance(){
+ public static JAXBUtilsProvider getInstance(){
return _instance;
}*/
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/plugin.xml?rev=941142&r1=941141&r2=941142&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/plugin.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/plugin.xml Wed May 5 03:36:08 2010
@@ -258,8 +258,8 @@
<!--
###################################################################################################################
## ##
- ## Geronimo XML Editors - Define the Web editor class for the various Geronimo-specific XML files (except for ##
- ## geronimo-application-client.xml) ##
+ ## Geronimo XML Editors - Define the XML editor class for the various Geronimo-specific XML files (except for ##
+ ## geronimo-application-client.xml) and the corresponding Form editor ##
## ##
###################################################################################################################
-->
@@ -272,12 +272,13 @@
geronimo-application-client.xml,
geronimo-ra.xml"
icon="icons/obj16/littleG.gif"
- id="org.apache.geronimo.ui.editors.WebEditor"
+ id="org.apache.geronimo.v30.ui.editors.WebEditor"
name="%deploymentPlanEditorName">
</editor>
</extension>
- <extension point="org.apache.geronimo.st.ui.loader">
+ <extension-point id="loader" name="Geronimo Deployment Plan Form Loader" schema="schema/loader.exsd"/>
+ <extension point="org.apache.geronimo.st.v30.ui.loader">
<loader class="org.apache.geronimo.st.v30.ui.editors.GeronimoFormContentLoader" version="3.0"/>
</extension>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/internal/Trace.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/internal/Trace.java?rev=941142&r1=941141&r2=941142&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/internal/Trace.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/internal/Trace.java Wed May 5 03:36:08 2010
@@ -71,7 +71,7 @@ public class Trace {
* a throwable
*/
public static void trace(byte level, String s, Throwable t) {
- if (!Activator.getDefault().isDebugging())
+ if (Activator.getDefault() == null || !Activator.getDefault().isDebugging())
return;
System.out.println(Activator.PLUGIN_ID + ": " + s);
Modified: geronimo/devtools/eclipse-plugin/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/pom.xml?rev=941142&r1=941141&r2=941142&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/pom.xml Wed May 5 03:36:08 2010
@@ -104,10 +104,18 @@
<scope>compile</scope>
</dependency>
+ <!--
+ ###########################################################################################################
+ ## ##
+ ## Upgrade the jaxb-api and jaxb-impl dependencies with care as the 2.2 versions will result in these ##
+ ## exceptions: com.sun.xml.bind.v2.runtime.IllegalAnnotationsException ##
+ ## ##
+ ###########################################################################################################
+ -->
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
- <version>2.2</version>
+ <version>2.0</version>
<exclusions>
<exclusion>
<groupId>javax.xml.bind</groupId>
@@ -119,13 +127,13 @@
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-xjc</artifactId>
- <version>2.2</version>
+ <version>2.0.5</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
- <version>2.2</version>
+ <version>2.0.5</version>
<exclusions>
<exclusion>
<groupId>javax.xml.bind</groupId>