geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From de...@apache.org
Subject svn commit: r819870 - in /geronimo/devtools/eclipse-plugin/trunk/plugins: org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/editors/ org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/jaxb/ org.apache.geronimo...
Date Tue, 29 Sep 2009 09:44:09 GMT
Author: delos
Date: Tue Sep 29 09:44:09 2009
New Revision: 819870

URL: http://svn.apache.org/viewvc?rev=819870&view=rev
Log:
GERONIMODEVTOOLS-596 Geronimo 1.1.1 Server Adapter Error on GEP 2.2. Fix problem of saving
deployment plan, correct deployment plan, deployment namespace of ejb

Modified:
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/editors/AbstractGeronimoDeploymentPlanEditor.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/jaxb/NamespacePrefix.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/editors/GeronimoFormContentLoader.java

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/editors/AbstractGeronimoDeploymentPlanEditor.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/editors/AbstractGeronimoDeploymentPlanEditor.java?rev=819870&r1=819869&r2=819870&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/editors/AbstractGeronimoDeploymentPlanEditor.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/editors/AbstractGeronimoDeploymentPlanEditor.java
Tue Sep 29 09:44:09 2009
@@ -189,7 +189,10 @@
             try {
 				deploymentPlan = loadDeploymentPlan(fei.getFile());
 			} catch (Exception e1) {
-				throw new PartInitException("Error in loading deployment plan");
+				// throw new PartInitException("Error in loading deployment plan");
+				// if catching an exception , it will try to correct the plan 
+				// or open the plan with default editor
+				e1.printStackTrace();
 			}
             
             boolean fix = false;

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/jaxb/NamespacePrefix.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/jaxb/NamespacePrefix.java?rev=819870&r1=819869&r2=819870&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/jaxb/NamespacePrefix.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/jaxb/NamespacePrefix.java
Tue Sep 29 09:44:09 2009
@@ -39,11 +39,13 @@
         prefixMap.put("http://geronimo.apache.org/xml/ns/j2ee/application-1.1", "app");
         prefixMap.put("http://geronimo.apache.org/xml/ns/j2ee/application-client-1.1", "client");
         prefixMap.put("http://geronimo.apache.org/xml/ns/j2ee/connector-1.1", "conn");
-        prefixMap.put("http://openejb.apache.org/xml/ns/openejb-jar-2.1", "ejb");
-        prefixMap.put("http://openejb.apache.org/xml/ns/pkgen-2.0", "pkgen");
+        prefixMap.put("http://www.openejb.org/xml/ns/openejb-jar-2.1", "ejb");
+        prefixMap.put("http://www.openejb.org/xml/ns/pkgen-2.0", "pkgen");
         prefixMap.put("http://geronimo.apache.org/xml/ns/naming-1.1", "name");
         prefixMap.put("http://geronimo.apache.org/xml/ns/security-1.1", "sec");
         prefixMap.put("http://geronimo.apache.org/xml/ns/j2ee/web-1.1", "web");
+        prefixMap.put("http://www.openejb.org/xml/ns/corba-tss-config-2.0", "cbt");
+        prefixMap.put("http://www.openejb.org/xml/ns/corba-css-config-2.0", "cbc");
     }
 	
 	public static void processPrefix( Node parent ) {

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/editors/GeronimoFormContentLoader.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/editors/GeronimoFormContentLoader.java?rev=819870&r1=819869&r2=819870&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/editors/GeronimoFormContentLoader.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/editors/GeronimoFormContentLoader.java
Tue Sep 29 09:44:09 2009
@@ -18,7 +18,7 @@
 
 import javax.xml.bind.JAXBElement;
 
-import org.apache.geronimo.st.core.jaxb.JAXBUtils;
+import org.apache.geronimo.st.v11.core.jaxb.JAXBUtils;
 import org.apache.geronimo.st.ui.CommonMessages;
 import org.apache.geronimo.st.ui.editors.AbstractGeronimoDeploymentPlanEditor;
 import org.apache.geronimo.st.ui.editors.AbstractGeronimoFormContentLoader;



Mime
View raw message