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 2008/06/28 00:16:59 UTC

svn commit: r672410 - in /geronimo/devtools/eclipse-plugin/trunk/plugins: org.apache.geronimo.jee.v21.jaxbmodel/src/main/java/org/apache/geronimo/jee/application/ org.apache.geronimo.jee.v21.jaxbmodel/src/main/java/org/apache/geronimo/jee/applicationcl...

Author: mcconne
Date: Fri Jun 27 15:16:51 2008
New Revision: 672410

URL: http://svn.apache.org/viewvc?rev=672410&view=rev
Log:
GERONIMODEVTOOLS-395 Fix cases where changes to text fields in deployment plan editor(s) are not reflected back in the XML source -- Thanks to BJ Reed for this patch !!

Modified:
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/main/java/org/apache/geronimo/jee/application/Application.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/main/java/org/apache/geronimo/jee/applicationclient/ApplicationClient.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/main/java/org/apache/geronimo/jee/openejb/OpenejbJar.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/main/java/org/apache/geronimo/jee/security/Security.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/main/java/org/apache/geronimo/jee/web/WebApp.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/META-INF/MANIFEST.MF

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/main/java/org/apache/geronimo/jee/application/Application.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/main/java/org/apache/geronimo/jee/application/Application.java?rev=672410&r1=672409&r2=672410&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/main/java/org/apache/geronimo/jee/application/Application.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/main/java/org/apache/geronimo/jee/application/Application.java Fri Jun 27 15:16:51 2008
@@ -270,7 +270,10 @@
      *     
      */
     public void setApplicationName(java.lang.String value) {
-        this.applicationName = value;
+        if (value == null || value.length() == 0)
+            this.applicationName = null;
+        else
+            this.applicationName = value;
     }
 
 }

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/main/java/org/apache/geronimo/jee/applicationclient/ApplicationClient.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/main/java/org/apache/geronimo/jee/applicationclient/ApplicationClient.java?rev=672410&r1=672409&r2=672410&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/main/java/org/apache/geronimo/jee/applicationclient/ApplicationClient.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/main/java/org/apache/geronimo/jee/applicationclient/ApplicationClient.java Fri Jun 27 15:16:51 2008
@@ -425,7 +425,10 @@
      *     
      */
     public void setRealmName(String value) {
-        this.realmName = value;
+        if (value == null || value.length() == 0)
+            this.realmName = null;
+        else
+            this.realmName = value;
     }
 
     /**
@@ -449,7 +452,10 @@
      *     
      */
     public void setCallbackHandler(String value) {
-        this.callbackHandler = value;
+        if (value == null || value.length() == 0)
+            this.callbackHandler = null;
+        else
+            this.callbackHandler = value;
     }
 
     /**

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/main/java/org/apache/geronimo/jee/openejb/OpenejbJar.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/main/java/org/apache/geronimo/jee/openejb/OpenejbJar.java?rev=672410&r1=672409&r2=672410&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/main/java/org/apache/geronimo/jee/openejb/OpenejbJar.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/main/java/org/apache/geronimo/jee/openejb/OpenejbJar.java Fri Jun 27 15:16:51 2008
@@ -184,7 +184,10 @@
      *     
      */
     public void setEjbQlCompilerFactory(String value) {
-        this.ejbQlCompilerFactory = value;
+        if (value == null || value.length() == 0)
+            this.ejbQlCompilerFactory = null;
+        else
+            this.ejbQlCompilerFactory = value;
     }
 
     /**
@@ -208,7 +211,10 @@
      *     
      */
     public void setDbSyntaxFactory(String value) {
-        this.dbSyntaxFactory = value;
+        if (value == null || value.length() == 0)
+            this.dbSyntaxFactory = null;
+        else
+            this.dbSyntaxFactory = value;
     }
 
     /**

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/main/java/org/apache/geronimo/jee/security/Security.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/main/java/org/apache/geronimo/jee/security/Security.java?rev=672410&r1=672409&r2=672410&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/main/java/org/apache/geronimo/jee/security/Security.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/main/java/org/apache/geronimo/jee/security/Security.java Fri Jun 27 15:16:51 2008
@@ -212,7 +212,10 @@
      *     
      */
     public void setDefaultRole(String value) {
-        this.defaultRole = value;
+        if (value == null || value.length() == 0)
+            this.defaultRole = null;
+        else
+            this.defaultRole = value;
     }
 
     /**

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/main/java/org/apache/geronimo/jee/web/WebApp.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/main/java/org/apache/geronimo/jee/web/WebApp.java?rev=672410&r1=672409&r2=672410&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/main/java/org/apache/geronimo/jee/web/WebApp.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/main/java/org/apache/geronimo/jee/web/WebApp.java Fri Jun 27 15:16:51 2008
@@ -198,7 +198,10 @@
      *     
      */
     public void setContextRoot(String value) {
-        this.contextRoot = value;
+        if (value == null || value.length() == 0)
+            this.contextRoot = null;
+        else
+            this.contextRoot = value;
     }
 
     /**
@@ -222,7 +225,10 @@
      *     
      */
     public void setWorkDir(String value) {
-        this.workDir = value;
+        if (value == null || value.length() == 0)
+            this.workDir = null;
+        else
+            this.workDir = value;
     }
 
     /**
@@ -500,7 +506,10 @@
      *     
      */
     public void setSecurityRealmName(String value) {
-        this.securityRealmName = value;
+        if (value == null || value.length() == 0)
+            this.securityRealmName = null;
+        else
+            this.securityRealmName = value;
     }
 
     /**

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/META-INF/MANIFEST.MF?rev=672410&r1=672409&r2=672410&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/META-INF/MANIFEST.MF Fri Jun 27 15:16:51 2008
@@ -44,7 +44,6 @@
  org.apache.geronimo.kernel.config,
  org.apache.geronimo.kernel.config.xstream,
  org.apache.geronimo.kernel.lifecycle,
- org.apache.geronimo.kernel.log,
  org.apache.geronimo.kernel.management,
  org.apache.geronimo.kernel.proxy,
  org.apache.geronimo.kernel.repository,