geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r696955 - in /geronimo/components/txmanager/trunk: ./ geronimo-connector/ geronimo-connector/src/main/resources/ geronimo-transaction/ geronimo-transaction/src/main/resources/
Date Fri, 19 Sep 2008 07:23:03 GMT
Author: jdillon
Date: Fri Sep 19 00:23:02 2008
New Revision: 696955

URL: http://svn.apache.org/viewvc?rev=696955&view=rev
Log:
Upgrade to Genesis 2.0

Removed:
    geronimo/components/txmanager/trunk/geronimo-connector/LICENSE.txt
    geronimo/components/txmanager/trunk/geronimo-connector/NOTICE.txt
    geronimo/components/txmanager/trunk/geronimo-connector/src/main/resources/
    geronimo/components/txmanager/trunk/geronimo-transaction/LICENSE.txt
    geronimo/components/txmanager/trunk/geronimo-transaction/NOTICE.txt
    geronimo/components/txmanager/trunk/geronimo-transaction/src/main/resources/
Modified:
    geronimo/components/txmanager/trunk/geronimo-connector/pom.xml
    geronimo/components/txmanager/trunk/geronimo-transaction/pom.xml
    geronimo/components/txmanager/trunk/pom.xml

Modified: geronimo/components/txmanager/trunk/geronimo-connector/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/components/txmanager/trunk/geronimo-connector/pom.xml?rev=696955&r1=696954&r2=696955&view=diff
==============================================================================
--- geronimo/components/txmanager/trunk/geronimo-connector/pom.xml (original)
+++ geronimo/components/txmanager/trunk/geronimo-connector/pom.xml Fri Sep 19 00:23:02 2008
@@ -29,9 +29,9 @@
     </parent>
 
     <artifactId>geronimo-connector</artifactId>
-    <packaging>bundle</packaging>
     <name>Geronimo TxManager :: Connector</name>
-
+    <packaging>bundle</packaging>
+    
     <properties>
         <geronimo.txmanager.osgi.export.pkg>org.apache.geronimo.connector</geronimo.txmanager.osgi.export.pkg>
         <geronimo.txmanager.osgi.import.pkg>*</geronimo.txmanager.osgi.import.pkg>
@@ -41,13 +41,18 @@
         <dependency>
             <groupId>org.apache.geronimo.components</groupId>
             <artifactId>geronimo-transaction</artifactId>
-            <version>${version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
         </dependency>
+        
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
 </project>

Modified: geronimo/components/txmanager/trunk/geronimo-transaction/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/components/txmanager/trunk/geronimo-transaction/pom.xml?rev=696955&r1=696954&r2=696955&view=diff
==============================================================================
--- geronimo/components/txmanager/trunk/geronimo-transaction/pom.xml (original)
+++ geronimo/components/txmanager/trunk/geronimo-transaction/pom.xml Fri Sep 19 00:23:02 2008
@@ -29,9 +29,9 @@
     </parent>
 
     <artifactId>geronimo-transaction</artifactId>
-    <packaging>bundle</packaging>
     <name>Geronimo TxManager :: Transaction</name>
-
+    <packaging>bundle</packaging>
+    
     <properties>
         <geronimo.txmanager.osgi.export.pkg>org.apache.geronimo.transaction</geronimo.txmanager.osgi.export.pkg>
         <geronimo.txmanager.osgi.import.pkg>org.objectweb.howl*;resolution:=optional,*</geronimo.txmanager.osgi.import.pkg>
@@ -57,6 +57,12 @@
             <groupId>org.objectweb.howl</groupId>
             <artifactId>howl</artifactId>
         </dependency>
+        
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
 </project>

Modified: geronimo/components/txmanager/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/components/txmanager/trunk/pom.xml?rev=696955&r1=696954&r2=696955&view=diff
==============================================================================
--- geronimo/components/txmanager/trunk/pom.xml (original)
+++ geronimo/components/txmanager/trunk/pom.xml Fri Sep 19 00:23:02 2008
@@ -21,11 +21,11 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
-
+    
     <parent>
-        <groupId>org.apache.geronimo.genesis.config</groupId>
-        <artifactId>project-config</artifactId>
-        <version>1.3</version>
+        <groupId>org.apache.geronimo.genesis.flava</groupId>
+        <artifactId>genesis-java5-flava</artifactId>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.geronimo.components</groupId>
@@ -34,6 +34,10 @@
     <packaging>pom</packaging>
     <name>Geronimo TxManager</name>
     
+    <description>
+        Geronimo Transaction Manager
+    </description>
+    
     <scm>
         <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/components/txmanager/trunk</connection>
         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/components/txmanager/trunk</developerConnection>
@@ -53,9 +57,9 @@
 
         <!-- OSGi properties -->
         <geronimo.txmanager.osgi.export>${geronimo.txmanager.osgi.export.pkg}*;version=${version}</geronimo.txmanager.osgi.export>
-        <geronimo.txmanager.osgi.export.pkg />
-        <geronimo.txmanager.osgi.import.pkg />
-        <geronimo.txmanager.osgi.private.pkg />
+        <geronimo.txmanager.osgi.export.pkg/>
+        <geronimo.txmanager.osgi.import.pkg/>
+        <geronimo.txmanager.osgi.private.pkg/>
     </properties>
     
     <dependencyManagement>
@@ -83,6 +87,20 @@
                 <artifactId>howl</artifactId>
                 <version>1.0.1-1</version>
             </dependency>
+            
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>3.8.2</version>
+            </dependency>
+            
+            <!-- INTERNAL -->
+            
+            <dependency>
+                <groupId>org.apache.geronimo.components</groupId>
+                <artifactId>geronimo-transaction</artifactId>
+                <version>2.2-SNAPSHOT</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -96,29 +114,7 @@
             <plugins>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-enforcer-plugin</artifactId>
-                    <version>1.0-alpha-3</version>
-                </plugin>
-                
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.3</version>
-                    <configuration>
-                        <redirectTestOutputToFile>true</redirectTestOutputToFile>
-                    </configuration>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-install-plugin</artifactId>
-                    <version>2.2</version>
-                </plugin>
-                
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-jar-plugin</artifactId>
-                    <version>2.1</version>
                     <configuration>
                         <archive>
                             <!-- Do not include META-INF/maven to avoid long file problems
on windows -->
@@ -134,6 +130,12 @@
                         </execution>
                     </executions>
                 </plugin>
+                
+                <plugin>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>maven-bundle-plugin</artifactId>
+                    <version>1.2.0</version>
+                </plugin>
             </plugins>
         </pluginManagement>
 
@@ -163,64 +165,10 @@
                     </execution>
                 </executions>
             </plugin>
-            
-            <plugin>
-                <groupId>org.apache.geronimo.genesis.plugins</groupId>
-                <artifactId>tools-maven-plugin</artifactId>
-
-                <!-- Tools includes custom packagings, install as extension to pick them
up -->
-                <extensions>true</extensions>
-
-                <executions>
-                    <execution>
-                        <id>install-legal-files</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>copy-legal-files</goal>
-                        </goals>
-                        <configuration>
-                            <strict>true</strict>
-                        </configuration>
-                    </execution>
-
-                    <execution>
-                        <id>verify-legal-files</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>verify-legal-files</goal>
-                        </goals>
-                        <configuration>
-                            <strict>true</strict>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.0</version>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-idea-plugin</artifactId>
-                <version>2.1</version>
-                <configuration>
-                    <jdkName>1.5</jdkName>
-                    <jdkLevel>1.5</jdkLevel>
-                    <linkModules>true</linkModules>
-                </configuration>
-            </plugin>
 
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.2.0</version>
                 <extensions>true</extensions>
                 <executions>
                     <execution>
@@ -231,7 +179,7 @@
                 </executions>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Export-Package>${geronimo.txmanager.osgi.export}</Export-Package>
                         <Import-Package>${geronimo.txmanager.osgi.import.pkg}*</Import-Package>
                         <Private-Package>${geronimo.txmanager.osgi.private.pkg}</Private-Package>



Mime
View raw message