geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From de...@apache.org
Subject svn commit: r952535 [26/26] - in /geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins: org.apache.geronimo.j2ee.v11.jaxbmodel/ org.apache.geronimo.j2ee.v11.jaxbmodel/META-INF/ org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo...
Date Tue, 08 Jun 2010 04:40:28 GMT
Added: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/ServerEditorTestEnvSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/ServerEditorTestEnvSection.java?rev=952535&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/ServerEditorTestEnvSection.java
(added)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/ServerEditorTestEnvSection.java
Tue Jun  8 04:40:16 2010
@@ -0,0 +1,251 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.st.v21.ui.sections;
+
+import java.util.List;
+
+import org.apache.geronimo.st.core.ClasspathContainersHelper;
+import org.apache.geronimo.st.v21.core.GeronimoServerBehaviourDelegate;
+import org.apache.geronimo.st.v21.ui.commands.SetClasspathContainersCommand;
+import org.apache.geronimo.st.v21.ui.commands.SetInPlaceSharedLibCommand;
+import org.apache.geronimo.st.v21.ui.commands.SetNotRedeployJSPFilesCommand;
+import org.apache.geronimo.st.v21.ui.commands.SetRunFromWorkspaceCommand;
+import org.apache.geronimo.st.v21.ui.commands.SetSelectClasspathContainersCommand;
+import org.apache.geronimo.st.ui.internal.Messages;
+import org.apache.geronimo.st.ui.internal.Trace;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.CheckStateChangedEvent;
+import org.eclipse.jface.viewers.CheckboxTableViewer;
+import org.eclipse.jface.viewers.ICheckStateListener;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.layout.GridData;
+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.ui.forms.widgets.ExpandableComposite;
+import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.eclipse.ui.forms.widgets.Section;
+import org.eclipse.wst.server.core.IServer;
+import org.eclipse.wst.server.core.util.SocketUtil;
+
+/**
+ * @version $Rev: 797732 $ $Date: 2009-07-25 17:42:04 +0800 (Sat, 25 Jul 2009) $
+ */
+public class ServerEditorTestEnvSection extends AbstractServerEditorSection {
+
+    // SWT widget(s)
+    private Button runFromWorkspace;
+    private Button noRedeployJSPFiles;
+    private Button inPlaceSharedLib;
+    private Button selectClasspathContainers = null;
+    private Composite composite = null;
+
+    // Form widget(s)
+    private FormToolkit toolkit;
+
+    // JFace viewer(s)
+    private CheckboxTableViewer checkbox;
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.eclipse.wst.server.ui.editor.ServerEditorSection#createSection(org.eclipse.swt.widgets.Composite)
+     */
+    public void createSection(Composite parent) {
+        super.createSection(parent);
+
+        Trace.tracePoint("ENTRY", "ServerEditorTestEnvSection.createSection", parent);
+
+        toolkit = getFormToolkit(parent.getDisplay());
+
+        Section section = toolkit.createSection(parent, ExpandableComposite.TWISTIE
+                                                | ExpandableComposite.EXPANDED
+                                                | ExpandableComposite.TITLE_BAR
+                                                | Section.DESCRIPTION | ExpandableComposite.FOCUS_TITLE);
+
+        section.setText(Messages.editorSectionTestEnvTitle);
+        section.setDescription(Messages.editorSectionTestEnvDescription);
+        section.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false));
+
+        composite = toolkit.createComposite(section);
+        GridLayout layout = new GridLayout();
+        layout.numColumns = 1;
+        layout.marginHeight = 5;
+        layout.marginWidth = 10;
+        layout.verticalSpacing = 5;
+        layout.horizontalSpacing = 15;
+        composite.setLayout(layout);
+        composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
+        section.setClient(composite);
+
+        //
+        // inPlaceSharedLib Button
+        //
+        inPlaceSharedLib = toolkit.createButton(composite, Messages.editorSectionSharedLibrariesInPlace,
SWT.CHECK);
+        inPlaceSharedLib.setSelection(gs.isInPlaceSharedLib());
+        inPlaceSharedLib.addSelectionListener(new SelectionListener() {
+
+            public void widgetSelected(SelectionEvent e) {
+                execute(new SetInPlaceSharedLibCommand(server, inPlaceSharedLib.getSelection()));
+            }
+
+            public void widgetDefaultSelected(SelectionEvent e) {
+            }
+
+        });
+        
+        //
+        // Don't redeploy JSP files Button
+        //
+        noRedeployJSPFiles = toolkit.createButton(composite, Messages.editorSectionNotRedeployJSPFiles,
SWT.CHECK);
+        noRedeployJSPFiles.setSelection(gs.isNotRedeployJSPFiles());
+        
+        noRedeployJSPFiles.setEnabled(!(server.getServerType().supportsRemoteHosts()
+                && !SocketUtil.isLocalhost(server.getHost()))&&gs.getServer().getServerState()==IServer.STATE_STOPPED);

+        noRedeployJSPFiles.addSelectionListener(new SelectionListener() {
+
+            public void widgetSelected(SelectionEvent e) {
+                execute(new SetNotRedeployJSPFilesCommand(server, noRedeployJSPFiles.getSelection()));
+                
+                if (noRedeployJSPFiles.getSelection()) {
+                    MessageDialog.openInformation(Display.getCurrent().getActiveShell(),

+                        Messages.notRedeployJSPFilesReminder, Messages.notRedeployJSPFilesInformation);
+                }
+            }
+
+            public void widgetDefaultSelected(SelectionEvent e) {
+            }
+
+        });
+
+        //
+        // runFromWorkspace Button
+        //
+        runFromWorkspace = toolkit.createButton(composite, Messages.editorSectionRunFromWorkspace,
SWT.CHECK);
+        runFromWorkspace.setSelection(gs.isRunFromWorkspace());
+        runFromWorkspace.setEnabled(false); //FIXME disable support until supported
+        runFromWorkspace.addSelectionListener(new SelectionListener() {
+
+            public void widgetSelected(SelectionEvent e) {
+                execute(new SetRunFromWorkspaceCommand(server, runFromWorkspace.getSelection()));
+            }
+
+            public void widgetDefaultSelected(SelectionEvent e) {
+            }
+
+        });
+
+        //
+        // selectClasspathContainers Button
+        //
+        selectClasspathContainers = toolkit.createButton(composite, Messages.editorSectionSelectClasspathContainers,
SWT.CHECK); 
+        selectClasspathContainers.setSelection(gs.isSelectClasspathContainers()); 
+        selectClasspathContainers.addSelectionListener(new SelectionListener() { 
+
+            public void widgetSelected(SelectionEvent e) { 
+                execute(new SetSelectClasspathContainersCommand(server, selectClasspathContainers.getSelection()));

+
+                createCheckbox();
+
+                //
+                // For any selection change the checkbox will be populated from the workspace.

+                // Changes to individual elements in the checkbox will be handled with the

+                // CheckStateListener below.
+                //
+                List<String> containers = ClasspathContainersHelper.queryWorkspace();
+                checkbox.setInput( containers );
+                checkbox.setAllChecked( false );
+                if ( selectClasspathContainers.getSelection() ) {
+                    checkbox.getTable().setEnabled( true );
+                }
+                else {
+                    checkbox.getTable().setEnabled( false );
+                    // Clear any previously selected classpath containers
+                    execute(new SetClasspathContainersCommand(server, new Object[] {} ));
+                }
+            } 
+
+            public void widgetDefaultSelected(SelectionEvent e) { 
+            } 
+        }); 
+
+        //
+        // checkbox CheckboxTableViewer
+        //
+        createCheckbox();
+
+        //
+        // Populate the checkbox from the list of classpath containers in the workspace.
If 
+        // workspace classpath containers had been previously selected then use the list
from the
+        // server's instance properties to populate the checkbox. One advantage of this approach
+        // is that it will handle cases where new classpath containers are added in the workspace
+        // or existing containers are deleted from the workspace. 
+        //
+        List<String> containers = ClasspathContainersHelper.queryWorkspace();
+        checkbox.setInput( containers );
+
+        if ( selectClasspathContainers.getSelection() ) {
+            checkbox.getTable().setEnabled( true );
+            List<String> checkedContainers = gs.getClasspathContainers();
+            for (String container: checkedContainers) {
+                checkbox.setChecked( container, true );
+            }
+        }
+        else {
+            checkbox.getTable().setEnabled( false );
+        }
+
+        Trace.tracePoint("EXIT", "ServerEditorTestEnvSection.createSection");
+    }
+
+    //
+    // CheckboxTableViewer: checkbox
+    //
+    public void createCheckbox() {
+        Trace.tracePoint("ENTRY", "ServerEditorTestEnvSection.createCheckbox");
+    
+        if ( checkbox == null ) {
+                    
+            checkbox = CheckboxTableViewer.newCheckList( composite, SWT.MULTI | SWT.WRAP
| SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL );
+                    
+            GridData gridData = new GridData(GridData.FILL_BOTH);
+            gridData.heightHint = 250;
+            gridData.widthHint = 100;
+            checkbox.getTable().setLayoutData( gridData );
+                    
+            checkbox.addCheckStateListener( new ICheckStateListener() {
+
+                public void checkStateChanged(CheckStateChangedEvent event) {
+                    execute(new SetClasspathContainersCommand(server, checkbox.getCheckedElements()));
+                }
+            }); 
+
+            checkbox.setLabelProvider( new LabelProvider() {
+            });
+
+            checkbox.setContentProvider( new ArrayContentProvider() {
+            });
+        }
+
+        Trace.tracePoint("EXIT", "ServerEditorTestEnvSection.createCheckbox");
+    }
+}

Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/ServerPluginSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/ServerPluginSection.java?rev=952535&r1=952534&r2=952535&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/ServerPluginSection.java
(original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/ServerPluginSection.java
Tue Jun  8 04:40:16 2010
@@ -17,7 +17,7 @@
 package org.apache.geronimo.st.v21.ui.sections;
 
 import org.apache.geronimo.st.ui.CommonMessages;
-import org.apache.geronimo.st.ui.sections.AbstractServerEditorSection;
+import org.apache.geronimo.st.v21.ui.sections.AbstractServerEditorSection;
 import org.apache.geronimo.st.v21.core.operations.GeronimoServerPluginManager;
 import org.apache.geronimo.st.v21.ui.wizards.ServerCustomAssemblyWizard;
 import org.apache.geronimo.st.v21.ui.wizards.ServerPluginManagerDialog;

Added: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/ServerVMArgsSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/ServerVMArgsSection.java?rev=952535&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/ServerVMArgsSection.java
(added)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/ServerVMArgsSection.java
Tue Jun  8 04:40:16 2010
@@ -0,0 +1,117 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.st.v21.ui.sections;
+
+import org.apache.geronimo.st.v21.ui.commands.SetVMArgsCommand;
+import org.apache.geronimo.st.ui.internal.Messages;
+import org.eclipse.debug.internal.ui.SWTFactory;
+import org.eclipse.debug.ui.StringVariableSelectionDialog;
+import org.eclipse.jdt.internal.debug.ui.launcher.LauncherMessages;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.forms.widgets.ExpandableComposite;
+import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.eclipse.ui.forms.widgets.Section;
+
+/**
+ * @version $Rev: 732518 $ $Date: 2009-01-08 05:50:54 +0800 (Thu, 08 Jan 2009) $
+ */
+public class ServerVMArgsSection extends AbstractServerEditorSection {
+	
+	protected Text fVMArgumentsText;
+	private Button fPgrmArgVariableButton;
+
+	public ServerVMArgsSection() {
+		super();
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.wst.server.ui.editor.ServerEditorSection#createSection(org.eclipse.swt.widgets.Composite)
+	 */
+	public void createSection(Composite parent) {
+		super.createSection(parent);
+		FormToolkit toolkit = getFormToolkit(parent.getDisplay());
+		
+		Section section = toolkit.createSection(parent,
+				ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED
+						| ExpandableComposite.TITLE_BAR | Section.DESCRIPTION
+						| ExpandableComposite.FOCUS_TITLE);
+		section.setText(Messages.editorSectionVMArgsTitle);
+		section.setDescription(Messages.editorSectionVMArgsDescription);
+		section.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false));
+		
+		Composite composite = toolkit.createComposite(section);
+		GridLayout layout = new GridLayout();
+		layout.numColumns = 2;
+		layout.marginHeight = 5;
+		layout.marginWidth = 10;
+		layout.verticalSpacing = 5;
+		layout.horizontalSpacing = 15;
+		composite.setLayout(layout);
+		composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
+		section.setClient(composite);
+		
+		fVMArgumentsText = new Text(composite, SWT.MULTI | SWT.WRAP | SWT.BORDER | SWT.V_SCROLL);
+		GridData gd = new GridData(GridData.FILL_BOTH);
+		gd.heightHint = 75;
+		gd.widthHint = 100;
+		fVMArgumentsText.setLayoutData(gd);
+		fVMArgumentsText.setText(getArgs());
+		fVMArgumentsText.addModifyListener(new ModifyListener() {
+			public void modifyText(ModifyEvent e) {
+				execute(new SetVMArgsCommand(server, getAttributeValueFrom(fVMArgumentsText)));
+			}
+		});
+		
+		
+		fPgrmArgVariableButton = SWTFactory.createPushButton(composite, LauncherMessages.VMArgumentsBlock_4,
null);
+		fPgrmArgVariableButton.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+		fPgrmArgVariableButton.addSelectionListener(new SelectionListener() {
+			public void widgetSelected(SelectionEvent e) {
+				StringVariableSelectionDialog dialog = new StringVariableSelectionDialog(getShell());
+				dialog.open();
+				String variable = dialog.getVariableExpression();
+				if (variable != null) {
+					fVMArgumentsText.insert(variable);
+				}
+			}
+			public void widgetDefaultSelected(SelectionEvent e) {
+			}
+			
+		});
+	}
+	
+	protected String getAttributeValueFrom(Text text) {
+		String content = text.getText().trim();
+		if (content.length() > 0) {
+			return content;
+		}
+		return null;
+	}
+	
+	private String getArgs() {
+		return gs != null && gs.getVMArgs() != null ? gs.getVMArgs() : "";
+	}
+}

Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/DBPoolWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/DBPoolWizard.java?rev=952535&r1=952534&r2=952535&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/DBPoolWizard.java
(original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/DBPoolWizard.java
Tue Jun  8 04:40:16 2010
@@ -39,7 +39,7 @@ import org.apache.geronimo.jee.deploymen
 import org.apache.geronimo.jee.deployment.Environment;
 import org.apache.geronimo.jee.deployment.Pattern;
 import org.apache.geronimo.st.core.jaxb.JAXBObjectFactory;
-import org.apache.geronimo.st.ui.Activator;
+import org.apache.geronimo.st.v21.ui.Activator;
 import org.apache.geronimo.st.ui.CommonMessages;
 import org.apache.geronimo.st.ui.sections.AbstractTableSection;
 import org.apache.geronimo.st.ui.wizards.AbstractTableWizard;

Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/FacetInstallPage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/FacetInstallPage.java?rev=952535&r1=952534&r2=952535&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/FacetInstallPage.java
(original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/FacetInstallPage.java
Tue Jun  8 04:40:16 2010
@@ -16,8 +16,8 @@
  */
 package org.apache.geronimo.st.v21.ui.wizards;
 
+import org.apache.geronimo.st.core.DeploymentPlanInstallConfig;
 import org.apache.geronimo.st.ui.CommonMessages;
-import org.apache.geronimo.st.v21.core.DeploymentPlanInstallConfig;
 import org.apache.geronimo.st.v21.ui.internal.Trace;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;

Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/SecurityRealmWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/SecurityRealmWizard.java?rev=952535&r1=952534&r2=952535&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/SecurityRealmWizard.java
(original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/SecurityRealmWizard.java
Tue Jun  8 04:40:16 2010
@@ -40,7 +40,7 @@ import org.apache.geronimo.jee.naming.Pa
 import org.apache.geronimo.jee.openejb.OpenejbJar;
 import org.apache.geronimo.jee.web.WebApp;
 import org.apache.geronimo.st.core.jaxb.JAXBObjectFactory;
-import org.apache.geronimo.st.ui.Activator;
+import org.apache.geronimo.st.v21.ui.Activator;
 import org.apache.geronimo.st.ui.CommonMessages;
 import org.apache.geronimo.st.ui.sections.AbstractTableSection;
 import org.apache.geronimo.st.ui.wizards.AbstractTableWizard;

Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v22.core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v22.core/pom.xml?rev=952535&r1=952534&r2=952535&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v22.core/pom.xml
(original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v22.core/pom.xml
Tue Jun  8 04:40:16 2010
@@ -153,6 +153,12 @@
             <groupId>org.apache.geronimo.devtools</groupId>
             <artifactId>org.apache.geronimo.runtime.v22</artifactId>
             <version>${version}</version>
+            <exclusions>
+                    <exclusion>
+                        <groupId>javax.xml.bind</groupId>
+                        <artifactId>jaxb-api</artifactId>
+                    </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>



Mime
View raw message