geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r671220 - in /geronimo/server/trunk: ./ assemblies/geronimo-jetty6-javaee5/ assemblies/geronimo-tomcat6-javaee5/ plugins/ plugins/concurrent/ plugins/concurrent/concurrent-deployer/ plugins/concurrent/concurrent-deployer/src/ plugins/concur...
Date Tue, 24 Jun 2008 15:45:39 GMT
Author: gawor
Date: Tue Jun 24 08:45:38 2008
New Revision: 671220

URL: http://svn.apache.org/viewvc?rev=671220&view=rev
Log:
added Concurrency Utilities for Java EE implementation to the server

Added:
    geronimo/server/trunk/plugins/concurrent/
    geronimo/server/trunk/plugins/concurrent/concurrent/
      - copied from r670714, geronimo/sandbox/concurrent/concurrent/
    geronimo/server/trunk/plugins/concurrent/concurrent-deployer/
      - copied from r670714, geronimo/sandbox/concurrent/concurrent-deployer/
    geronimo/server/trunk/plugins/concurrent/concurrent-deployer/pom.xml
      - copied, changed from r671215, geronimo/sandbox/concurrent/concurrent-deployer/pom.xml
    geronimo/server/trunk/plugins/concurrent/concurrent-deployer/src/
      - copied from r671215, geronimo/sandbox/concurrent/concurrent-deployer/src/
    geronimo/server/trunk/plugins/concurrent/concurrent/pom.xml
      - copied, changed from r671215, geronimo/sandbox/concurrent/concurrent/pom.xml
    geronimo/server/trunk/plugins/concurrent/concurrent/src/
      - copied from r671215, geronimo/sandbox/concurrent/concurrent/src/
    geronimo/server/trunk/plugins/concurrent/geronimo-concurrent/
      - copied from r670714, geronimo/sandbox/concurrent/geronimo-concurrent/
    geronimo/server/trunk/plugins/concurrent/geronimo-concurrent-builder/
      - copied from r670714, geronimo/sandbox/concurrent/geronimo-concurrent-builder/
    geronimo/server/trunk/plugins/concurrent/geronimo-concurrent-builder/pom.xml
      - copied, changed from r671215, geronimo/sandbox/concurrent/geronimo-concurrent-builder/pom.xml
    geronimo/server/trunk/plugins/concurrent/geronimo-concurrent-builder/src/
      - copied from r671215, geronimo/sandbox/concurrent/geronimo-concurrent-builder/src/
    geronimo/server/trunk/plugins/concurrent/geronimo-concurrent-core/
      - copied from r670714, geronimo/sandbox/concurrent/geronimo-concurrent-core/
    geronimo/server/trunk/plugins/concurrent/geronimo-concurrent-core/pom.xml
      - copied, changed from r671215, geronimo/sandbox/concurrent/geronimo-concurrent-core/pom.xml
    geronimo/server/trunk/plugins/concurrent/geronimo-concurrent-core/src/
      - copied from r671215, geronimo/sandbox/concurrent/geronimo-concurrent-core/src/
    geronimo/server/trunk/plugins/concurrent/geronimo-concurrent-management/
      - copied from r670714, geronimo/sandbox/concurrent/geronimo-concurrent-management/
    geronimo/server/trunk/plugins/concurrent/geronimo-concurrent-management/pom.xml
      - copied unchanged from r671215, geronimo/sandbox/concurrent/geronimo-concurrent-management/pom.xml
    geronimo/server/trunk/plugins/concurrent/geronimo-concurrent-management/src/
      - copied from r671215, geronimo/sandbox/concurrent/geronimo-concurrent-management/src/
    geronimo/server/trunk/plugins/concurrent/geronimo-concurrent/pom.xml
      - copied unchanged from r671215, geronimo/sandbox/concurrent/geronimo-concurrent/pom.xml
    geronimo/server/trunk/plugins/concurrent/geronimo-concurrent/src/
      - copied from r671215, geronimo/sandbox/concurrent/geronimo-concurrent/src/
    geronimo/server/trunk/plugins/concurrent/pom.xml   (with props)
Modified:
    geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml
    geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/pom.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml?rev=671220&r1=671219&r2=671220&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml Tue Jun 24 08:45:38 2008
@@ -584,6 +584,20 @@
             <version>${version}</version>
             <type>car</type>
         </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>concurrent</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>concurrent-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
     </dependencies>
 
     <build>

Modified: geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml?rev=671220&r1=671219&r2=671220&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml Tue Jun 24 08:45:38
2008
@@ -556,6 +556,20 @@
             <version>${version}</version>
             <type>car</type>
         </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>concurrent</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>concurrent-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
     </dependencies>
 
     <build>

Copied: geronimo/server/trunk/plugins/concurrent/concurrent-deployer/pom.xml (from r671215,
geronimo/sandbox/concurrent/concurrent-deployer/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/concurrent/concurrent-deployer/pom.xml?p2=geronimo/server/trunk/plugins/concurrent/concurrent-deployer/pom.xml&p1=geronimo/sandbox/concurrent/concurrent-deployer/pom.xml&r1=671215&r2=671220&rev=671220&view=diff
==============================================================================
--- geronimo/sandbox/concurrent/concurrent-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/concurrent/concurrent-deployer/pom.xml Tue Jun 24 08:45:38
2008
@@ -78,6 +78,12 @@
                         <includeVersion>true</includeVersion>
                     </useMavenDependencies>
                     <category>Core</category>
+                    <instance>
+                        <plugin-artifact>
+                            <config-xml-content server="default"/>
+                            <config-xml-content server="offline"/>
+                        </plugin-artifact>
+                    </instance>
                 </configuration>
             </plugin>
         </plugins>

Copied: geronimo/server/trunk/plugins/concurrent/concurrent/pom.xml (from r671215, geronimo/sandbox/concurrent/concurrent/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/concurrent/concurrent/pom.xml?p2=geronimo/server/trunk/plugins/concurrent/concurrent/pom.xml&p1=geronimo/sandbox/concurrent/concurrent/pom.xml&r1=671215&r2=671220&rev=671220&view=diff
==============================================================================
--- geronimo/sandbox/concurrent/concurrent/pom.xml (original)
+++ geronimo/server/trunk/plugins/concurrent/concurrent/pom.xml Tue Jun 24 08:45:38 2008
@@ -49,7 +49,6 @@
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-concurrent_1.0_spec</artifactId>
-            <version>1.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>

Copied: geronimo/server/trunk/plugins/concurrent/geronimo-concurrent-builder/pom.xml (from
r671215, geronimo/sandbox/concurrent/geronimo-concurrent-builder/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/concurrent/geronimo-concurrent-builder/pom.xml?p2=geronimo/server/trunk/plugins/concurrent/geronimo-concurrent-builder/pom.xml&p1=geronimo/sandbox/concurrent/geronimo-concurrent-builder/pom.xml&r1=671215&r2=671220&rev=671220&view=diff
==============================================================================
--- geronimo/sandbox/concurrent/geronimo-concurrent-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/concurrent/geronimo-concurrent-builder/pom.xml Tue Jun 24
08:45:38 2008
@@ -38,7 +38,6 @@
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-concurrent_1.0_spec</artifactId>
-            <version>1.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>

Copied: geronimo/server/trunk/plugins/concurrent/geronimo-concurrent-core/pom.xml (from r671215,
geronimo/sandbox/concurrent/geronimo-concurrent-core/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/concurrent/geronimo-concurrent-core/pom.xml?p2=geronimo/server/trunk/plugins/concurrent/geronimo-concurrent-core/pom.xml&p1=geronimo/sandbox/concurrent/geronimo-concurrent-core/pom.xml&r1=671215&r2=671220&rev=671220&view=diff
==============================================================================
--- geronimo/sandbox/concurrent/geronimo-concurrent-core/pom.xml (original)
+++ geronimo/server/trunk/plugins/concurrent/geronimo-concurrent-core/pom.xml Tue Jun 24 08:45:38
2008
@@ -38,12 +38,10 @@
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-concurrent_1.0_spec</artifactId>
-            <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <version>1.0.4</version>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl104-over-slf4j</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>

Added: geronimo/server/trunk/plugins/concurrent/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/concurrent/pom.xml?rev=671220&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/concurrent/pom.xml (added)
+++ geronimo/server/trunk/plugins/concurrent/pom.xml Tue Jun 24 08:45:38 2008
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    
+     http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+
+<!-- $Rev: 513306 $ $Date: 2008/03/04 19:02:07 $ -->
+
+<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.plugins</groupId>
+        <artifactId>plugins</artifactId>
+        <version>2.2-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>concurrent</artifactId>
+    <name>Geronimo Plugins, Concurrency Utilities</name>
+    <packaging>pom</packaging>
+
+    <description>
+        Implementation of the Concurrency Utilities for Java EE specification.
+    </description>
+
+    <modules>
+        <module>geronimo-concurrent-management</module>
+        <module>geronimo-concurrent-core</module>
+        <module>geronimo-concurrent</module>
+        <module>geronimo-concurrent-builder</module>
+        <module>concurrent</module>
+        <module>concurrent-deployer</module>
+    </modules>
+
+</project>

Propchange: geronimo/server/trunk/plugins/concurrent/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/plan/plan.xml?rev=671220&r1=671219&r2=671220&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/plan/plan.xml Tue Jun 24 08:45:38
2008
@@ -137,6 +137,9 @@
             <pattern>
                 <name>LifecycleMethodBuilder</name>
             </pattern>
+            <pattern>
+                <name>ManagedResourceRefBuilder</name>
+            </pattern>
         </references>
     </gbean>
 

Modified: geronimo/server/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pom.xml?rev=671220&r1=671219&r2=671220&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pom.xml (original)
+++ geronimo/server/trunk/plugins/pom.xml Tue Jun 24 08:45:38 2008
@@ -91,6 +91,7 @@
         <module>remote-deploy</module>
         <module>sharedlib</module>
         <module>welcome</module>
+        <module>concurrent</module>
     </modules>
     
     <build>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=671220&r1=671219&r2=671220&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Tue Jun 24 08:45:38 2008
@@ -1132,6 +1132,12 @@
             </dependency>
 
             <dependency>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-concurrent_1.0_spec</artifactId>
+                <version>1.0-SNAPSHOT</version>
+            </dependency>
+
+            <dependency>
                 <groupId>woodstox</groupId>
                 <artifactId>wstx-asl</artifactId>
                 <version>3.2.1</version>



Mime
View raw message