geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r650943 - in /geronimo/server/branches/2.1/plugins: jetty/jetty6-deployer/src/main/plan/plan.xml openjpa/openjpa/src/main/plan/plan.xml openjpa/persistence-jpa10-deployer/src/main/plan/plan.xml
Date Wed, 23 Apr 2008 17:26:48 GMT
Author: dwoods
Date: Wed Apr 23 10:26:45 2008
New Revision: 650943

URL: http://svn.apache.org/viewvc?rev=650943&view=rev
Log:
Merge in r647717 from trunk - Make plans more dynamic with their versions resolved at build
time

Modified:
    geronimo/server/branches/2.1/plugins/jetty/jetty6-deployer/src/main/plan/plan.xml
    geronimo/server/branches/2.1/plugins/openjpa/openjpa/src/main/plan/plan.xml
    geronimo/server/branches/2.1/plugins/openjpa/persistence-jpa10-deployer/src/main/plan/plan.xml

Modified: geronimo/server/branches/2.1/plugins/jetty/jetty6-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/jetty/jetty6-deployer/src/main/plan/plan.xml?rev=650943&r1=650942&r2=650943&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/jetty/jetty6-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.1/plugins/jetty/jetty6-deployer/src/main/plan/plan.xml Wed
Apr 23 10:26:45 2008
@@ -18,7 +18,7 @@
 
 <!-- $Rev$ $Date$ -->
 
-<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion">
 
     <gbean name="JettyWebBuilder" class="org.apache.geronimo.jetty6.deployment.JettyModuleBuilder">
         <attribute name="defaultSessionTimeoutSeconds">1800</attribute>
@@ -122,7 +122,7 @@
             <name>ResourceRefBuilder</name>
         </reference>
         <xml-attribute name="defaultEnvironment">
-            <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <dependencies>
                     <dependency>
                         <groupId>${pom.groupId}</groupId>

Modified: geronimo/server/branches/2.1/plugins/openjpa/openjpa/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/openjpa/openjpa/src/main/plan/plan.xml?rev=650943&r1=650942&r2=650943&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/openjpa/openjpa/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.1/plugins/openjpa/openjpa/src/main/plan/plan.xml Wed Apr 23
10:26:45 2008
@@ -14,6 +14,6 @@
   See the License for the specific language governing permissions and
   limitations under the License.-->
 <!--$Rev$ $Date$-->
-<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
     <gbean name="OpenJPAConfigurationMonitor" class="org.apache.geronimo.openjpa.ConfigurationMonitorGBean"/>
-</module>
\ No newline at end of file
+</module>

Modified: geronimo/server/branches/2.1/plugins/openjpa/persistence-jpa10-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/openjpa/persistence-jpa10-deployer/src/main/plan/plan.xml?rev=650943&r1=650942&r2=650943&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/openjpa/persistence-jpa10-deployer/src/main/plan/plan.xml
(original)
+++ geronimo/server/branches/2.1/plugins/openjpa/persistence-jpa10-deployer/src/main/plan/plan.xml
Wed Apr 23 10:26:45 2008
@@ -18,7 +18,7 @@
 
 <!-- $Rev$ $Date$ -->
 
-<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
 
     <gbean name="PersistenceUnitBuilder" class="org.apache.geronimo.persistence.builder.PersistenceUnitBuilder">
         <attribute name="defaultPersistenceProviderClassName">org.apache.openjpa.persistence.PersistenceProviderImpl</attribute>
@@ -31,7 +31,7 @@
             openjpa.Sequence=table(Table=OPENJPASEQ, Increment=100)
         </attribute>
         <xml-attribute name="defaultEnvironment">
-            <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <dependencies>
                     <dependency>
                         <groupId>org.apache.geronimo.configs</groupId>
@@ -45,7 +45,7 @@
     <!-- TODO possibly the ref builders only need a dependency on transaction -->
     <gbean name="PersistenceContextRefBuilder" class="org.apache.geronimo.persistence.builder.PersistenceContextRefBuilder">
         <xml-attribute name="defaultEnvironment">
-            <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <dependencies>
                     <dependency>
                         <groupId>org.apache.geronimo.configs</groupId>
@@ -58,7 +58,7 @@
     </gbean>
     <gbean name="PersistenceUnitRefBuilder" class="org.apache.geronimo.persistence.builder.PersistenceUnitRefBuilder">
         <xml-attribute name="defaultEnvironment">
-            <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+            <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <dependencies>
                     <dependency>
                         <groupId>org.apache.geronimo.configs</groupId>



Mime
View raw message