geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From de...@apache.org
Subject svn commit: r817996 [23/23] - in /geronimo/devtools/eclipse-plugin/trunk: assembly/ assembly/src/main/assembly/ features/ features/org.apache.geronimo.v22.feature/ plugins/ plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/ plugins/org.apache.geronimo.j2e...
Date Wed, 23 Sep 2009 08:04:34 GMT
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=817996&r1=817995&r2=817996&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 Sep 23 08:04:12 2009
@@ -17,6 +17,7 @@
 package org.apache.geronimo.st.v21.core.internal;
 
 import org.apache.geronimo.st.v21.core.Activator;
+import org.eclipse.core.runtime.IStatus;
 
 /**
  * Helper class to route trace output.
@@ -76,6 +77,7 @@
         System.out.println(Activator.PLUGIN_ID + ":  " + s);
         if (t != null)
             t.printStackTrace();
+        
     }
 
     /**

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/operations/V21DeploymentPlanCreationOperation.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/operations/V21DeploymentPlanCreationOperation.java?rev=817996&r1=817995&r2=817996&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/operations/V21DeploymentPlanCreationOperation.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/operations/V21DeploymentPlanCreationOperation.java
Wed Sep 23 08:04:12 2009
@@ -69,7 +69,7 @@
 	 * 
 	 * @see org.apache.geronimo.st.core.operations.IDeploymentPlanCreationOp#createGeronimoApplicationDeploymentPlan(org.eclipse.core.resources.IFile)
 	 */
-	public JAXBElement createGeronimoApplicationDeploymentPlan(IFile dpFile) {
+	public JAXBElement createGeronimoApplicationDeploymentPlan(IFile dpFile) throws Exception
{
 		Trace.tracePoint("Entry",
 				"V21DeploymentPlanCreationOperation.createGeronimoApplicationDeploymentPlan", dpFile);
 
@@ -93,7 +93,7 @@
 	 * 
 	 * @see org.apache.geronimo.st.core.operations.IDeploymentPlanCreationOp#createGeronimoWebDeploymentPlan(org.eclipse.core.resources.IFile)
 	 */
-	public JAXBElement createGeronimoWebDeploymentPlan(IFile dpFile) {
+	public JAXBElement createGeronimoWebDeploymentPlan(IFile dpFile) throws Exception {
   		Trace.tracePoint("Entry", "V21DeploymentPlanCreationOperation.createGeronimoWebDeploymentPlan",
 				dpFile, dpFile.getFullPath());
 
@@ -116,7 +116,7 @@
 	 * 
 	 * @see org.apache.geronimo.st.core.operations.IDeploymentPlanCreationOp#createOpenEjbDeploymentPlan(org.eclipse.core.resources.IFile)
 	 */
-	public JAXBElement createOpenEjbDeploymentPlan(IFile dpFile) {
+	public JAXBElement createOpenEjbDeploymentPlan(IFile dpFile) throws Exception {
   		Trace.tracePoint("Entry", "V21DeploymentPlanCreationOperation.createOpenEjbDeploymentPlan",
dpFile);
 
 		org.apache.geronimo.jee.openejb.ObjectFactory ejbFactory = new org.apache.geronimo.jee.openejb.ObjectFactory();
@@ -137,7 +137,7 @@
 	 * 
 	 * @see org.apache.geronimo.st.core.operations.IDeploymentPlanCreationOp#createConnectorDeploymentPlan(org.eclipse.core.resources.IFile)
 	 */
-	public JAXBElement createConnectorDeploymentPlan(IFile dpFile) {
+	public JAXBElement createConnectorDeploymentPlan(IFile dpFile) throws Exception {
   		Trace.tracePoint("Entry", "V21DeploymentPlanCreationOperation.createConnectorDeploymentPlan",
dpFile);
 
 		org.apache.geronimo.jee.connector.ObjectFactory connectorFactory = new org.apache.geronimo.jee.connector.ObjectFactory();
@@ -160,7 +160,7 @@
 	 * 
 	 * @see org.apache.geronimo.st.core.operations.IDeploymentPlanCreationOp#createGeronimoApplicationDeploymentPlan(org.eclipse.core.resources.IFile)
 	 */
-	public JAXBElement createGeronimoApplicationClientDeploymentPlan(IFile dpFile) {
+	public JAXBElement createGeronimoApplicationClientDeploymentPlan(IFile dpFile) throws Exception
{
 		Trace.tracePoint("Entry","V21DeploymentPlanCreationOperation.createGeronimoApplicationClientDeploymentPlan",
dpFile);
 
 		org.apache.geronimo.jee.applicationclient.ObjectFactory applicationClientFactory = new
org.apache.geronimo.jee.applicationclient.ObjectFactory();

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/plugin.xml?rev=817996&r1=817995&r2=817996&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/plugin.xml
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/plugin.xml
Wed Sep 23 08:04:12 2009
@@ -51,5 +51,15 @@
             class="org.apache.geronimo.st.v21.ui.sections.ServerPluginSection">
         </section>
     </extension>
+    <extension
+          point="org.eclipse.debug.core.statusHandlers">
+       <statusHandler
+	   id="com.example.ExampleIdentifier"
+	   class="com.example.ExampleStatusHandler"
+	   plugin="com.example.ExamplePluginId"
+	   code="123">
+  </statusHandler>
+
+    </extension>
 
 </plugin>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/Activator.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/Activator.java?rev=817996&r1=817995&r2=817996&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/Activator.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/Activator.java
Wed Sep 23 08:04:12 2009
@@ -79,4 +79,5 @@
 	public static ImageDescriptor getImageDescriptor(String path) {
 		return AbstractUIPlugin.imageDescriptorFromPlugin("org.apache.geronimo.st.v21.ui", path);
 	}
+	
 }

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/editors/GeronimoFormContentLoader.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/editors/GeronimoFormContentLoader.java?rev=817996&r1=817995&r2=817996&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/editors/GeronimoFormContentLoader.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/editors/GeronimoFormContentLoader.java
Wed Sep 23 08:04:12 2009
@@ -111,11 +111,11 @@
      * 
      * @see org.apache.geronimo.st.ui.editors.IGeronimoFormContentLoader#loadDeploymentPlan(org.eclipse.core.resources.IFile)
      */
-    public JAXBElement loadDeploymentPlan(IFile file) {
+    public JAXBElement loadDeploymentPlan(IFile file) throws Exception {
         return GeronimoV21Utils.getDeploymentPlan(file);
     }
     
-    public void saveDeploymentPlan(JAXBElement deploymentPlan, IFile file) throws IOException,
JAXBException {
+    public void saveDeploymentPlan(JAXBElement deploymentPlan, IFile file) throws Exception
{
         JAXBUtils.marshalDeploymentPlan(deploymentPlan, file);
     }
 

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=817996&r1=817995&r2=817996&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 Sep 23 08:04:12 2009
@@ -17,6 +17,7 @@
 package org.apache.geronimo.st.v21.ui.internal;
 
 import org.apache.geronimo.st.v21.ui.Activator;
+import org.eclipse.core.runtime.IStatus;
 
 /**
  * Helper class to route trace output.

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/SecurityRoleMappingSection.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/sections/SecurityRoleMappingSection.java?rev=817996&r1=817995&r2=817996&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/SecurityRoleMappingSection.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/SecurityRoleMappingSection.java
Wed Sep 23 08:04:12 2009
@@ -39,11 +39,13 @@
 import org.apache.geronimo.st.v21.ui.Activator;
 import org.apache.geronimo.st.v21.ui.wizards.SecurityRoleMappingWizard;
 import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.TreeItem;
 import org.eclipse.ui.forms.widgets.FormToolkit;
 
@@ -112,7 +114,11 @@
         TreeItem selectedItem = tree.getSelection()[0];
         Object selectedObject = selectedItem.getData();
         Role role = (Role) selectedItem.getParentItem().getData();
-        ((ArrayList) JAXBUtils.getValue(role, selectedObject.getClass().getSimpleName())).remove(selectedObject);
+        try {
+			((ArrayList) JAXBUtils.getValue(role, selectedObject.getClass().getSimpleName())).remove(selectedObject);
+		} catch (Exception e) {
+			MessageDialog.openError(Display.getCurrent().getActiveShell(),"Error", e.getMessage());
+		}
     }
 
     public Role getSelectedObject() {

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ExtModuleWizard.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/wizards/ExtModuleWizard.java?rev=817996&r1=817995&r2=817996&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ExtModuleWizard.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ExtModuleWizard.java
Wed Sep 23 08:04:12 2009
@@ -30,6 +30,7 @@
 import org.apache.geronimo.jee.application.ExtModule;
 import org.apache.geronimo.jee.application.Path;
 import org.apache.geronimo.jee.deployment.Pattern;
+import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -37,6 +38,7 @@
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Group;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
@@ -196,7 +198,12 @@
                     }
                     else if (i > 2 && extModule.getExternalPath() != null) {
                         Pattern pattern = extModule.getExternalPath();
-                        String value = (String) JAXBUtils.getValue(pattern,getTableColumnEAttributes()[i]);
+                        String value;
+						try {
+							value = (String) JAXBUtils.getValue(pattern,getTableColumnEAttributes()[i]);
+						} catch (Exception e1) {
+							value = e1.getMessage();
+						}
                         if (value != null) {
                             text.setText(value);
                         }
@@ -307,7 +314,11 @@
             for (int i = 2; i < 6; i++) {
                 String value = page.getTextEntry(i).getText();
                 String attribute = getTableColumnEAttributes()[i + 1];
-                JAXBUtils.setValue(pattern, attribute, value);
+                try {
+					JAXBUtils.setValue(pattern, attribute, value);
+				} catch (Exception e) {
+					MessageDialog.openError(Display.getCurrent().getActiveShell(),"Error", e.getMessage());
+				}
             }
             extModule.setInternalPath(null);
         }

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/MessageDestWizard.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/wizards/MessageDestWizard.java?rev=817996&r1=817995&r2=817996&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/MessageDestWizard.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/MessageDestWizard.java
Wed Sep 23 08:04:12 2009
@@ -29,9 +29,11 @@
 import org.apache.geronimo.st.v21.core.jaxb.JAXBObjectFactoryImpl;
 import org.apache.geronimo.jee.naming.MessageDestination;
 import org.apache.geronimo.jee.naming.Pattern;
+import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
@@ -99,14 +101,24 @@
                     if (i > 2) {
                         // get the pattern value
                         Pattern pattern = ((MessageDestination) eObject).getPattern();
-                        String value = (String) JAXBUtils.getValue(pattern,getTableColumnEAttributes()[i]);
+                        String value = null;
+						try {
+							value = (String) JAXBUtils.getValue(pattern,getTableColumnEAttributes()[i]);
+						} catch (Exception e) {
+							MessageDialog.openError(Display.getCurrent().getActiveShell(),"Error", e.getMessage());
+						}
                         if (value != null) {
                             text.setText(value);
                         }                        
                     }
                     else
                     {
-                        String value = (String) JAXBUtils.getValue(eObject,getTableColumnEAttributes()[i]);
+                        String value = null;
+						try {
+							value = (String) JAXBUtils.getValue(eObject,getTableColumnEAttributes()[i]);
+						} catch (Exception e) {
+							MessageDialog.openError(Display.getCurrent().getActiveShell(),"Error", e.getMessage());
+						}
                         if (value != null) {
                             text.setText(value);
                         }
@@ -156,9 +168,17 @@
             String value = page.getTextEntry(i).getText();
             String attribute = getTableColumnEAttributes()[i];
             if (i < 3)
-                JAXBUtils.setValue(eObject, attribute, value);
-            else
-                JAXBUtils.setValue(msgPattern, attribute, value);
+				try {
+					JAXBUtils.setValue(eObject, attribute, value);
+				} catch (Exception e) {
+					MessageDialog.openError(Display.getCurrent().getActiveShell(),"Error", e.getMessage());
+				}
+			else
+				try {
+					JAXBUtils.setValue(msgPattern, attribute, value);
+				} catch (Exception e) {
+					MessageDialog.openError(Display.getCurrent().getActiveShell(),"Error", e.getMessage());
+				}
         }
         
         if (section.getViewer().getInput() == section.getPlan()) {

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml?rev=817996&r1=817995&r2=817996&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml Wed Sep 23 08:04:12 2009
@@ -135,16 +135,21 @@
     </build>
     <modules>
         <module>org.apache.geronimo.jee.v21.jaxbmodel</module>
+        <module>org.apache.geronimo.j2ee.v11.jaxbmodel</module>
         <module>org.apache.geronimo.st.core</module>
+        <module>org.apache.geronimo.st.v11.core</module>
         <module>org.apache.geronimo.st.v20.core</module>
         <module>org.apache.geronimo.st.v21.core</module>
         <module>org.apache.geronimo.st.v22.core</module>
         <module>org.apache.geronimo.st.ui</module>
+        <module>org.apache.geronimo.st.v11.schemas</module>
         <module>org.apache.geronimo.st.schemas</module>
+				<module>org.apache.geronimo.st.v11.ui</module>       
         <module>org.apache.geronimo.st.v20.ui</module>
         <module>org.apache.geronimo.st.v21.ui</module>
         <module>org.apache.geronimo.st.v22.ui</module>
         <module>org.apache.geronimo.runtime.common</module>
+				<module>org.apache.geronimo.runtime.v11</module>
         <module>org.apache.geronimo.runtime.v20</module>
         <module>org.apache.geronimo.runtime.v21</module>
         <module>org.apache.geronimo.runtime.v22</module>



Mime
View raw message