geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r1086764 - in /geronimo/sandbox/djencks/txmanager: ./ connector-itests/src/test/java/org/apache/geronimo/components/connector/itests/ geronimo-transaction/ geronimo-txmanager-server/ org.apache.geronimo.jaxb-support/ org.apache.geronimo.tra...
Date Tue, 29 Mar 2011 21:42:29 GMT
Author: djencks
Date: Tue Mar 29 21:42:28 2011
New Revision: 1086764

URL: http://svn.apache.org/viewvc?rev=1086764&view=rev
Log:
update to new karaf-maven-plugin name

Modified:
    geronimo/sandbox/djencks/txmanager/connector-itests/src/test/java/org/apache/geronimo/components/connector/itests/DeployerTest.java
    geronimo/sandbox/djencks/txmanager/geronimo-transaction/pom.xml
    geronimo/sandbox/djencks/txmanager/geronimo-txmanager-server/pom.xml
    geronimo/sandbox/djencks/txmanager/org.apache.geronimo.jaxb-support/pom.xml
    geronimo/sandbox/djencks/txmanager/org.apache.geronimo.transaction.kar/pom.xml
    geronimo/sandbox/djencks/txmanager/org.apache.geronimo.transaction/pom.xml
    geronimo/sandbox/djencks/txmanager/pom.xml

Modified: geronimo/sandbox/djencks/txmanager/connector-itests/src/test/java/org/apache/geronimo/components/connector/itests/DeployerTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/connector-itests/src/test/java/org/apache/geronimo/components/connector/itests/DeployerTest.java?rev=1086764&r1=1086763&r2=1086764&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/connector-itests/src/test/java/org/apache/geronimo/components/connector/itests/DeployerTest.java
(original)
+++ geronimo/sandbox/djencks/txmanager/connector-itests/src/test/java/org/apache/geronimo/components/connector/itests/DeployerTest.java
Tue Mar 29 21:42:28 2011
@@ -1,30 +1,15 @@
 package org.apache.geronimo.components.connector.itests;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
 import java.io.InputStream;
-import java.io.ObjectOutput;
-import java.io.ObjectOutputStream;
 import java.net.URL;
 
-import javax.resource.ResourceException;
 import javax.resource.spi.BootstrapContext;
 import javax.resource.spi.ResourceAdapter;
 import org.apache.geronimo.connector.ConnectionManagerContainer;
 import org.apache.geronimo.connector.ConnectionTracker;
 import org.apache.geronimo.connector.deployment.InfoBuilder;
-import org.apache.geronimo.connector.extender.ConnectorExtender;
 import org.apache.geronimo.connector.mock.MockAdminObject;
-import org.apache.geronimo.connector.mock.MockAdminObjectImpl;
 import org.apache.geronimo.connector.mock.MockConnectionFactory;
-import org.apache.geronimo.connector.mock.MockManagedConnectionFactory;
-import org.apache.geronimo.connector.mock.MockResourceAdapter;
-import org.apache.geronimo.connector.model.AdminObjectInfo;
-import org.apache.geronimo.connector.model.ManagedConnectionFactoryInfo;
-import org.apache.geronimo.connector.model.ResourceAdapterInfo;
-import org.apache.geronimo.connector.model.ResourceAdapterModuleInfo;
-import org.apache.geronimo.j2ee.deployment.ModuleBuilder;
 import org.apache.geronimo.transaction.RecoverableTransactionManager;
 import org.junit.Assert;
 import org.junit.Test;
@@ -42,7 +27,6 @@ import org.osgi.framework.Constants;
 import org.osgi.framework.ServiceReference;
 import org.osgi.service.component.ComponentFactory;
 
-import static org.ops4j.pax.exam.CoreOptions.equinox;
 import static org.ops4j.pax.exam.CoreOptions.felix;
 import static org.ops4j.pax.exam.CoreOptions.options;
 import static org.ops4j.pax.exam.CoreOptions.systemProperty;
@@ -110,7 +94,8 @@ public class DeployerTest {
                                 .build();
                     }
                 },
-                equinox().version("3.5.0")
+//                equinox().version("3.5.0")
+                felix()//.version("3.0.9")
         );
 //        options = updateOptions(options);
         return options;

Modified: geronimo/sandbox/djencks/txmanager/geronimo-transaction/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/geronimo-transaction/pom.xml?rev=1086764&r1=1086763&r2=1086764&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/geronimo-transaction/pom.xml (original)
+++ geronimo/sandbox/djencks/txmanager/geronimo-transaction/pom.xml Tue Mar 29 21:42:28 2011
@@ -81,13 +81,6 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <!--<dependency>-->
-            <!--<groupId>org.apache.karaf</groupId>-->
-            <!--<artifactId>apache-karaf</artifactId>-->
-            <!--<version>2.1.99-SNAPSHOT</version>-->
-            <!--<type>pom</type>-->
-            <!--<scope>provided</scope>-->
-        <!--</dependency>-->
     </dependencies>
 
     <build>
@@ -96,25 +89,6 @@
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-scr-plugin</artifactId>
             </plugin>
-            <!--<plugin>-->
-              <!--<groupId>org.apache.karaf.tooling</groupId>-->
-              <!--<artifactId>features-maven-plugin</artifactId>-->
-              <!--<version>2.1.99-SNAPSHOT</version>-->
-                <!--<executions>-->
-                  <!--<execution>-->
-                    <!--<id>generate</id>-->
-                    <!--<phase>generate-resources</phase>-->
-                    <!--<goals>-->
-                      <!--<goal>generate-features-xml</goal>-->
-                    <!--</goals>-->
-                    <!--<configuration>-->
-                      <!--&lt;!&ndash;<bundles>src/main/resources/bundles.properties</bundles>&ndash;&gt;-->
-                      <!--&lt;!&ndash;<kernelVersion>2.1.99-SNAPSHOT</kernelVersion>&ndash;&gt;-->
-                      <!--&lt;!&ndash;<outputFile>target/features.xml</outputFile>&ndash;&gt;-->
-                    <!--</configuration>-->
-                  <!--</execution>-->
-                <!--</executions>-->
-              <!--</plugin>-->
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>

Modified: geronimo/sandbox/djencks/txmanager/geronimo-txmanager-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/geronimo-txmanager-server/pom.xml?rev=1086764&r1=1086763&r2=1086764&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/geronimo-txmanager-server/pom.xml (original)
+++ geronimo/sandbox/djencks/txmanager/geronimo-txmanager-server/pom.xml Tue Mar 29 21:42:28
2011
@@ -43,15 +43,4 @@
         </dependency>
 
     </dependencies>
-    <build>
-        <pluginManagement>
-        </pluginManagement>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.karaf.tooling</groupId>
-                <artifactId>features-maven-plugin</artifactId>
-                <version>${karafVersion}</version>
-            </plugin>
-        </plugins>
-    </build>
 </project>

Modified: geronimo/sandbox/djencks/txmanager/org.apache.geronimo.jaxb-support/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/org.apache.geronimo.jaxb-support/pom.xml?rev=1086764&r1=1086763&r2=1086764&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/org.apache.geronimo.jaxb-support/pom.xml (original)
+++ geronimo/sandbox/djencks/txmanager/org.apache.geronimo.jaxb-support/pom.xml Tue Mar 29
21:42:28 2011
@@ -34,7 +34,6 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.scr</artifactId>
-            <version>1.6.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
@@ -90,7 +89,7 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.karaf.tooling</groupId>
-                <artifactId>features-maven-plugin</artifactId>
+                <artifactId>karaf-maven-plugin</artifactId>
                 <configuration>
                     <startLevel>15</startLevel>
                     <checkDependencyChange>true</checkDependencyChange>

Modified: geronimo/sandbox/djencks/txmanager/org.apache.geronimo.transaction.kar/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/org.apache.geronimo.transaction.kar/pom.xml?rev=1086764&r1=1086763&r2=1086764&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/org.apache.geronimo.transaction.kar/pom.xml (original)
+++ geronimo/sandbox/djencks/txmanager/org.apache.geronimo.transaction.kar/pom.xml Tue Mar
29 21:42:28 2011
@@ -69,7 +69,6 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.scr</artifactId>
-            <version>1.6.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
@@ -101,7 +100,7 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.karaf.tooling</groupId>
-                <artifactId>features-maven-plugin</artifactId>
+                <artifactId>karaf-maven-plugin</artifactId>
                 <configuration>
                     <aggregateFeatures>true</aggregateFeatures>
                     <startLevel>60</startLevel>

Modified: geronimo/sandbox/djencks/txmanager/org.apache.geronimo.transaction/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/org.apache.geronimo.transaction/pom.xml?rev=1086764&r1=1086763&r2=1086764&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/org.apache.geronimo.transaction/pom.xml (original)
+++ geronimo/sandbox/djencks/txmanager/org.apache.geronimo.transaction/pom.xml Tue Mar 29
21:42:28 2011
@@ -69,7 +69,6 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.scr</artifactId>
-            <version>1.6.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
@@ -101,7 +100,7 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.karaf.tooling</groupId>
-                <artifactId>features-maven-plugin</artifactId>
+                <artifactId>karaf-maven-plugin</artifactId>
                 <configuration>
                     <aggregateFeatures>true</aggregateFeatures>
                     <startLevel>60</startLevel>

Modified: geronimo/sandbox/djencks/txmanager/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/pom.xml?rev=1086764&r1=1086763&r2=1086764&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/pom.xml (original)
+++ geronimo/sandbox/djencks/txmanager/pom.xml Tue Mar 29 21:42:28 2011
@@ -173,12 +173,12 @@
             <dependency>
                 <groupId>org.ops4j.pax.logging</groupId>
                 <artifactId>pax-logging-api</artifactId>
-                <version>1.4</version>
+                <version>1.6.1</version>
             </dependency>
             <dependency>
                 <groupId>org.ops4j.pax.logging</groupId>
                 <artifactId>pax-logging-service</artifactId>
-                <version>1.4</version>
+                <version>1.6.1</version>
                 <exclusions>
                     <exclusion>
                         <groupId>com.sun.jdmk</groupId>
@@ -317,12 +317,22 @@
                 </plugin>
                 <plugin>
                     <groupId>org.apache.karaf.tooling</groupId>
-                    <artifactId>features-maven-plugin</artifactId>
+                    <artifactId>karaf-maven-plugin</artifactId>
                     <version>${karafVersion}</version>
                     <extensions>true</extensions>
                 </plugin>
             </plugins>
         </pluginManagement>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.karaf.tooling</groupId>
+                <artifactId>karaf-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
     </build>
 
     <modules>



Mime
View raw message