You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2012/03/09 16:26:51 UTC
svn commit: r1298872 -
/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AppModule.java
Author: rmannibucau
Date: Fri Mar 9 15:26:51 2012
New Revision: 1298872
URL: http://svn.apache.org/viewvc?rev=1298872&view=rev
Log:
keeping resources.xml order to be sure to respect the deployment order if some dependencies between resources is defined
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AppModule.java
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AppModule.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AppModule.java?rev=1298872&r1=1298871&r2=1298872&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AppModule.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AppModule.java Fri Mar 9 15:26:51 2012
@@ -26,7 +26,7 @@ import java.net.URL;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
-import java.util.HashSet;
+import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Properties;
@@ -48,7 +48,7 @@ public class AppModule implements Deploy
private final List<EjbModule> ejbModules = new ArrayList<EjbModule>();
private final List<PersistenceModule> persistenceModules = new ArrayList<PersistenceModule>();
// TODO We could turn this into the Resources JAXB object and support containers and other things as well
- private final Collection<Resource> resources = new HashSet<Resource>();
+ private final Collection<Resource> resources = new LinkedHashSet<Resource>();
private final ClassLoader classLoader;
private EntityMappings cmpMappings;
private final Map<String,Object> altDDs = new HashMap<String,Object>();
Re: Resource references in config (Re: svn commit: r1298872)
Posted by Romain Manni-Bucau <rm...@gmail.com>.
not sure how it can work
here org.apache.openejb.config.AutoConfig#processDataSourceDefinitions
- Romain
2012/3/9 David Blevins <da...@gmail.com>
> ConfigurationFactory line 356:
>
> Collections.sort(resources, new ResourceInfoComparator(resources));
>
> It's a stable sort, so if no resource has a property where the name
> matches another resource, then the order of the list is not affected.
>
>
> -David
>
> On Mar 9, 2012, at 9:28 AM, Romain Manni-Bucau wrote:
>
> > Hi,
> >
> > do we have something to respect dependencies between resources in
> > openejb-core?
> >
> > - Romain
> >
> >
> > ---------- Forwarded message ----------
> > From: <rm...@apache.org>
> > Date: 2012/3/9
> > Subject: svn commit: r1298872 -
> >
> /openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AppModule.java
> > To: commits@openejb.apache.org
> >
> >
> > Author: rmannibucau
> > Date: Fri Mar 9 15:26:51 2012
> > New Revision: 1298872
> >
> > URL: http://svn.apache.org/viewvc?rev=1298872&view=rev
> > Log:
> > keeping resources.xml order to be sure to respect the deployment order if
> > some dependencies between resources is defined
> >
> > Modified:
> >
> >
> openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AppModule.java
> >
> > Modified:
> >
> openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AppModule.java
> > URL:
> >
> http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AppModule.java?rev=1298872&r1=1298871&r2=1298872&view=diff
> >
> ==============================================================================
> > ---
> >
> openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AppModule.java
> > (original)
> > +++
> >
> openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AppModule.java
> > Fri Mar 9 15:26:51 2012
> > @@ -26,7 +26,7 @@ import java.net.URL;
> > import java.util.ArrayList;
> > import java.util.Collection;
> > import java.util.HashMap;
> > -import java.util.HashSet;
> > +import java.util.LinkedHashSet;
> > import java.util.List;
> > import java.util.Map;
> > import java.util.Properties;
> > @@ -48,7 +48,7 @@ public class AppModule implements Deploy
> > private final List<EjbModule> ejbModules = new ArrayList<EjbModule>();
> > private final List<PersistenceModule> persistenceModules = new
> > ArrayList<PersistenceModule>();
> > // TODO We could turn this into the Resources JAXB object and support
> > containers and other things as well
> > - private final Collection<Resource> resources = new
> HashSet<Resource>();
> > + private final Collection<Resource> resources = new
> > LinkedHashSet<Resource>();
> > private final ClassLoader classLoader;
> > private EntityMappings cmpMappings;
> > private final Map<String,Object> altDDs = new
> HashMap<String,Object>();
>
>
Resource references in config (Re: svn commit: r1298872)
Posted by David Blevins <da...@gmail.com>.
ConfigurationFactory line 356:
Collections.sort(resources, new ResourceInfoComparator(resources));
It's a stable sort, so if no resource has a property where the name matches another resource, then the order of the list is not affected.
-David
On Mar 9, 2012, at 9:28 AM, Romain Manni-Bucau wrote:
> Hi,
>
> do we have something to respect dependencies between resources in
> openejb-core?
>
> - Romain
>
>
> ---------- Forwarded message ----------
> From: <rm...@apache.org>
> Date: 2012/3/9
> Subject: svn commit: r1298872 -
> /openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AppModule.java
> To: commits@openejb.apache.org
>
>
> Author: rmannibucau
> Date: Fri Mar 9 15:26:51 2012
> New Revision: 1298872
>
> URL: http://svn.apache.org/viewvc?rev=1298872&view=rev
> Log:
> keeping resources.xml order to be sure to respect the deployment order if
> some dependencies between resources is defined
>
> Modified:
>
> openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AppModule.java
>
> Modified:
> openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AppModule.java
> URL:
> http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AppModule.java?rev=1298872&r1=1298871&r2=1298872&view=diff
> ==============================================================================
> ---
> openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AppModule.java
> (original)
> +++
> openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AppModule.java
> Fri Mar 9 15:26:51 2012
> @@ -26,7 +26,7 @@ import java.net.URL;
> import java.util.ArrayList;
> import java.util.Collection;
> import java.util.HashMap;
> -import java.util.HashSet;
> +import java.util.LinkedHashSet;
> import java.util.List;
> import java.util.Map;
> import java.util.Properties;
> @@ -48,7 +48,7 @@ public class AppModule implements Deploy
> private final List<EjbModule> ejbModules = new ArrayList<EjbModule>();
> private final List<PersistenceModule> persistenceModules = new
> ArrayList<PersistenceModule>();
> // TODO We could turn this into the Resources JAXB object and support
> containers and other things as well
> - private final Collection<Resource> resources = new HashSet<Resource>();
> + private final Collection<Resource> resources = new
> LinkedHashSet<Resource>();
> private final ClassLoader classLoader;
> private EntityMappings cmpMappings;
> private final Map<String,Object> altDDs = new HashMap<String,Object>();
Fwd: svn commit: r1298872 - /openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AppModule.java
Posted by Romain Manni-Bucau <rm...@gmail.com>.
Hi,
do we have something to respect dependencies between resources in
openejb-core?
- Romain
---------- Forwarded message ----------
From: <rm...@apache.org>
Date: 2012/3/9
Subject: svn commit: r1298872 -
/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AppModule.java
To: commits@openejb.apache.org
Author: rmannibucau
Date: Fri Mar 9 15:26:51 2012
New Revision: 1298872
URL: http://svn.apache.org/viewvc?rev=1298872&view=rev
Log:
keeping resources.xml order to be sure to respect the deployment order if
some dependencies between resources is defined
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AppModule.java
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AppModule.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AppModule.java?rev=1298872&r1=1298871&r2=1298872&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AppModule.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AppModule.java
Fri Mar 9 15:26:51 2012
@@ -26,7 +26,7 @@ import java.net.URL;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
-import java.util.HashSet;
+import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Properties;
@@ -48,7 +48,7 @@ public class AppModule implements Deploy
private final List<EjbModule> ejbModules = new ArrayList<EjbModule>();
private final List<PersistenceModule> persistenceModules = new
ArrayList<PersistenceModule>();
// TODO We could turn this into the Resources JAXB object and support
containers and other things as well
- private final Collection<Resource> resources = new HashSet<Resource>();
+ private final Collection<Resource> resources = new
LinkedHashSet<Resource>();
private final ClassLoader classLoader;
private EntityMappings cmpMappings;
private final Map<String,Object> altDDs = new HashMap<String,Object>();