geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcco...@apache.org
Subject svn commit: r937534 - in /geronimo/devtools/eclipse-plugin/trunk/plugins: org.apache.geronimo.st.core/ org.apache.geronimo.st.v11.core/ org.apache.geronimo.st.v11.ui/ org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/ or...
Date Fri, 23 Apr 2010 21:48:37 GMT
Author: mcconne
Date: Fri Apr 23 21:48:37 2010
New Revision: 937534

URL: http://svn.apache.org/viewvc?rev=937534&view=rev
Log:
GERONIMODEVTOOLS-614 Allow Geronimo v30 as target runtime for OGSi type projects

Added:
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/wizards/
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/wizards/FacetInstallPage.java
  (with props)
Modified:
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/plugin.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/plugin.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/plugin.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/FacetInstallPage.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/plugin.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/plugin.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/plugin.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/FacetInstallPage.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/plugin.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.ui/plugin.xml
    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.ui/plugin.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/handlers/DownloadGeronimo.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/handlers/DownloadOSGi.java

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/plugin.xml?rev=937534&r1=937533&r2=937534&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/plugin.xml
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/plugin.xml
Fri Apr 23 21:48:37 2010
@@ -77,7 +77,7 @@
                 class="org.eclipse.jst.common.project.facet.core.IClasspathProvider"/>
         </adapter>
 
-		<supported>
+        <supported>
             <runtime-component id="org.apache.geronimo.runtime" version="1.1"/>
             <facet id="org.apache.geronimo.facet" version="1.1"/>
             <facet id="jst.web" version="2.2,2.3,2.4"/>
@@ -130,6 +130,9 @@
             <facet id="jst.connector"   version="1.0,1.5,1.6"/>
             <facet id="jst.appclient"   version="1.2,1.3,1.4,5.0"/>
             <facet id="jst.utility"     version="1.0"/>
+            <facet id="osgi.app"        version="1.0"/>
+            <facet id="osgi.bundle"     version="1.0"/>
+            <facet id="osgi.comp"       version="1.0"/>
         </supported>
     </extension>
     

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/plugin.xml?rev=937534&r1=937533&r2=937534&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/plugin.xml
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/plugin.xml
Fri Apr 23 21:48:37 2010
@@ -20,7 +20,7 @@
 <!-- $Rev: 522975 $ $Date: 2007-03-27 12:04:11 -0400 (Tue, 27 Mar 2007) $ -->
 
 <plugin>
-	 <extension point="org.eclipse.wst.server.core.runtimeTypes">
+     <extension point="org.eclipse.wst.server.core.runtimeTypes">
         <runtimeType id="org.apache.geronimo.runtime.11"
             name="%runtimeTypeName" description="%runtimeTypeDescription"
             vendor="%runtimeTypeVendor" version="1.1"
@@ -84,7 +84,7 @@
                     <requires facet="jst.appclient" version="1.2"/>
                     <requires facet="jst.appclient" version="1.3"/>
                     <requires facet="jst.appclient" version="1.4"/>
-		    		<requires facet="jst.appclient" version="5.0"/>
+                    <requires facet="jst.appclient" version="5.0"/>
                     <requires facet="jst.connector" version="1.0"/>
                     <requires facet="jst.connector" version="1.5"/>
                     <requires facet="jst.ejb" version="1.1"/>
@@ -102,7 +102,7 @@
     </extension>
     
     <extension point="org.eclipse.wst.common.project.facet.core.defaultFacets" 
-    	id="org.apache.geronimo.defaultFacets"
+        id="org.apache.geronimo.defaultFacets"
         name="Geronimo Default Facets">
         <default-facets>
             <runtime-component id="org.apache.geronimo.runtime" version="1.1"/>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/plugin.xml?rev=937534&r1=937533&r2=937534&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/plugin.xml
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/plugin.xml
Fri Apr 23 21:48:37 2010
@@ -22,7 +22,7 @@
 <plugin>
     
     <extension point="org.apache.geronimo.st.ui.loader">
- 	  	<loader class="org.apache.geronimo.st.v11.ui.editors.GeronimoFormContentLoader" version="1.1"/>
+        <loader class="org.apache.geronimo.st.v11.ui.editors.GeronimoFormContentLoader"
version="1.1"/>
     </extension>
 
     <!-- 
@@ -31,10 +31,10 @@
      |
      -->
     <extension point="org.eclipse.wst.common.project.facet.ui.wizardPages">
-  		<wizard-pages action="geronimo.plan.install.v11">
-    		<page class="org.apache.geronimo.st.v11.ui.wizards.FacetInstallPage"/>
-  		</wizard-pages>
-	</extension>  
-	
+        <wizard-pages action="geronimo.plan.install.v11">
+            <page class="org.apache.geronimo.st.v11.ui.wizards.FacetInstallPage"/>
+        </wizard-pages>
+    </extension>  
+    
 
 </plugin>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/FacetInstallPage.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/wizards/FacetInstallPage.java?rev=937534&r1=937533&r2=937534&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/FacetInstallPage.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/FacetInstallPage.java
Fri Apr 23 21:48:37 2010
@@ -33,105 +33,105 @@ import org.eclipse.wst.common.project.fa
  */
 public class FacetInstallPage extends AbstractFacetWizardPage {
 
-	private DeploymentPlanInstallConfig config;
+    private DeploymentPlanInstallConfig config;
 
-	private Text groupText;
-	private Text artifactText;
-	private Text versionText;
-	private Text typeText;
-	private Button sharedLib;
-
-	public FacetInstallPage() {
-		super("geronimo.plan.install");
-		Trace.trace("Constructor Entry", "FacetInstallPage");
-		
-		setTitle("Geronimo Deployment Plan");
-		setDescription("Configure the geronimo deployment plan.");
-		
-		Trace.trace("Constructor Exit", "FacetInstallPage");
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.project.facet.ui.IFacetWizardPage#setConfig(java.lang.Object)
-	 */
-	public void setConfig(Object config) {
-		Trace.trace("Entry", "FacetInstallPage.setConfig", config);
-
-		this.config = (DeploymentPlanInstallConfig) config;
-		
-		Trace.trace("Exit", "FacetInstallPage.setConfig");
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createControl(Composite parent) {
-		Trace.trace("Entry", "FacetInstallPage.createControl", parent);
-		
-		Composite composite = new Composite(parent, SWT.NONE);
-		composite.setLayout(new GridLayout(2, false));
-
-		Label groupLabel = new Label(composite, SWT.NONE);
-		groupLabel.setText(CommonMessages.groupId);
-
-		groupText = new Text(composite, SWT.BORDER);
-		groupText.setLayoutData(createGridData());
-		groupText.setText("default");
-		
-		Label artifactLabel = new Label(composite, SWT.NONE);
-		artifactLabel.setText(CommonMessages.artifactId);
-
-		artifactText = new Text(composite, SWT.BORDER);
-		artifactText.setLayoutData(createGridData());
-		
-		Label versionLabel = new Label(composite, SWT.NONE);
-		versionLabel.setText(CommonMessages.version);
-
-		versionText = new Text(composite, SWT.BORDER);
-		versionText.setLayoutData(createGridData());
-		versionText.setText("1.0");
-		
-		Label typeLabel = new Label(composite, SWT.NONE);
-		typeLabel.setText(CommonMessages.artifactType);
-
-		typeText = new Text(composite, SWT.BORDER);
-		typeText.setLayoutData(createGridData());
-		typeText.setText("car");
-		
-		sharedLib = new Button(composite, SWT.CHECK);
-		GridData data = createGridData();
-		data.horizontalSpan = 2;
-		data.verticalIndent = 5;
-		sharedLib.setLayoutData(data);
-		sharedLib.setText(CommonMessages.addSharedLib);
-		
-		setControl(composite);
-		
-		Trace.trace("Exit", "FacetInstallPage.createControl");		
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.project.facet.ui.AbstractFacetWizardPage#transferStateToConfig()
-	 */
-	public void transferStateToConfig() {
-		Trace.trace("Entry", "FacetInstallPage.transferStateToConfig");		
-	
-		config.setGroupId(groupText.getText());
-		config.setArtifactId(artifactText.getText());
-		config.setVersion(versionText.getText());
-		config.setType(typeText.getText());
-		config.setSharedLib(sharedLib.getSelection());
-		
-		Trace.trace("Exit", "FacetInstallPage.transferStateToConfig");		
-	}
-
-	private static GridData createGridData() {
-		return new GridData(GridData.FILL_HORIZONTAL);
-	}
+    private Text groupText;
+    private Text artifactText;
+    private Text versionText;
+    private Text typeText;
+    private Button sharedLib;
+
+    public FacetInstallPage() {
+        super("geronimo.plan.install");
+        Trace.trace("Constructor Entry", "FacetInstallPage");
+        
+        setTitle("Geronimo Deployment Plan");
+        setDescription("Configure the geronimo deployment plan.");
+        
+        Trace.trace("Constructor Exit", "FacetInstallPage");
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.eclipse.wst.common.project.facet.ui.IFacetWizardPage#setConfig(java.lang.Object)
+     */
+    public void setConfig(Object config) {
+        Trace.trace("Entry", "FacetInstallPage.setConfig", config);
+
+        this.config = (DeploymentPlanInstallConfig) config;
+        
+        Trace.trace("Exit", "FacetInstallPage.setConfig");
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
+     */
+    public void createControl(Composite parent) {
+        Trace.trace("Entry", "FacetInstallPage.createControl", parent);
+        
+        Composite composite = new Composite(parent, SWT.NONE);
+        composite.setLayout(new GridLayout(2, false));
+
+        Label groupLabel = new Label(composite, SWT.NONE);
+        groupLabel.setText(CommonMessages.groupId);
+
+        groupText = new Text(composite, SWT.BORDER);
+        groupText.setLayoutData(createGridData());
+        groupText.setText("default");
+        
+        Label artifactLabel = new Label(composite, SWT.NONE);
+        artifactLabel.setText(CommonMessages.artifactId);
+
+        artifactText = new Text(composite, SWT.BORDER);
+        artifactText.setLayoutData(createGridData());
+        
+        Label versionLabel = new Label(composite, SWT.NONE);
+        versionLabel.setText(CommonMessages.version);
+
+        versionText = new Text(composite, SWT.BORDER);
+        versionText.setLayoutData(createGridData());
+        versionText.setText("1.0");
+        
+        Label typeLabel = new Label(composite, SWT.NONE);
+        typeLabel.setText(CommonMessages.artifactType);
+
+        typeText = new Text(composite, SWT.BORDER);
+        typeText.setLayoutData(createGridData());
+        typeText.setText("car");
+        
+        sharedLib = new Button(composite, SWT.CHECK);
+        GridData data = createGridData();
+        data.horizontalSpan = 2;
+        data.verticalIndent = 5;
+        sharedLib.setLayoutData(data);
+        sharedLib.setText(CommonMessages.addSharedLib);
+        
+        setControl(composite);
+        
+        Trace.trace("Exit", "FacetInstallPage.createControl");      
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.eclipse.wst.common.project.facet.ui.AbstractFacetWizardPage#transferStateToConfig()
+     */
+    public void transferStateToConfig() {
+        Trace.trace("Entry", "FacetInstallPage.transferStateToConfig");     
+    
+        config.setGroupId(groupText.getText());
+        config.setArtifactId(artifactText.getText());
+        config.setVersion(versionText.getText());
+        config.setType(typeText.getText());
+        config.setSharedLib(sharedLib.getSelection());
+        
+        Trace.trace("Exit", "FacetInstallPage.transferStateToConfig");      
+    }
+
+    private static GridData createGridData() {
+        return new GridData(GridData.FILL_HORIZONTAL);
+    }
 }

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/plugin.xml?rev=937534&r1=937533&r2=937534&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/plugin.xml
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/plugin.xml
Fri Apr 23 21:48:37 2010
@@ -21,7 +21,7 @@
 
 <plugin>
 
-	 <extension point="org.eclipse.wst.server.core.runtimeTypes">
+     <extension point="org.eclipse.wst.server.core.runtimeTypes">
         <runtimeType id="org.apache.geronimo.runtime.20"
             name="%runtimeTypeName" description="%runtimeTypeDescription"
             vendor="%runtimeTypeVendor" version="2.0"
@@ -31,7 +31,7 @@
             <moduleType types="jst.connector" versions="1.0, 1.5"/>
             <moduleType types="jst.ear" versions="1.2, 1.3, 1.4, 5.0"/>
             <moduleType types="jst.utility" versions="1.0"/>
-	        <moduleType types="jst.appclient" versions="1.2, 1.3, 1.4, 5.0"/>
+            <moduleType types="jst.appclient" versions="1.2, 1.3, 1.4, 5.0"/>
         </runtimeType>
     </extension>
     
@@ -104,7 +104,7 @@
      |
      -->
     <extension point="org.eclipse.wst.common.project.facet.core.defaultFacets" 
-    	id="org.apache.geronimo.defaultFacets"
+        id="org.apache.geronimo.defaultFacets"
         name="Geronimo Default Facets">
         <default-facets>
             <runtime-component id="org.apache.geronimo.runtime" version="2.0"/>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/plugin.xml?rev=937534&r1=937533&r2=937534&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/plugin.xml
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/plugin.xml
Fri Apr 23 21:48:37 2010
@@ -22,7 +22,7 @@
 <plugin>
     
     <extension point="org.apache.geronimo.st.ui.loader">
- 	  	<loader class="org.apache.geronimo.st.v21.ui.editors.GeronimoFormContentLoader" version="2.0"/>
+        <loader class="org.apache.geronimo.st.v21.ui.editors.GeronimoFormContentLoader"
version="2.0"/>
     </extension>
 
     <!-- 
@@ -31,9 +31,9 @@
      |
      -->
     <extension point="org.eclipse.wst.common.project.facet.ui.wizardPages">
-  		<wizard-pages action="geronimo.plan.install.v20">
-    		<page class="org.apache.geronimo.st.v21.ui.wizards.FacetInstallPage"/>
-  		</wizard-pages>
-	</extension>  
+        <wizard-pages action="geronimo.plan.install.v20">
+            <page class="org.apache.geronimo.st.v21.ui.wizards.FacetInstallPage"/>
+        </wizard-pages>
+    </extension>  
 
 </plugin>

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=937534&r1=937533&r2=937534&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
Fri Apr 23 21:48:37 2010
@@ -51,15 +51,14 @@
             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 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/wizards/FacetInstallPage.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/FacetInstallPage.java?rev=937534&r1=937533&r2=937534&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/FacetInstallPage.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/FacetInstallPage.java
Fri Apr 23 21:48:37 2010
@@ -33,105 +33,105 @@ import org.eclipse.wst.common.project.fa
  */
 public class FacetInstallPage extends AbstractFacetWizardPage {
 
-	private DeploymentPlanInstallConfig config;
+    private DeploymentPlanInstallConfig config;
 
-	private Text groupText;
-	private Text artifactText;
-	private Text versionText;
-	private Text typeText;
-	private Button sharedLib;
-
-	public FacetInstallPage() {
-		super("geronimo.plan.install");
-		Trace.trace("Constructor Entry", "FacetInstallPage");
-		
-		setTitle("Geronimo Deployment Plan");
-		setDescription("Configure the geronimo deployment plan.");
-		
-		Trace.trace("Constructor Exit", "FacetInstallPage");
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.project.facet.ui.IFacetWizardPage#setConfig(java.lang.Object)
-	 */
-	public void setConfig(Object config) {
-		Trace.trace("Entry", "FacetInstallPage.setConfig", config);
-
-		this.config = (DeploymentPlanInstallConfig) config;
-		
-		Trace.trace("Exit", "FacetInstallPage.setConfig");
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createControl(Composite parent) {
-		Trace.trace("Entry", "FacetInstallPage.createControl", parent);
-		
-		Composite composite = new Composite(parent, SWT.NONE);
-		composite.setLayout(new GridLayout(2, false));
-
-		Label groupLabel = new Label(composite, SWT.NONE);
-		groupLabel.setText(CommonMessages.groupId);
-
-		groupText = new Text(composite, SWT.BORDER);
-		groupText.setLayoutData(createGridData());
-		groupText.setText("default");
-		
-		Label artifactLabel = new Label(composite, SWT.NONE);
-		artifactLabel.setText(CommonMessages.artifactId);
-
-		artifactText = new Text(composite, SWT.BORDER);
-		artifactText.setLayoutData(createGridData());
-		
-		Label versionLabel = new Label(composite, SWT.NONE);
-		versionLabel.setText(CommonMessages.version);
-
-		versionText = new Text(composite, SWT.BORDER);
-		versionText.setLayoutData(createGridData());
-		versionText.setText("1.0");
-		
-		Label typeLabel = new Label(composite, SWT.NONE);
-		typeLabel.setText(CommonMessages.artifactType);
-
-		typeText = new Text(composite, SWT.BORDER);
-		typeText.setLayoutData(createGridData());
-		typeText.setText("car");
-		
-		sharedLib = new Button(composite, SWT.CHECK);
-		GridData data = createGridData();
-		data.horizontalSpan = 2;
-		data.verticalIndent = 5;
-		sharedLib.setLayoutData(data);
-		sharedLib.setText(CommonMessages.addSharedLib);
-		
-		setControl(composite);
-		
-		Trace.trace("Exit", "FacetInstallPage.createControl");		
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.project.facet.ui.AbstractFacetWizardPage#transferStateToConfig()
-	 */
-	public void transferStateToConfig() {
-		Trace.trace("Entry", "FacetInstallPage.transferStateToConfig");		
-	
-		config.setGroupId(groupText.getText());
-		config.setArtifactId(artifactText.getText());
-		config.setVersion(versionText.getText());
-		config.setType(typeText.getText());
-		config.setSharedLib(sharedLib.getSelection());
-		
-		Trace.trace("Exit", "FacetInstallPage.transferStateToConfig");		
-	}
-
-	private static GridData createGridData() {
-		return new GridData(GridData.FILL_HORIZONTAL);
-	}
+    private Text groupText;
+    private Text artifactText;
+    private Text versionText;
+    private Text typeText;
+    private Button sharedLib;
+
+    public FacetInstallPage() {
+        super("geronimo.plan.install");
+        Trace.trace("Constructor Entry", "FacetInstallPage");
+        
+        setTitle("Geronimo Deployment Plan");
+        setDescription("Configure the geronimo deployment plan.");
+        
+        Trace.trace("Constructor Exit", "FacetInstallPage");
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.eclipse.wst.common.project.facet.ui.IFacetWizardPage#setConfig(java.lang.Object)
+     */
+    public void setConfig(Object config) {
+        Trace.trace("Entry", "FacetInstallPage.setConfig", config);
+
+        this.config = (DeploymentPlanInstallConfig) config;
+        
+        Trace.trace("Exit", "FacetInstallPage.setConfig");
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
+     */
+    public void createControl(Composite parent) {
+        Trace.trace("Entry", "FacetInstallPage.createControl", parent);
+        
+        Composite composite = new Composite(parent, SWT.NONE);
+        composite.setLayout(new GridLayout(2, false));
+
+        Label groupLabel = new Label(composite, SWT.NONE);
+        groupLabel.setText(CommonMessages.groupId);
+
+        groupText = new Text(composite, SWT.BORDER);
+        groupText.setLayoutData(createGridData());
+        groupText.setText("default");
+        
+        Label artifactLabel = new Label(composite, SWT.NONE);
+        artifactLabel.setText(CommonMessages.artifactId);
+
+        artifactText = new Text(composite, SWT.BORDER);
+        artifactText.setLayoutData(createGridData());
+        
+        Label versionLabel = new Label(composite, SWT.NONE);
+        versionLabel.setText(CommonMessages.version);
+
+        versionText = new Text(composite, SWT.BORDER);
+        versionText.setLayoutData(createGridData());
+        versionText.setText("1.0");
+        
+        Label typeLabel = new Label(composite, SWT.NONE);
+        typeLabel.setText(CommonMessages.artifactType);
+
+        typeText = new Text(composite, SWT.BORDER);
+        typeText.setLayoutData(createGridData());
+        typeText.setText("car");
+        
+        sharedLib = new Button(composite, SWT.CHECK);
+        GridData data = createGridData();
+        data.horizontalSpan = 2;
+        data.verticalIndent = 5;
+        sharedLib.setLayoutData(data);
+        sharedLib.setText(CommonMessages.addSharedLib);
+        
+        setControl(composite);
+        
+        Trace.trace("Exit", "FacetInstallPage.createControl");      
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.eclipse.wst.common.project.facet.ui.AbstractFacetWizardPage#transferStateToConfig()
+     */
+    public void transferStateToConfig() {
+        Trace.trace("Entry", "FacetInstallPage.transferStateToConfig");     
+    
+        config.setGroupId(groupText.getText());
+        config.setArtifactId(artifactText.getText());
+        config.setVersion(versionText.getText());
+        config.setType(typeText.getText());
+        config.setSharedLib(sharedLib.getSelection());
+        
+        Trace.trace("Exit", "FacetInstallPage.transferStateToConfig");      
+    }
+
+    private static GridData createGridData() {
+        return new GridData(GridData.FILL_HORIZONTAL);
+    }
 }

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/plugin.xml?rev=937534&r1=937533&r2=937534&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/plugin.xml
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/plugin.xml
Fri Apr 23 21:48:37 2010
@@ -21,7 +21,7 @@
 
 <plugin>
 
-	 <extension point="org.eclipse.wst.server.core.runtimeTypes">
+     <extension point="org.eclipse.wst.server.core.runtimeTypes">
         <runtimeType id="org.apache.geronimo.runtime.22" version="2.2"
             name="%runtimeTypeName" description="%runtimeTypeDescription"
             vendor="%runtimeTypeVendor"
@@ -104,7 +104,7 @@
      |
      -->
     <extension point="org.eclipse.wst.common.project.facet.core.defaultFacets" 
-    	id="org.apache.geronimo.defaultFacets"
+        id="org.apache.geronimo.defaultFacets"
         name="Geronimo Default Facets">
         <default-facets>
             <runtime-component id="org.apache.geronimo.runtime" version="2.2"/>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.ui/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.ui/plugin.xml?rev=937534&r1=937533&r2=937534&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.ui/plugin.xml
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.ui/plugin.xml
Fri Apr 23 21:48:37 2010
@@ -22,7 +22,7 @@
 <plugin>
     
     <extension point="org.apache.geronimo.st.ui.loader">
- 	  	<loader class="org.apache.geronimo.st.v21.ui.editors.GeronimoFormContentLoader" version="2.2"/>
+        <loader class="org.apache.geronimo.st.v21.ui.editors.GeronimoFormContentLoader"
version="2.2"/>
     </extension>
 
     <!-- 
@@ -31,9 +31,9 @@
      |
      -->
     <extension point="org.eclipse.wst.common.project.facet.ui.wizardPages">
-  		<wizard-pages action="geronimo.plan.install.v22">
-    		<page class="org.apache.geronimo.st.v21.ui.wizards.FacetInstallPage"/>
-  		</wizard-pages>
-	</extension>  
+        <wizard-pages action="geronimo.plan.install.v22">
+            <page class="org.apache.geronimo.st.v21.ui.wizards.FacetInstallPage"/>
+        </wizard-pages>
+    </extension>  
 
 </plugin>

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=937534&r1=937533&r2=937534&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
Fri Apr 23 21:48:37 2010
@@ -84,7 +84,7 @@
 
     <!-- 
      | 
-     | Declare the 1.2 version of the "Geronimo Deployment" project-facet and the action
+     | Declare the 1.3 version of the "Geronimo Deployment" project-facet and the action
      | that the user can perform on the facet (i.e., install). Note that the id associated

      | action must be unique across all plugins. 
      | 
@@ -97,28 +97,31 @@
             </action>
             <constraint>
                 <or>
-                    <requires facet="jst.ear" version="1.2"/>
-                    <requires facet="jst.ear" version="1.3"/>
-                    <requires facet="jst.ear" version="1.4"/>
-                    <requires facet="jst.ear" version="1.4"/>
-                    <requires facet="jst.ear" version="5.0"/>
+                    <requires facet="jst.ear"       version="1.2"/>
+                    <requires facet="jst.ear"       version="1.3"/>
+                    <requires facet="jst.ear"       version="1.4"/>
+                    <requires facet="jst.ear"       version="1.4"/>
+                    <requires facet="jst.ear"       version="5.0"/>
                     <requires facet="jst.appclient" version="1.2"/>
                     <requires facet="jst.appclient" version="1.3"/>
                     <requires facet="jst.appclient" version="1.4"/>
                     <requires facet="jst.appclient" version="5.0"/>
                     <requires facet="jst.connector" version="1.0"/>
                     <requires facet="jst.connector" version="1.5"/>
-                    <requires facet="jst.ejb" version="1.1"/>
-                    <requires facet="jst.ejb" version="2.0"/>
-                    <requires facet="jst.ejb" version="2.1"/>
-                    <requires facet="jst.ejb" version="3.0"/>
-                    <requires facet="jst.ejb" version="3.1"/>
-                    <requires facet="jst.web" version="2.2"/>
-                    <requires facet="jst.web" version="2.3"/>
-                    <requires facet="jst.web" version="2.4"/>
-                    <requires facet="jst.web" version="2.5"/>
-                    <requires facet="jst.web" version="3.0"/>
-                    <requires facet="jst.utility" version="1.0"/>
+                    <requires facet="jst.ejb"       version="1.1"/>
+                    <requires facet="jst.ejb"       version="2.0"/>
+                    <requires facet="jst.ejb"       version="2.1"/>
+                    <requires facet="jst.ejb"       version="3.0"/>
+                    <requires facet="jst.ejb"       version="3.1"/>
+                    <requires facet="jst.web"       version="2.2"/>
+                    <requires facet="jst.web"       version="2.3"/>
+                    <requires facet="jst.web"       version="2.4"/>
+                    <requires facet="jst.web"       version="2.5"/>
+                    <requires facet="jst.web"       version="3.0"/>
+                    <requires facet="jst.utility"   version="1.0"/>
+                    <requires facet="osgi.app"      version="1.0"/>
+                    <requires facet="osgi.bundle"   version="1.0"/>
+                    <requires facet="osgi.comp"     version="1.0"/>
                 </or>
             </constraint>
         </project-facet-version>

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=937534&r1=937533&r2=937534&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
Fri Apr 23 21:48:37 2010
@@ -64,7 +64,7 @@
     
     <!-- 
      |
-     | Step 1. Create a commands category for the various download commands
+     | Downloads Menu - Create a commands category for the various download commands
      |
      -->
     <extension point="org.eclipse.ui.commands">
@@ -90,7 +90,7 @@
 
     <!-- 
      |
-     | Step 2. Create a Downloads menu for the download commands defined above
+     | Downloads Menu - Create a Downloads menu for the download commands defined above
      |
      -->
     <extension point="org.eclipse.ui.menus">
@@ -126,7 +126,7 @@
 
     <!-- 
      |
-     | Step 3. Create the handlers for the commands defined above
+     | Downloads Menu - Create the handlers for the commands defined above
      |
      -->
     <extension point="org.eclipse.ui.handlers">

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/handlers/DownloadGeronimo.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/handlers/DownloadGeronimo.java?rev=937534&r1=937533&r2=937534&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/handlers/DownloadGeronimo.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/handlers/DownloadGeronimo.java
Fri Apr 23 21:48:37 2010
@@ -41,7 +41,7 @@ import org.eclipse.ui.internal.browser.W
 public class DownloadGeronimo extends AbstractHandler {
 
     public Object execute(ExecutionEvent event) throws ExecutionException {
-        Trace.tracePoint("ENTRY", "DownloadGeronimo.execute", event);
+        Trace.tracePoint("Entry", "DownloadGeronimo.execute", event);
 
         String url = Messages.DownloadServerURL;
 
@@ -57,7 +57,7 @@ public class DownloadGeronimo extends Ab
             e.printStackTrace();
         }
 
-        Trace.tracePoint("EXIT ", "DownloadGeronimo.execute");
+        Trace.tracePoint("Exit", "DownloadGeronimo.execute");
         return null;
     }
 }

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/handlers/DownloadOSGi.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/handlers/DownloadOSGi.java?rev=937534&r1=937533&r2=937534&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/handlers/DownloadOSGi.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/handlers/DownloadOSGi.java
Fri Apr 23 21:48:37 2010
@@ -33,9 +33,9 @@ public class DownloadOSGi extends Abstra
 
     @Override
     public Object execute(ExecutionEvent event) throws ExecutionException {
-    	Trace.tracePoint("ENTRY", "DownloadOSGi.execute", event);
-    	// TODO
-    	Trace.tracePoint("EXIT ", "DownloadOSGi.execute");
+        Trace.tracePoint("Entry", "DownloadOSGi.execute", event);
+        // TODO
+        Trace.tracePoint("Exit", "DownloadOSGi.execute");
         return null;
     }
 

Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/wizards/FacetInstallPage.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/wizards/FacetInstallPage.java?rev=937534&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/wizards/FacetInstallPage.java
(added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/wizards/FacetInstallPage.java
Fri Apr 23 21:48:37 2010
@@ -0,0 +1,137 @@
+/*
+ * 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.v30.ui.wizards;
+
+import org.apache.geronimo.st.core.internal.Trace;
+import org.apache.geronimo.st.ui.CommonMessages;
+import org.apache.geronimo.st.v30.core.DeploymentPlanInstallConfig;
+import org.eclipse.swt.SWT;
+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.Label;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.wst.common.project.facet.ui.AbstractFacetWizardPage;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class FacetInstallPage extends AbstractFacetWizardPage {
+
+    private DeploymentPlanInstallConfig config;
+
+    private Text groupText;
+    private Text artifactText;
+    private Text versionText;
+    private Text typeText;
+    private Button sharedLib;
+
+    public FacetInstallPage() {
+        super("geronimo.plan.install");
+        Trace.tracePoint("Constructor Entry", "FacetInstallPage");
+
+        setTitle("Geronimo Deployment Plan");
+        setDescription("Configure the geronimo deployment plan.");
+
+        Trace.tracePoint("Constructor Exit", "FacetInstallPage");
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.eclipse.wst.common.project.facet.ui.IFacetWizardPage#setConfig(java.lang.Object)
+     */
+    public void setConfig(Object config) {
+        Trace.tracePoint("Entry", "FacetInstallPage.setConfig", config);
+
+        this.config = (DeploymentPlanInstallConfig) config;
+
+        Trace.tracePoint("Exit", "FacetInstallPage.setConfig");
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
+     */
+    public void createControl(Composite parent) {
+        Trace.tracePoint("Entry", "FacetInstallPage.createControl", parent);
+
+        Composite composite = new Composite(parent, SWT.NONE);
+        composite.setLayout(new GridLayout(2, false));
+
+        Label groupLabel = new Label(composite, SWT.NONE);
+        groupLabel.setText(CommonMessages.groupId);
+
+        groupText = new Text(composite, SWT.BORDER);
+        groupText.setLayoutData(createGridData());
+        groupText.setText("default");
+
+        Label artifactLabel = new Label(composite, SWT.NONE);
+        artifactLabel.setText(CommonMessages.artifactId);
+
+        artifactText = new Text(composite, SWT.BORDER);
+        artifactText.setLayoutData(createGridData());
+
+        Label versionLabel = new Label(composite, SWT.NONE);
+        versionLabel.setText(CommonMessages.version);
+
+        versionText = new Text(composite, SWT.BORDER);
+        versionText.setLayoutData(createGridData());
+        versionText.setText("1.0");
+
+        Label typeLabel = new Label(composite, SWT.NONE);
+        typeLabel.setText(CommonMessages.artifactType);
+
+        typeText = new Text(composite, SWT.BORDER);
+        typeText.setLayoutData(createGridData());
+        typeText.setText("car");
+
+        sharedLib = new Button(composite, SWT.CHECK);
+        GridData data = createGridData();
+        data.horizontalSpan = 2;
+        data.verticalIndent = 5;
+        sharedLib.setLayoutData(data);
+        sharedLib.setText(CommonMessages.addSharedLib);
+
+        setControl(composite);
+
+        Trace.tracePoint("Exit", "FacetInstallPage.createControl");      
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.eclipse.wst.common.project.facet.ui.AbstractFacetWizardPage#transferStateToConfig()
+     */
+    public void transferStateToConfig() {
+        Trace.tracePoint("Entry", "FacetInstallPage.transferStateToConfig");     
+
+        config.setGroupId(groupText.getText());
+        config.setArtifactId(artifactText.getText());
+        config.setVersion(versionText.getText());
+        config.setType(typeText.getText());
+        config.setSharedLib(sharedLib.getSelection());
+
+        Trace.tracePoint("Exit", "FacetInstallPage.transferStateToConfig");      
+    }
+
+    private static GridData createGridData() {
+        return new GridData(GridData.FILL_HORIZONTAL);
+    }
+}

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/wizards/FacetInstallPage.java
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message