geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sppa...@apache.org
Subject svn commit: r280550 - in /geronimo/devtools/trunk/modules/eclipse-plugin: ./ assembly/ etc/ org.apache.geronimo.core/ org.apache.geronimo.deployment.model/ org.apache.geronimo.feature/ org.apache.geronimo.runtime.v1/ org.apache.geronimo.ui/
Date Tue, 13 Sep 2005 13:02:54 GMT
Author: sppatel
Date: Tue Sep 13 06:02:41 2005
New Revision: 280550

URL: http://svn.apache.org/viewcvs?rev=280550&view=rev
Log:
jira devtools#11

Added:
    geronimo/devtools/trunk/modules/eclipse-plugin/etc/
    geronimo/devtools/trunk/modules/eclipse-plugin/etc/maven.xml
    geronimo/devtools/trunk/modules/eclipse-plugin/etc/project.properties
    geronimo/devtools/trunk/modules/eclipse-plugin/etc/project.xml
    geronimo/devtools/trunk/modules/eclipse-plugin/maven.xml
Modified:
    geronimo/devtools/trunk/modules/eclipse-plugin/assembly/maven.xml
    geronimo/devtools/trunk/modules/eclipse-plugin/assembly/project.xml
    geronimo/devtools/trunk/modules/eclipse-plugin/org.apache.geronimo.core/project.properties
    geronimo/devtools/trunk/modules/eclipse-plugin/org.apache.geronimo.core/project.xml
    geronimo/devtools/trunk/modules/eclipse-plugin/org.apache.geronimo.deployment.model/project.properties
    geronimo/devtools/trunk/modules/eclipse-plugin/org.apache.geronimo.deployment.model/project.xml
    geronimo/devtools/trunk/modules/eclipse-plugin/org.apache.geronimo.feature/project.xml
    geronimo/devtools/trunk/modules/eclipse-plugin/org.apache.geronimo.runtime.v1/maven.xml
    geronimo/devtools/trunk/modules/eclipse-plugin/org.apache.geronimo.runtime.v1/project.xml
    geronimo/devtools/trunk/modules/eclipse-plugin/org.apache.geronimo.ui/project.properties
    geronimo/devtools/trunk/modules/eclipse-plugin/org.apache.geronimo.ui/project.xml

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/assembly/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/assembly/maven.xml?rev=280550&r1=280549&r2=280550&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/assembly/maven.xml (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/assembly/maven.xml Tue Sep 13 06:02:41
2005
@@ -6,6 +6,10 @@
     <goal name="default">
         <attainGoal name="build"/>
     </goal>
+    
+    <goal name="jar:install">
+        <attainGoal name="build"/>
+    </goal>
 
     <goal name="build">
         <attainGoal name="copyjars"/>

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/assembly/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/assembly/project.xml?rev=280550&r1=280549&r2=280550&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/assembly/project.xml (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/assembly/project.xml Tue Sep 13 06:02:41
2005
@@ -1,52 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project>
-  <pomVersion>3</pomVersion>
-  <groupId>geronimo</groupId>
-  <id>feature-assembly</id>
-  <name>feature-assembly</name>
-  <currentVersion>1.0.0</currentVersion>
+  <extend>../etc/project.xml</extend>
+  <id>assembly</id>
+  <name>assembly</name>
   <dependencies>
     <dependency>
-      <groupId>geronimo</groupId>
+      <groupId>geronimo-devtools</groupId>
       <artifactId>org.apache.geronimo.core</artifactId>
-      <version>1.0.0</version>
+      <version>${devtools_currentversion}</version>
       <properties>
         <jar>true</jar>
       </properties>
     </dependency>
     <dependency>
-      <groupId>geronimo</groupId>
+      <groupId>geronimo-devtools</groupId>
       <artifactId>org.apache.geronimo.deployment.model</artifactId>
-      <version>1.0.0</version>
+      <version>${devtools_currentversion}</version>
       <properties>
         <jar>true</jar>
       </properties>
     </dependency>
     <dependency>
-      <groupId>geronimo</groupId>
+      <groupId>geronimo-devtools</groupId>
       <artifactId>org.apache.geronimo.feature</artifactId>
-      <version>1.0.0</version>
+      <version>${devtools_currentversion}</version>
       <properties>
         <feature>true</feature>
       </properties>
     </dependency>
     <dependency>
-      <groupId>geronimo</groupId>
+      <groupId>geronimo-devtools</groupId>
       <artifactId>org.apache.geronimo.runtime.v1</artifactId>
-      <version>1.0.0</version>
+      <version>${devtools_currentversion}</version>
       <properties>
         <jar>false</jar>
       </properties>
     </dependency>
     <dependency>
-      <groupId>geronimo</groupId>
+      <groupId>geronimo-devtools</groupId>
       <artifactId>org.apache.geronimo.ui</artifactId>
-      <version>1.0.0</version>
+      <version>${devtools_currentversion}</version>
       <properties>
         <jar>true</jar>
       </properties>
     </dependency>
   </dependencies>
 </project>
-
-

Added: geronimo/devtools/trunk/modules/eclipse-plugin/etc/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/etc/maven.xml?rev=280550&view=auto
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/etc/maven.xml (added)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/etc/maven.xml Tue Sep 13 06:02:41 2005
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project default="default"
+    xmlns:j="jelly:core"
+    xmlns:ant="jelly:ant">
+
+    <goal name="default">
+        <attainGoal name="jar:install"/>
+    </goal>
+         
+</project>
\ No newline at end of file

Added: 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=280550&view=auto
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/etc/project.properties (added)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/etc/project.properties Tue Sep 13 06:02:41
2005
@@ -0,0 +1,10 @@
+eclipse.home=C:/eclipse/
+eclipse.home.plugins=${eclipse.home}/plugins
+
+maven.jar.override=on
+
+devtools_currentversion=1.0.0
+
+geronimo_runtime_version=1.0-M4
+geronimo_spec_version=1.1-rc4
+mx4j_version=3.0.1

Added: geronimo/devtools/trunk/modules/eclipse-plugin/etc/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/etc/project.xml?rev=280550&view=auto
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/etc/project.xml (added)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/etc/project.xml Tue Sep 13 06:02:41 2005
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+    <pomVersion>3</pomVersion>
+    <id>etc</id>
+    <name>etc</name>
+    <currentVersion>${devtools_currentversion}</currentVersion>
+    <groupId>geronimo-devtools</groupId>
+    <organization>
+        <name>Apache Software Foundation</name>
+        <url>http://geronimo.apache.org/</url>
+        <logo>http://geronimo.apache.org/images/geronimo-logo.png</logo>
+    </organization>
+ </project>

Added: geronimo/devtools/trunk/modules/eclipse-plugin/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/maven.xml?rev=280550&view=auto
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/maven.xml (added)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/maven.xml Tue Sep 13 06:02:41 2005
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project default="default"
+    xmlns:j="jelly:core"
+    xmlns:ant="jelly:ant">
+
+    <goal name="default">
+        <j:set var="maven.multiproject.excludes" value="etc/project.xml"/>
+        <j:set var="goal" value="jar:install"/>
+        <attainGoal name="multiproject:goal"/>
+    </goal>
+
+    <goal name="build">
+        <attainGoal name="default"/>
+    </goal>
+    
+    <goal name="clean">
+        <j:set var="goal" value="clean"/>
+        <attainGoal name="multiproject:goal"/>
+    </goal>
+
+    <goal name="rebuild">
+        <attainGoal name="clean"/>
+        <attainGoal name="build"/>
+    </goal>
+     
+</project>
\ No newline at end of file

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/org.apache.geronimo.core/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/org.apache.geronimo.core/project.properties?rev=280550&r1=280549&r2=280550&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/org.apache.geronimo.core/project.properties
(original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/org.apache.geronimo.core/project.properties
Tue Sep 13 06:02:41 2005
@@ -1,6 +1,5 @@
-eclipse.home.plugins=C:/eclipse/plugins/
+
 maven.jar.manifest=META-INF/MANIFEST.MF
-maven.jar.override=on
 
 maven.jar.org.eclipse.osgi = ${eclipse.home.plugins}/org.eclipse.osgi_3.1.0.jar
 maven.jar.org.eclipse.core.runtime = ${eclipse.home.plugins}/org.eclipse.core.runtime_3.1.0.jar

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/org.apache.geronimo.core/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/org.apache.geronimo.core/project.xml?rev=280550&r1=280549&r2=280550&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/org.apache.geronimo.core/project.xml (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/org.apache.geronimo.core/project.xml Tue
Sep 13 06:02:41 2005
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project>
-  <pomVersion>3</pomVersion>
-  <groupId>geronimo</groupId>
+  <extend>../etc/project.xml</extend>
   <id>org.apache.geronimo.core</id>
   <name>org.apache.geronimo.core</name>
-  <currentVersion>1.0.0</currentVersion>
   <build>
     <sourceDirectory>src</sourceDirectory>
     <resources>
@@ -34,31 +32,31 @@
     <dependency>
       <groupId>geronimo</groupId>
       <artifactId>geronimo-kernel</artifactId>
-      <version>1.0-SNAPSHOT</version>
+      <version>${geronimo_runtime_version}</version>
     </dependency>
     <dependency>
       <groupId>geronimo</groupId>
       <artifactId>geronimo-deploy-jsr88</artifactId>
-      <version>1.0-SNAPSHOT</version>
+      <version>${geronimo_runtime_version}</version>
     </dependency>
     <dependency>
       <groupId>mx4j</groupId>
       <artifactId>mx4j-remote</artifactId>
-      <version>3.0.1</version>
+      <version>${mx4j_version}</version>
     </dependency>
     <dependency>
       <groupId>mx4j</groupId>
       <artifactId>mx4j</artifactId>
-      <version>3.0.1</version>
+      <version>${mx4j_version}</version>
     </dependency>
     <dependency>
       <groupId>geronimo-spec</groupId>
       <artifactId>geronimo-spec-j2ee-deployment</artifactId>
-      <version>1.1-rc4</version>
+      <version>${geronimo_spec_version}</version>
     </dependency>
     <!-- geronimo plugin dependencies -->
     <dependency>
-      <groupId>geronimo</groupId>
+      <groupId>geronimo-devtools</groupId>
       <artifactId>org.apache.geronimo.deployment.model</artifactId>
       <version>1.0.0</version>
     </dependency>

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/org.apache.geronimo.deployment.model/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/org.apache.geronimo.deployment.model/project.properties?rev=280550&r1=280549&r2=280550&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/org.apache.geronimo.deployment.model/project.properties
(original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/org.apache.geronimo.deployment.model/project.properties
Tue Sep 13 06:02:41 2005
@@ -1,6 +1,4 @@
-eclipse.home.plugins=C:/eclipse/plugins/
 maven.jar.manifest=META-INF/MANIFEST.MF
-maven.jar.override=on
 
 maven.jar.org.eclipse.osgi = ${eclipse.home.plugins}/org.eclipse.osgi_3.1.0.jar
 maven.jar.org.eclipse.core.runtime = ${eclipse.home.plugins}/org.eclipse.core.runtime_3.1.0.jar

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/org.apache.geronimo.deployment.model/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/org.apache.geronimo.deployment.model/project.xml?rev=280550&r1=280549&r2=280550&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/org.apache.geronimo.deployment.model/project.xml
(original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/org.apache.geronimo.deployment.model/project.xml
Tue Sep 13 06:02:41 2005
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project>
-  <pomVersion>3</pomVersion>
-  <groupId>geronimo</groupId>
+  <extend>../etc/project.xml</extend>
   <id>org.apache.geronimo.deployment.model</id>
   <name>org.apache.geronimo.deployment.model</name>
-  <currentVersion>1.0.0</currentVersion>
   <build>
     <sourceDirectory>src</sourceDirectory>
     <resources>

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/org.apache.geronimo.feature/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/org.apache.geronimo.feature/project.xml?rev=280550&r1=280549&r2=280550&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/org.apache.geronimo.feature/project.xml
(original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/org.apache.geronimo.feature/project.xml
Tue Sep 13 06:02:41 2005
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project>
-  <pomVersion>3</pomVersion>
-  <groupId>geronimo</groupId>
+  <extend>../etc/project.xml</extend>
   <id>org.apache.geronimo.feature</id>
   <name>org.apache.geronimo.feature</name>
-  <currentVersion>1.0.0</currentVersion>
   <build>
     <resources>
       <resource>

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/org.apache.geronimo.runtime.v1/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/org.apache.geronimo.runtime.v1/maven.xml?rev=280550&r1=280549&r2=280550&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/org.apache.geronimo.runtime.v1/maven.xml
(original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/org.apache.geronimo.runtime.v1/maven.xml
Tue Sep 13 06:02:41 2005
@@ -5,18 +5,24 @@
 
     <goal name="default">
         <attainGoal name="build"/>
-    </goal>
-
-    <goal name="build">
-        <attainGoal name="copyjars"/>
-        <attainGoal name="jar:jar"/>
+    </goal>    
+    
+    <goal name="build">     
         <attainGoal name="jar:install"/>
     </goal>
+    
+    <preGoal name="java:jar-resources">        
+        <attainGoal name="copyjars"/>
+    </preGoal>
 
     <goal name="rebuild">
         <attainGoal name="clean"/>
         <attainGoal name="build"/>
     </goal>
+        
+    <preGoal name="clean:clean">        
+        <ant:delete dir="${basedir}/lib"/>    
+    </preGoal>
 
     <goal name="copyjars">        
         <j:forEach var="artifact" items="${pom.artifacts}">  

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/org.apache.geronimo.runtime.v1/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/org.apache.geronimo.runtime.v1/project.xml?rev=280550&r1=280549&r2=280550&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/org.apache.geronimo.runtime.v1/project.xml
(original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/org.apache.geronimo.runtime.v1/project.xml
Tue Sep 13 06:02:41 2005
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project>
-  <pomVersion>3</pomVersion>
-  <groupId>geronimo</groupId>
+  <extend>../etc/project.xml</extend>
   <id>org.apache.geronimo.runtime.v1</id>
   <name>org.apache.geronimo.runtime.v1</name>
-  <currentVersion>1.0.0</currentVersion>
   <build>
     <resources>
       <resource>
@@ -14,7 +12,7 @@
         </includes>
       </resource>
       <resource>
-        <directory>lib/</directory>
+        <directory>lib</directory>
         <targetPath>lib</targetPath>
         <includes>
           <include>*.jar</include>
@@ -27,29 +25,29 @@
     <dependency>
       <groupId>geronimo</groupId>
       <artifactId>geronimo-kernel</artifactId>
-      <version>1.0-SNAPSHOT</version>
+      <version>${geronimo_runtime_version}</version>
     </dependency>
-      <dependency>
+    <dependency>
       <groupId>geronimo</groupId>
       <artifactId>geronimo-deploy-jsr88</artifactId>
-      <version>1.0-SNAPSHOT</version>
+      <version>${geronimo_runtime_version}</version>
     </dependency>
     <dependency>
       <groupId>mx4j</groupId>
       <artifactId>mx4j-remote</artifactId>
-      <version>3.0.1</version>
+      <version>${mx4j_version}</version>
     </dependency>
     <dependency>
       <groupId>mx4j</groupId>
       <artifactId>mx4j</artifactId>
-      <version>3.0.1</version>
+      <version>${mx4j_version}</version>
     </dependency>
     <dependency>
       <groupId>geronimo-spec</groupId>
       <artifactId>geronimo-spec-j2ee-deployment</artifactId>
-      <version>1.1-rc4</version>
+      <version>${geronimo_spec_version}</version>
     </dependency>
-   </dependencies>
+  </dependencies>
 </project>
 
 

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/org.apache.geronimo.ui/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/org.apache.geronimo.ui/project.properties?rev=280550&r1=280549&r2=280550&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/org.apache.geronimo.ui/project.properties
(original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/org.apache.geronimo.ui/project.properties
Tue Sep 13 06:02:41 2005
@@ -1,6 +1,4 @@
-eclipse.home.plugins=C:/eclipse/plugins/
 maven.jar.manifest=META-INF/MANIFEST.MF
-maven.jar.override=on
 
 maven.jar.org.eclipse.osgi = ${eclipse.home.plugins}/org.eclipse.osgi_3.1.0.jar
 maven.jar.org.eclipse.core.runtime = ${eclipse.home.plugins}/org.eclipse.core.runtime_3.1.0.jar

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/org.apache.geronimo.ui/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/org.apache.geronimo.ui/project.xml?rev=280550&r1=280549&r2=280550&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/org.apache.geronimo.ui/project.xml (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/org.apache.geronimo.ui/project.xml Tue
Sep 13 06:02:41 2005
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project>
-  <pomVersion>3</pomVersion>
-  <groupId>geronimo</groupId>
+  <extend>../etc/project.xml</extend>
   <id>org.apache.geronimo.ui</id>
   <name>org.apache.geronimo.ui</name>
-  <currentVersion>1.0.0</currentVersion>
   <build>
     <sourceDirectory>src</sourceDirectory>
     <resources>
@@ -26,14 +24,14 @@
   <dependencies>
     <!-- geronimo plugin dependencies -->
     <dependency>
-      <groupId>geronimo</groupId>
+      <groupId>geronimo-devtools</groupId>
       <artifactId>org.apache.geronimo.core</artifactId>
-      <version>1.0.0</version>
+      <version>${devtools_currentversion}</version>
     </dependency>
     <dependency>
-      <groupId>geronimo</groupId>
+      <groupId>geronimo-devtools</groupId>
       <artifactId>org.apache.geronimo.deployment.model</artifactId>
-      <version>1.0.0</version>
+      <version>${devtools_currentversion}</version>
     </dependency>
 
     <!--  eclipse dependencies -->



Mime
View raw message