geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sppa...@apache.org
Subject svn commit: r384053 - in /geronimo/devtools/eclipse-plugin/trunk: maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/ plugins/org.apache.geronimo.deployment.model.edit/ plugins/org.apache.geronimo.deployment....
Date Tue, 07 Mar 2006 23:37:50 GMT
Author: sppatel
Date: Tue Mar  7 15:37:46 2006
New Revision: 384053

URL: http://svn.apache.org/viewcvs?rev=384053&view=rev
Log:
m2 updates

Modified:
    geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/InstallPluginDependenciesMojo.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.devtools.eclipse.core/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v1/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/pom.xml

Modified: geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/InstallPluginDependenciesMojo.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/InstallPluginDependenciesMojo.java?rev=384053&r1=384052&r2=384053&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/InstallPluginDependenciesMojo.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/InstallPluginDependenciesMojo.java
Tue Mar  7 15:37:46 2006
@@ -106,8 +106,23 @@
 		while (i.hasNext()) {
 			Dependency dependency = (Dependency) i.next();
 			if (GROUP_ID.equals(dependency.getGroupId())) {
+				updateForSWTFragment(dependency);
 				getLog().debug("Eclipse dependency: " + dependency.toString());
 				process(pluginsDir, 0, dependency);
+			}
+		}
+	}
+
+	private void updateForSWTFragment(Dependency dependency) {
+		if("org.eclipse.swt.fragment".equals(dependency.getArtifactId())) {
+			String platform = System.getProperty("os.name");
+			String id = dependency.getArtifactId();
+			if(platform.startsWith("Windows")) {
+				dependency.setArtifactId(id.replaceFirst("fragment", "win32.win32.x86"));
+			} else if(platform.startsWith("Linux")) {
+				dependency.setArtifactId(id.replaceFirst("fragment", "gtk.linux.x86"));
+			} else if(platform.startsWith("Mac")) {
+				dependency.setArtifactId(id.replaceFirst("fragment", "carbon.macosx.ppc"));
 			}
 		}
 	}

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/pom.xml?rev=384053&r1=384052&r2=384053&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/pom.xml
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/pom.xml
Tue Mar  7 15:37:46 2006
@@ -8,7 +8,23 @@
     <groupId>org.apache.geronimo.devtools</groupId>
     <artifactId>geronimo-eclipse-plugin</artifactId>
     <version>1.0</version>
-  </parent>
+  </parent>
+  <build>
+    <resources>
+      <resource>
+        <directory>.</directory>
+        <includes>
+          <include>plugin.xml</include>
+        </includes>
+      </resource>
+      <resource>
+        <directory>.</directory>
+        <includes>
+          <include>plugin.properties</include>
+        </includes>
+      </resource>
+    </resources>
+  </build>
   <dependencies>
   	<!-- g plugin dependencies -->
     <dependency>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model/pom.xml?rev=384053&r1=384052&r2=384053&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model/pom.xml
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model/pom.xml
Tue Mar  7 15:37:46 2006
@@ -8,7 +8,23 @@
     <groupId>org.apache.geronimo.devtools</groupId>
     <artifactId>geronimo-eclipse-plugin</artifactId>
     <version>1.0</version>
-  </parent>
+  </parent>
+  <build>
+    <resources>
+      <resource>
+        <directory>.</directory>
+        <includes>
+          <include>plugin.xml</include>
+        </includes>
+      </resource>
+      <resource>
+        <directory>.</directory>
+        <includes>
+          <include>plugin.properties</include>
+        </includes>
+      </resource>
+    </resources>
+  </build>
   <dependencies>
     <dependency>
       <groupId>org.eclipse.plugins</groupId>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.devtools.eclipse.core/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.devtools.eclipse.core/pom.xml?rev=384053&r1=384052&r2=384053&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.devtools.eclipse.core/pom.xml
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.devtools.eclipse.core/pom.xml
Tue Mar  7 15:37:46 2006
@@ -8,7 +8,50 @@
     <groupId>org.apache.geronimo.devtools</groupId>
     <artifactId>geronimo-eclipse-plugin</artifactId>
     <version>1.0</version>
-  </parent>
+  </parent>
+  <build>
+    <resources>
+      <resource>
+        <directory>.</directory>
+        <includes>
+          <include>plugin.xml</include>
+        </includes>
+      </resource>
+      <resource>
+        <directory>.</directory>
+        <includes>
+          <include>plugin.properties</include>
+        </includes>
+      </resource>
+      <resource>
+        <targetPath>serverdef/</targetPath>
+        <directory>serverdef</directory>
+        <includes>
+          <include>geronimo10.serverdef</include>
+        </includes>
+      </resource>
+      <resource>
+        <targetPath>schema/</targetPath>
+        <directory>schema</directory>
+        <includes>
+          <include>discouragedRuntimeAccess.exsd</include>
+        </includes>
+      </resource>
+      <resource>
+        <directory>.</directory>
+        <includes>
+          <include>.options</include>
+        </includes>
+      </resource>
+      <resource>
+        <targetPath>org/apache/geronimo/core/internal</targetPath>
+        <directory>src/org/apache/geronimo/core/internal</directory>
+        <includes>
+          <include>Messages.properties</include>
+        </includes>
+      </resource>
+    </resources>
+  </build>
   <dependencies>
     <!-- g plugin dependencies -->
     <dependency>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v1/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v1/pom.xml?rev=384053&r1=384052&r2=384053&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v1/pom.xml
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v1/pom.xml
Tue Mar  7 15:37:46 2006
@@ -9,6 +9,27 @@
     <artifactId>geronimo-eclipse-plugin</artifactId>
     <version>1.0</version>
   </parent>
+  <build>
+    <resources>
+      <resource>
+        <directory>.</directory>
+        <includes>
+          <include>plugin.xml</include>
+        </includes>
+      </resource>
+      <resource>
+        <directory>lib</directory>
+        <targetPath>lib</targetPath>
+        <includes>
+          <include>*.jar</include>
+        </includes>
+        <excludes>
+          <exclude>oro*.jar</exclude>
+          <exclude>ant*.jar</exclude>
+        </excludes>
+      </resource>
+    </resources>
+  </build>
   <dependencies>
     <!-- geronimo lib dependencies -->
     <dependency>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/pom.xml?rev=384053&r1=384052&r2=384053&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/pom.xml Tue Mar
 7 15:37:46 2006
@@ -8,7 +8,43 @@
     <groupId>org.apache.geronimo.devtools</groupId>
     <artifactId>geronimo-eclipse-plugin</artifactId>
     <version>1.0</version>
-  </parent>
+  </parent>
+  <build>
+    <resources>
+      <resource>
+        <directory>.</directory>
+        <includes>
+          <include>plugin.xml</include>
+        </includes>
+      </resource>      
+      <resource>
+        <targetPath>org/apache/geronimo/ui/internal</targetPath>
+        <directory>src/org/apache/geronimo/ui/internal</directory>
+        <includes>
+          <include>Messages.properties</include>
+        </includes>
+      </resource>
+      <resource>
+        <targetPath>icons</targetPath>
+        <directory>icons</directory>
+        <includes>
+          <include>**/*.gif</include>
+        </includes>
+      </resource>
+      <resource>
+        <directory>.</directory>
+        <includes>
+          <include>plugin.properties</include>
+        </includes>
+      </resource>
+       <resource>
+        <directory>.</directory>
+        <includes>
+          <include>.options</include>
+        </includes>
+      </resource>
+    </resources>
+  </build>
   <dependencies>
     <!-- g plugin dependencies -->
     <dependency>



Mime
View raw message