geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r1084391 - in /geronimo/sandbox/djencks/txmanager: ./ geronimo-connector-builder-1_6/ geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ geronimo-txmanager-server/ org.apache.geronimo.jaxb-support/ org.ap...
Date Tue, 22 Mar 2011 22:39:04 GMT
Author: djencks
Date: Tue Mar 22 22:39:04 2011
New Revision: 1084391

URL: http://svn.apache.org/viewvc?rev=1084391&view=rev
Log:
update to latest karaf

Modified:
    geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/pom.xml
    geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java
    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/geronimo-connector-builder-1_6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/pom.xml?rev=1084391&r1=1084390&r2=1084391&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/pom.xml (original)
+++ geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/pom.xml Tue Mar 22 22:39:04
2011
@@ -48,9 +48,9 @@
         </dependency>
 
         <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-naming-builder</artifactId>
-        <version>${geronimoVersion}</version>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-naming-builder</artifactId>
+            <version>${geronimoVersion}</version>
         </dependency>
 
         <dependency>
@@ -59,9 +59,9 @@
             <version>${geronimoVersion}</version>
         </dependency>
         <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-management</artifactId>
-        <version>${geronimoVersion}</version>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-management</artifactId>
+            <version>${geronimoVersion}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
@@ -74,9 +74,9 @@
         <!--<version>${project.version}</version>-->
         <!--</dependency>-->
         <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-system</artifactId>
-        <version>${geronimoVersion}</version>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-system</artifactId>
+            <version>${geronimoVersion}</version>
         </dependency>
 
         <dependency>
@@ -86,14 +86,14 @@
         </dependency>
 
         <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-j2ee</artifactId>
-        <version>${geronimoVersion}</version>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-j2ee</artifactId>
+            <version>${geronimoVersion}</version>
         </dependency>
         <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-j2ee-builder</artifactId>
-        <version>${geronimoVersion}</version>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-j2ee-builder</artifactId>
+            <version>${geronimoVersion}</version>
         </dependency>
         <!--<dependency>-->
         <!--<groupId>org.apache.geronimo.modules</groupId>-->
@@ -113,11 +113,11 @@
         <!--</dependency>-->
 
         <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-kernel</artifactId>
-        <version>${geronimoVersion}</version>
-        <classifier>tests</classifier>
-        <scope>test</scope>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-kernel</artifactId>
+            <version>${geronimoVersion}</version>
+            <classifier>tests</classifier>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
@@ -159,15 +159,15 @@
         </dependency>
 
         <dependency>
-             <groupId>org.apache.geronimo.components</groupId>
-             <artifactId>geronimo-mock-ra</artifactId>
-             <scope>test</scope>
-         </dependency>
-         <dependency>
-             <groupId>junit</groupId>
-             <artifactId>junit</artifactId>
-             <scope>test</scope>
-         </dependency>
+            <groupId>org.apache.geronimo.components</groupId>
+            <artifactId>geronimo-mock-ra</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.ops4j.pax.exam</groupId>
             <artifactId>pax-exam</artifactId>
@@ -217,6 +217,36 @@
             <artifactId>pax-swissbox-tinybundles</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.bundles</groupId>
+            <artifactId>jaxb-impl</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.bundles</groupId>
+            <artifactId>woodstox</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-activation_1.1_spec</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jaxb_2.2_spec</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-stax-api_1.2_spec</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-osgi-registry</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -282,11 +312,11 @@
                 </configuration>
             </plugin>
             <!--<plugin>-->
-                <!--<groupId>org.apache.maven.plugins</groupId>-->
-                <!--<artifactId>maven-compiler-plugin</artifactId>-->
-                <!--<configuration>-->
-                    <!--<compilerArgument>${bootClassPath}</compilerArgument>-->
-                <!--</configuration>-->
+            <!--<groupId>org.apache.maven.plugins</groupId>-->
+            <!--<artifactId>maven-compiler-plugin</artifactId>-->
+            <!--<configuration>-->
+            <!--<compilerArgument>${bootClassPath}</compilerArgument>-->
+            <!--</configuration>-->
             <!--</plugin>-->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -331,21 +361,21 @@
                 </configuration>
             </plugin>
             <!--<plugin>-->
-                <!--<groupId>org.apache.maven.plugins</groupId>-->
-                <!--<artifactId>maven-antrun-plugin</artifactId>-->
-                <!--<executions>-->
-                    <!--<execution>-->
-                        <!--<phase>process-test-resources</phase>-->
-                        <!--<configuration>-->
-                            <!--<tasks>-->
-                                <!--<ant antfile="${pom.basedir}/src/test/script/test-setup.xml"/>-->
-                            <!--</tasks>-->
-                        <!--</configuration>-->
-                        <!--<goals>-->
-                            <!--<goal>run</goal>-->
-                        <!--</goals>-->
-                    <!--</execution>-->
-                <!--</executions>-->
+            <!--<groupId>org.apache.maven.plugins</groupId>-->
+            <!--<artifactId>maven-antrun-plugin</artifactId>-->
+            <!--<executions>-->
+            <!--<execution>-->
+            <!--<phase>process-test-resources</phase>-->
+            <!--<configuration>-->
+            <!--<tasks>-->
+            <!--<ant antfile="${pom.basedir}/src/test/script/test-setup.xml"/>-->
+            <!--</tasks>-->
+            <!--</configuration>-->
+            <!--<goals>-->
+            <!--<goal>run</goal>-->
+            <!--</goals>-->
+            <!--</execution>-->
+            <!--</executions>-->
             <!--</plugin>-->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

Modified: geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java?rev=1084391&r1=1084390&r2=1084391&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java
(original)
+++ geronimo/sandbox/djencks/txmanager/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java
Tue Mar 22 22:39:04 2011
@@ -253,10 +253,6 @@ public class ResourceRefBuilder extends 
                     errorMessage.append("Could not find the resource specified in your Geronimo
deployment plan:");
                     errorMessage.append(gerResourceRef.getPattern());
                 }
-                errorMessage.append("\nSearch conducted in current module and dependencies:\n");
-                for (Dependency dependency : module.getEnvironment().getDependencies()) {
-                    errorMessage.append(dependency).append("\n");
-                }
                 errorMessage.append(")");
 
                 throw new DeploymentException(errorMessage.toString());

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=1084391&r1=1084390&r2=1084391&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/geronimo-txmanager-server/pom.xml (original)
+++ geronimo/sandbox/djencks/txmanager/geronimo-txmanager-server/pom.xml Tue Mar 22 22:39:04
2011
@@ -37,22 +37,14 @@
 
         <dependency>
             <groupId>org.apache.geronimo.features</groupId>
-            <artifactId>org.apache.geronimo.transaction.kar</artifactId>
-            <version>${project.version}</version>
-            <type>kar</type>
+            <artifactId>org.apache.geronimo.transaction</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
         </dependency>
 
     </dependencies>
     <build>
         <pluginManagement>
-            <!--<plugins>-->
-                <!--<plugin>-->
-                    <!--<groupId>org.apache.geronimo.buildsupport</groupId>-->
-                    <!--<artifactId>car-maven-plugin</artifactId>-->
-                    <!--<version>${geronimoVersion}</version>-->
-                    <!--<extensions>true</extensions>-->
-                <!--</plugin>-->
-            <!--</plugins>-->
         </pluginManagement>
         <plugins>
             <plugin>

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=1084391&r1=1084390&r2=1084391&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 22
22:39:04 2011
@@ -85,7 +85,6 @@
             <artifactId>geronimo-osgi-registry</artifactId>
         </dependency>
 
-        
     </dependencies>
     <build>
         <plugins>
@@ -94,6 +93,9 @@
                 <artifactId>features-maven-plugin</artifactId>
                 <configuration>
                     <startLevel>15</startLevel>
+                    <checkDependencyChange>true</checkDependencyChange>
+                    <overwriteChangedDependencies>true</overwriteChangedDependencies>
+                    <warnOnDependencyChange>true</warnOnDependencyChange>
                 </configuration>
             </plugin>
         </plugins>

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=1084391&r1=1084390&r2=1084391&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
22 22:39:04 2011
@@ -69,6 +69,7 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.scr</artifactId>
+            <version>1.6.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
@@ -93,7 +94,7 @@
                  </exclusion>
             </exclusions>
         </dependency>
-        
+
         
     </dependencies>
     <build>
@@ -108,9 +109,6 @@
                     <overwriteChangedDependencies>true</overwriteChangedDependencies>
                     <warnOnDependencyChange>true</warnOnDependencyChange>
                 </configuration>
-                <!--<configuration>-->
-                    <!--<resolver>OBR</resolver>-->
-                <!--</configuration>-->
             </plugin>
         </plugins>
     </build>

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=1084391&r1=1084390&r2=1084391&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 22
22:39:04 2011
@@ -29,9 +29,40 @@
     <packaging>feature</packaging>
     <dependencies>
         <dependency>
+            <groupId>org.apache.geronimo.features</groupId>
+            <artifactId>org.apache.geronimo.jaxb-support</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
             <groupId>org.apache.geronimo.components</groupId>
             <artifactId>geronimo-connector</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.components</groupId>
+            <artifactId>geronimo-connector-builder-1_6</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.xbean</groupId>
+            <artifactId>xbean-finder</artifactId>
+            <version>3.8-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.xbean</groupId>
+            <artifactId>xbean-bundleutils</artifactId>
+            <version>3.8-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>asm</groupId>
+            <artifactId>asm-all</artifactId>
+            <version>3.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-common</artifactId>
+            <version>3.0-SNAPSHOT</version>
+        </dependency>
 
         <!-- we also need to install scr to get this stuff to work. Should be a separate
feature -->
 
@@ -63,8 +94,8 @@
                  </exclusion>
             </exclusions>
         </dependency>
-        
-        
+
+
     </dependencies>
     <build>
         <plugins>
@@ -72,7 +103,11 @@
                 <groupId>org.apache.karaf.tooling</groupId>
                 <artifactId>features-maven-plugin</artifactId>
                 <configuration>
+                    <aggregateFeatures>true</aggregateFeatures>
                     <startLevel>60</startLevel>
+                    <checkDependencyChange>true</checkDependencyChange>
+                    <overwriteChangedDependencies>true</overwriteChangedDependencies>
+                    <warnOnDependencyChange>true</warnOnDependencyChange>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/sandbox/djencks/txmanager/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/txmanager/pom.xml?rev=1084391&r1=1084390&r2=1084391&view=diff
==============================================================================
--- geronimo/sandbox/djencks/txmanager/pom.xml (original)
+++ geronimo/sandbox/djencks/txmanager/pom.xml Tue Mar 22 22:39:04 2011
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.geronimo.genesis</groupId>
         <artifactId>genesis-java6-flava</artifactId>
-        <version>2.0</version>
+        <version>2.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
@@ -42,7 +42,7 @@
     <url>http://geronimo.apache.org/maven/${siteId}/${project.version}</url>
     <properties>
         <siteId>components/${project.artifactId}</siteId>
-        <karafVersion>2.99.99-SNAPSHOT</karafVersion>
+        <karafVersion>3.0.0-SNAPSHOT</karafVersion>
         <jaxbImplVersion>2.2.3_1-SNAPSHOT</jaxbImplVersion>
         <woodstoxVersion>4.0.6_2-SNAPSHOT</woodstoxVersion>
     </properties>



Mime
View raw message