You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2015/05/27 15:48:53 UTC
[5/5] tomee git commit: Fixing compile errors after merge
Fixing compile errors after merge
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/dc461c51
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/dc461c51
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/dc461c51
Branch: refs/heads/tomee-1.7.x
Commit: dc461c514c074a634dc44a1db65000af4f92f5f8
Parents: db43535
Author: Jonathan Gallimore <jo...@jrg.me.uk>
Authored: Wed May 27 14:31:36 2015 +0100
Committer: Jonathan Gallimore <jo...@jrg.me.uk>
Committed: Wed May 27 14:31:36 2015 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/openejb/config/AppModule.java | 1 -
.../java/org/apache/openejb/config/ConfigurationFactory.java | 6 +++---
.../src/main/java/org/apache/openejb/util/References.java | 2 +-
.../openejb/assembler/classic/ResourceInfoComparatorTest.java | 2 +-
.../java/org/apache/openejb/resource/ResourceSortingTest.java | 2 +-
5 files changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/dc461c51/container/openejb-core/src/main/java/org/apache/openejb/config/AppModule.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/AppModule.java b/container/openejb-core/src/main/java/org/apache/openejb/config/AppModule.java
index 9461f1f..ffa3e4e 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/AppModule.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/AppModule.java
@@ -61,7 +61,6 @@ public class AppModule implements DeploymentModule {
private final Map<String, TransactionType> txTypeByUnit = new HashMap<String, TransactionType>();
// TODO We could turn this into the Resources JAXB object and support containers and other things as well
private final Collection<Resource> resources = new LinkedHashSet<Resource>();
- private final Collection<Container> containers = new HashSet<Container>();
private final Collection<Service> services = new HashSet<Service>();
private final ClassLoader classLoader;
private EntityMappings cmpMappings;
http://git-wip-us.apache.org/repos/asf/tomee/blob/dc461c51/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java b/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
index b9d75f8..021867c 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
@@ -481,7 +481,7 @@ public class ConfigurationFactory implements OpenEjbConfigurationFactory {
sys.facilities.transactionService = configureService(openejb.getTransactionManager(), TransactionServiceInfo.class);
- List<ResourceInfo> resources = new ArrayList<>();
+ List<ResourceInfo> resources = new ArrayList<ResourceInfo>();
for (final Resource resource : openejb.getResource()) {
final ResourceInfo resourceInfo = configureService(resource, ResourceInfo.class);
resources.add(resourceInfo);
@@ -1604,7 +1604,7 @@ public class ConfigurationFactory implements OpenEjbConfigurationFactory {
}
public static List<ResourceInfo> sort(final List<ResourceInfo> infos, final String prefix) {
- final Collection<String> ids = new HashSet<>();
+ final Collection<String> ids = new HashSet<String>();
return References.sort(infos, new References.Visitor<ResourceInfo>() {
@Override // called first so we can rely on it to ensure we have ids full before any getReferences call
public String getName(final ResourceInfo resourceInfo) {
@@ -1615,7 +1615,7 @@ public class ConfigurationFactory implements OpenEjbConfigurationFactory {
@Override
public Set<String> getReferences(final ResourceInfo resourceInfo) {
- final Set<String> refs = new HashSet<>();
+ final Set<String> refs = new HashSet<String>();
for (final Object value : resourceInfo.properties.values()) {
if (!String.class.isInstance(value)) {
continue;
http://git-wip-us.apache.org/repos/asf/tomee/blob/dc461c51/container/openejb-core/src/main/java/org/apache/openejb/util/References.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/References.java b/container/openejb-core/src/main/java/org/apache/openejb/util/References.java
index eac118c..477ac93 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/References.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/References.java
@@ -67,7 +67,7 @@ public class References {
}
boolean circuitFounded = false;
for (final Node node : nodes.values()) {
- final Set<Node> visitedNodes = new HashSet<>();
+ final Set<Node> visitedNodes = new HashSet<Node>();
if (!normalizeNodeReferences(node, node, visitedNodes)) {
circuitFounded = true;
break;
http://git-wip-us.apache.org/repos/asf/tomee/blob/dc461c51/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/ResourceInfoComparatorTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/ResourceInfoComparatorTest.java b/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/ResourceInfoComparatorTest.java
index 0fa95b8..43dabb6 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/ResourceInfoComparatorTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/ResourceInfoComparatorTest.java
@@ -137,7 +137,7 @@ public class ResourceInfoComparatorTest extends TestCase {
@Test
public void testRealWorld4() throws Exception {
- final List<ResourceInfo> resources = new ArrayList<>();
+ final List<ResourceInfo> resources = new ArrayList<ResourceInfo>();
resources.add(new ResourceInfo());
resources.get(0).id = "My JMS Connection Factory";
http://git-wip-us.apache.org/repos/asf/tomee/blob/dc461c51/container/openejb-core/src/test/java/org/apache/openejb/resource/ResourceSortingTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/resource/ResourceSortingTest.java b/container/openejb-core/src/test/java/org/apache/openejb/resource/ResourceSortingTest.java
index 02537b1..00486ad 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/resource/ResourceSortingTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/resource/ResourceSortingTest.java
@@ -71,7 +71,7 @@ public class ResourceSortingTest {
public static class Foo {
- private static final List<String> IDS = new ArrayList<>();
+ private static final List<String> IDS = new ArrayList<String>();
private String name;
public void setName(String name) {