geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sppa...@apache.org
Subject svn commit: r370474 - in /geronimo/devtools/trunk/modules/eclipse-plugin: etc/ plugins/org.apache.geronimo.j2ee.server.v1/ plugins/org.apache.geronimo.jetty.j2ee.server.v1/ plugins/org.apache.geronimo.jetty.j2ee.server.v1/META-INF/ plugins/org.apache.g...
Date Thu, 19 Jan 2006 14:21:38 GMT
Author: sppatel
Date: Thu Jan 19 06:21:29 2006
New Revision: 370474

URL: http://svn.apache.org/viewcvs?rev=370474&view=rev
Log:
new plugin wrapper for jetty distro

Added:
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.jetty.j2ee.server.v1/
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.jetty.j2ee.server.v1/.project
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.jetty.j2ee.server.v1/META-INF/
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.jetty.j2ee.server.v1/META-INF/MANIFEST.MF
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.jetty.j2ee.server.v1/maven.xml
  (with props)
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.jetty.j2ee.server.v1/project.properties
  (with props)
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.jetty.j2ee.server.v1/project.xml
  (with props)
Modified:
    geronimo/devtools/trunk/modules/eclipse-plugin/etc/project.properties
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.j2ee.server.v1/maven.xml
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.j2ee.server.v1/project.properties
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/internal/GeronimoServerRuntimeWizardFragment.java

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/etc/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/etc/project.properties?rev=370474&r1=370473&r2=370474&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/etc/project.properties (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/etc/project.properties Thu Jan 19 06:21:29
2006
@@ -33,6 +33,7 @@
 org.apache.geronimo.j2ee.server.v1_version=1.0.0-SNAPSHOT
 org.apache.geronimo.runtime.v1_version=1.0.0-SNAPSHOT
 org.apache.geronimo.ui_version=1.0.0-SNAPSHOT
+org.apache.geronimo.jetty.j2ee.server.v1_version=1.0.0-SNAPSHOT
 
 #####################################################
 # Feature Versions

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.j2ee.server.v1/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.j2ee.server.v1/maven.xml?rev=370474&r1=370473&r2=370474&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.j2ee.server.v1/maven.xml
(original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.j2ee.server.v1/maven.xml
Thu Jan 19 06:21:29 2006
@@ -26,14 +26,13 @@
    </preGoal>  
     
   <goal name="getzip">
-    <ant:property name="geronimo.zip" value="geronimo-tomcat-j2ee-${geronimo.version}.zip"/>
-    <ant:available file="${maven.repo.local}/geronimo/distributions/${geronimo.zip}" property="zip.present"/>
+    <ant:available file="${maven.repo.local}/geronimo/distributions/${server.image}" property="zip.present"/>
     <j:if test="${zip.present != 'true'}">
          <ant:mkdir dir="${maven.repo.local}/geronimo/distributions/"/>
-         <ant:get src="http://www.apache.org/dist/geronimo/1.0/${geronimo.zip}" dest="${maven.repo.local}/geronimo/distributions/${geronimo.zip}"/>
+         <ant:get src="http://www.apache.org/dist/geronimo/1.0/${server.image}" dest="${maven.repo.local}/geronimo/distributions/${server.image}"/>
     </j:if>
     <ant:mkdir dir="${maven.build.dest}/zips"/>
-    <copy file="${maven.repo.local}/geronimo/distributions/${geronimo.zip}" todir="${maven.build.dest}/zips"/>
+    <copy file="${maven.repo.local}/geronimo/distributions/${server.image}" todir="${maven.build.dest}/zips"/>
   </goal>
   
   <goal name="eclipse:generate-project">

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.j2ee.server.v1/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.j2ee.server.v1/project.properties?rev=370474&r1=370473&r2=370474&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.j2ee.server.v1/project.properties
(original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.j2ee.server.v1/project.properties
Thu Jan 19 06:21:29 2006
@@ -1 +1,2 @@
-maven.jar.manifest=META-INF/MANIFEST.MF
\ No newline at end of file
+maven.jar.manifest=META-INF/MANIFEST.MF
+server.image=geronimo-tomcat-j2ee-${geronimo.version}.zip
\ No newline at end of file

Added: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.jetty.j2ee.server.v1/.project
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.jetty.j2ee.server.v1/.project?rev=370474&view=auto
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.jetty.j2ee.server.v1/.project
(added)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.jetty.j2ee.server.v1/.project
Thu Jan 19 06:21:29 2006
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.apache.geronimo.j2ee.server</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+	</natures>
+</projectDescription>

Added: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.jetty.j2ee.server.v1/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.jetty.j2ee.server.v1/META-INF/MANIFEST.MF?rev=370474&view=auto
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.jetty.j2ee.server.v1/META-INF/MANIFEST.MF
(added)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.jetty.j2ee.server.v1/META-INF/MANIFEST.MF
Thu Jan 19 06:21:29 2006
@@ -0,0 +1,7 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Geronimo Jetty Server Plug-in
+Bundle-SymbolicName: org.apache.geronimo.jetty.j2ee.server.v1
+Bundle-Version: 1.0.0
+Bundle-Vendor: Apache.org
+Bundle-Localization: plugin

Added: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.jetty.j2ee.server.v1/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.jetty.j2ee.server.v1/maven.xml?rev=370474&view=auto
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.jetty.j2ee.server.v1/maven.xml
(added)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.jetty.j2ee.server.v1/maven.xml
Thu Jan 19 06:21:29 2006
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+    Copyright 2004 The Apache Software Foundation
+
+    Licensed 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.
+-->
+<project default="default" xmlns:j="jelly:core" xmlns:ant="jelly:ant">
+
+    <goal name="default">
+        <attainGoal name="jar:install"/>
+    </goal>
+  
+    <preGoal name="java:jar-resources"> 
+        <attainGoal name="getzip"/>       
+   </preGoal>  
+    
+  <goal name="getzip">
+    <ant:available file="${maven.repo.local}/geronimo/distributions/${server.image}" property="zip.present"/>
+    <j:if test="${zip.present != 'true'}">
+         <ant:mkdir dir="${maven.repo.local}/geronimo/distributions/"/>
+         <ant:get src="http://www.apache.org/dist/geronimo/1.0/${server.image}" dest="${maven.repo.local}/geronimo/distributions/${server.image}"/>
+    </j:if>
+    <ant:mkdir dir="${maven.build.dest}/zips"/>
+    <copy file="${maven.repo.local}/geronimo/distributions/${server.image}" todir="${maven.build.dest}/zips"/>
+  </goal>
+  
+  <goal name="eclipse:generate-project">
+    <!-- do nothing -->
+  </goal>  
+  
+  <goal name="eclipse:generate-classpath">
+    <!-- do nothing -->
+  </goal>
+  
+</project>

Propchange: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.jetty.j2ee.server.v1/maven.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.jetty.j2ee.server.v1/maven.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.jetty.j2ee.server.v1/maven.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.jetty.j2ee.server.v1/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.jetty.j2ee.server.v1/project.properties?rev=370474&view=auto
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.jetty.j2ee.server.v1/project.properties
(added)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.jetty.j2ee.server.v1/project.properties
Thu Jan 19 06:21:29 2006
@@ -0,0 +1,2 @@
+maven.jar.manifest=META-INF/MANIFEST.MF
+server.image=geronimo-jetty-j2ee-${geronimo.version}.zip
\ No newline at end of file

Propchange: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.jetty.j2ee.server.v1/project.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.jetty.j2ee.server.v1/project.properties
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.jetty.j2ee.server.v1/project.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.jetty.j2ee.server.v1/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.jetty.j2ee.server.v1/project.xml?rev=370474&view=auto
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.jetty.j2ee.server.v1/project.xml
(added)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.jetty.j2ee.server.v1/project.xml
Thu Jan 19 06:21:29 2006
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright 2004 The Apache Software Foundation
+
+    Licensed 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.
+-->
+<project>
+  <extend>../../etc/project.xml</extend>
+  <id>org.apache.geronimo.jetty.j2ee.server.v1</id>
+  <name>org.apache.geronimo.jetty.j2ee.server.v1</name>
+  <currentVersion>${org.apache.geronimo.jetty.j2ee.server_version}</currentVersion>
+  <build>
+    <resources>      
+      <resource>
+        <directory>../../../../</directory>
+        <includes>
+          <include>LICENSE.txt</include>
+        </includes>
+      </resource>
+    </resources>
+  </build>
+</project>
\ No newline at end of file

Propchange: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.jetty.j2ee.server.v1/project.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.jetty.j2ee.server.v1/project.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/internal/GeronimoServerRuntimeWizardFragment.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/internal/GeronimoServerRuntimeWizardFragment.java?rev=370474&r1=370473&r2=370474&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/internal/GeronimoServerRuntimeWizardFragment.java
(original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/internal/GeronimoServerRuntimeWizardFragment.java
Thu Jan 19 06:21:29 2006
@@ -110,7 +110,7 @@
 		installDir.addModifyListener(new ModifyListener() {
 			public void modifyText(ModifyEvent e) {
 				getRuntimeDelegate().getRuntimeWorkingCopy().setLocation(new Path(installDir.getText()));
-				// validate();
+				validate();
 			}
 		});
 
@@ -123,7 +123,7 @@
 				dialog.setMessage(Messages.installDir);
 				dialog.setFilterPath(installDir.getText());
 				String selectedDirectory = dialog.open();
-				if (selectedDirectory != null)
+				if (selectedDirectory != null) 
 					installDir.setText(selectedDirectory);
 			}
 		});
@@ -196,23 +196,36 @@
 		}
 
 	}
-
-	public void enter() {
-		if (getRuntimeDelegate() != null)
-			getRuntimeDelegate().getRuntimeWorkingCopy().setName(createName());
-
+	
+	protected void validate() {
+		//TODO validate installDir
+		//TODO group enablement/disablement
+	}
+	
+	private void validateDecorators() {
 		for (int i = 0; i < fDecorators.length; i++) {
 			if (fDecorators[i].validate())
 				return;
 		}
+		//getRuntimeDelegate().setServerDefinitionId(getRuntimeDelegate().getRuntime().getRuntimeType().getId());
+        //getRuntimeDelegate().setServerInstanceProperties(getValues());
 	}
 
+	/* (non-Javadoc)
+	 * @see org.eclipse.wst.server.ui.wizard.WizardFragment#enter()
+	 */
+	public void enter() {
+		if (getRuntimeDelegate() != null)
+			getRuntimeDelegate().getRuntimeWorkingCopy().setName(createName());
+		validateDecorators();
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.wst.server.ui.wizard.WizardFragment#exit()
+	 */
 	public void exit() {
 		// validate to save latest values
-		for (int i = 0; i < fDecorators.length; i++) {
-			if (fDecorators[i].validate())
-				return;
-		}
+		validateDecorators();
 	}
 
 	private GenericServerRuntime getRuntimeDelegate() {



Mime
View raw message