aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cschnei...@apache.org
Subject svn commit: r1703506 - in /aries/trunk/jpa: examples/tasklist-blueprint/src/test/java/org/apache/aries/jpa/tasklist/blueprint/impl/ examples/tasklist-ds/src/test/java/org/apache/aries/jpa/tasklist/closure/impl/ itests/jpa-container-itest/src/test/java/...
Date Thu, 17 Sep 2015 07:18:29 GMT
Author: cschneider
Date: Thu Sep 17 07:18:26 2015
New Revision: 1703506

URL: http://svn.apache.org/r1703506
Log:
[ARIES-1402] Switch back to java 1.6 min

Modified:
    aries/trunk/jpa/examples/tasklist-blueprint/src/test/java/org/apache/aries/jpa/tasklist/blueprint/impl/TaskServiceImplTest.java
    aries/trunk/jpa/examples/tasklist-ds/src/test/java/org/apache/aries/jpa/tasklist/closure/impl/TaskServiceImplTest.java
    aries/trunk/jpa/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/blueprint/aries/itest/BlueprintTest.java
    aries/trunk/jpa/jpa-blueprint/src/main/java/org/apache/aries/jpa/blueprint/impl/JpaComponentProcessor.java
    aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/Activator.java
    aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/ManagedEMF.java
    aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceBundleTracker.java
    aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/parser/impl/PersistenceUnit.java
    aries/trunk/jpa/jpa-parent/pom.xml
    aries/trunk/jpa/jpa-support/src/main/java/org/apache/aries/jpa/support/osgi/impl/EMFTracker.java
    aries/trunk/jpa/jpa-support/src/main/java/org/apache/aries/jpa/support/osgi/impl/TMTracker.java
    aries/trunk/jpa/jpa-support/src/test/java/org/apache/aries/jpa/impl/DummyCoordination.java
    aries/trunk/jpa/jpa-support/src/test/java/org/apache/aries/jpa/impl/DummyCoordinator.java

Modified: aries/trunk/jpa/examples/tasklist-blueprint/src/test/java/org/apache/aries/jpa/tasklist/blueprint/impl/TaskServiceImplTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/examples/tasklist-blueprint/src/test/java/org/apache/aries/jpa/tasklist/blueprint/impl/TaskServiceImplTest.java?rev=1703506&r1=1703505&r2=1703506&view=diff
==============================================================================
--- aries/trunk/jpa/examples/tasklist-blueprint/src/test/java/org/apache/aries/jpa/tasklist/blueprint/impl/TaskServiceImplTest.java
(original)
+++ aries/trunk/jpa/examples/tasklist-blueprint/src/test/java/org/apache/aries/jpa/tasklist/blueprint/impl/TaskServiceImplTest.java
Thu Sep 17 07:18:26 2015
@@ -54,7 +54,7 @@ public class TaskServiceImplTest {
     }
 
     private EntityManagerFactory createTestEMF() {
-        Map<String, String> properties = new HashMap<>();
+        Map<String, String> properties = new HashMap<String, String>();
         properties.put("javax.persistence.jdbc.driver", "org.apache.derby.jdbc.EmbeddedDriver");
         properties.put("javax.persistence.jdbc.url", "jdbc:derby:memory:TEST;create=true");
         EntityManagerFactory emf = Persistence.createEntityManagerFactory("tasklist", properties);

Modified: aries/trunk/jpa/examples/tasklist-ds/src/test/java/org/apache/aries/jpa/tasklist/closure/impl/TaskServiceImplTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/examples/tasklist-ds/src/test/java/org/apache/aries/jpa/tasklist/closure/impl/TaskServiceImplTest.java?rev=1703506&r1=1703505&r2=1703506&view=diff
==============================================================================
--- aries/trunk/jpa/examples/tasklist-ds/src/test/java/org/apache/aries/jpa/tasklist/closure/impl/TaskServiceImplTest.java
(original)
+++ aries/trunk/jpa/examples/tasklist-ds/src/test/java/org/apache/aries/jpa/tasklist/closure/impl/TaskServiceImplTest.java
Thu Sep 17 07:18:26 2015
@@ -70,7 +70,7 @@ public class TaskServiceImplTest {
     }
 
     private EntityManagerFactory createTestEMF() {
-        Map<String, String> properties = new HashMap<>();
+        Map<String, String> properties = new HashMap<String, String>();
         properties.put("javax.persistence.jdbc.driver", "org.apache.derby.jdbc.EmbeddedDriver");
         properties.put("javax.persistence.jdbc.url", "jdbc:derby:target/test;create=true");
         EntityManagerFactory emf = Persistence.createEntityManagerFactory("tasklist", properties);

Modified: aries/trunk/jpa/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/blueprint/aries/itest/BlueprintTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/blueprint/aries/itest/BlueprintTest.java?rev=1703506&r1=1703505&r2=1703506&view=diff
==============================================================================
--- aries/trunk/jpa/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/blueprint/aries/itest/BlueprintTest.java
(original)
+++ aries/trunk/jpa/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/blueprint/aries/itest/BlueprintTest.java
Thu Sep 17 07:18:26 2015
@@ -108,7 +108,7 @@ public class BlueprintTest extends Abstr
         Runnable carLifeCycle = getService(Runnable.class, "(type=carCoordinated)");
         carLifeCycle.run();
         ExecutorService exec = Executors.newFixedThreadPool(20);
-        List<Future<?>> futures = new ArrayList<>();
+        List<Future<?>> futures = new ArrayList<Future<?>>();
         for (int c=0; c<100; c++) {
             futures.add(exec.submit(carLifeCycle));
         }

Modified: aries/trunk/jpa/jpa-blueprint/src/main/java/org/apache/aries/jpa/blueprint/impl/JpaComponentProcessor.java
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-blueprint/src/main/java/org/apache/aries/jpa/blueprint/impl/JpaComponentProcessor.java?rev=1703506&r1=1703505&r2=1703506&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-blueprint/src/main/java/org/apache/aries/jpa/blueprint/impl/JpaComponentProcessor.java
(original)
+++ aries/trunk/jpa/jpa-blueprint/src/main/java/org/apache/aries/jpa/blueprint/impl/JpaComponentProcessor.java
Thu Sep 17 07:18:26 2015
@@ -66,7 +66,7 @@ public class JpaComponentProcessor imple
         Bundle bundle = getComponent(cdr, "blueprintBundle");
         cdr.registerComponentDefinition(createServiceRef(JPA_COORDINATOR, Coordinator.class));
 
-        Set<String> components = new HashSet<>(cdr.getComponentDefinitionNames());
+        Set<String> components = new HashSet<String>(cdr.getComponentDefinitionNames());
         for (String component : components) {
             ComponentMetadata compDef = cdr.getComponentDefinition(component);
             if (compDef instanceof MutableBeanMetadata && !((MutableBeanMetadata)compDef).isProcessor())
{

Modified: aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/Activator.java
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/Activator.java?rev=1703506&r1=1703505&r2=1703506&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/Activator.java
(original)
+++ aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/Activator.java
Thu Sep 17 07:18:26 2015
@@ -39,7 +39,7 @@ public class Activator implements Bundle
         registerWeavingHook(context, TransformerRegistrySingleton.get());
 
         PersistenceBundleTracker customizer = new PersistenceBundleTracker(context);
-        persistenceBundleManager = new BundleTracker<>(context, Bundle.STARTING | Bundle.ACTIVE,
customizer);
+        persistenceBundleManager = new BundleTracker<Bundle>(context, Bundle.STARTING
| Bundle.ACTIVE, customizer);
         persistenceBundleManager.open();
     }
 

Modified: aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/ManagedEMF.java
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/ManagedEMF.java?rev=1703506&r1=1703505&r2=1703506&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/ManagedEMF.java
(original)
+++ aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/ManagedEMF.java
Thu Sep 17 07:18:26 2015
@@ -135,7 +135,7 @@ public class ManagedEMF implements Close
     }
 
     public static Dictionary<String, String> createProperties(PersistenceUnitInfo persistenceUnit,
Bundle puBundle) {
-        Dictionary<String, String> props = new Hashtable<>();
+        Dictionary<String, String> props = new Hashtable<String, String>();
         props.put(JPA_UNIT_NAME, persistenceUnit.getPersistenceUnitName());
         if (persistenceUnit.getPersistenceProviderClassName() != null) {
             props.put(JPA_UNIT_PROVIDER, persistenceUnit.getPersistenceProviderClassName());

Modified: aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceBundleTracker.java
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceBundleTracker.java?rev=1703506&r1=1703505&r2=1703506&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceBundleTracker.java
(original)
+++ aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceBundleTracker.java
Thu Sep 17 07:18:26 2015
@@ -119,7 +119,7 @@ public class PersistenceBundleTracker im
     private Collection<PersistenceProviderTracker> getTrackers(Bundle bundle) {
         Collection<PersistenceProviderTracker> providerTrackers = trackers.get(bundle);
         if (providerTrackers == null) {
-            providerTrackers = new ArrayList<>();
+            providerTrackers = new ArrayList<PersistenceProviderTracker>();
             trackers.put(bundle, providerTrackers);
         }
         return providerTrackers;

Modified: aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/parser/impl/PersistenceUnit.java
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/parser/impl/PersistenceUnit.java?rev=1703506&r1=1703505&r2=1703506&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/parser/impl/PersistenceUnit.java
(original)
+++ aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/parser/impl/PersistenceUnit.java
Thu Sep 17 07:18:26 2015
@@ -64,7 +64,7 @@ public class PersistenceUnit implements
         this.transactionType = transactionType;
         this.props = new Properties();
         this.classLoader = bundle.adapt(BundleWiring.class).getClassLoader();
-        this.classNames = new HashSet<>();
+        this.classNames = new HashSet<String>();
     }
 
     public void addClassName(String className) {
@@ -112,7 +112,7 @@ public class PersistenceUnit implements
 
     @Override
     public List<String> getManagedClassNames() {
-        ArrayList<String> names = new ArrayList<>();
+        ArrayList<String> names = new ArrayList<String>();
         names.addAll(classNames);
         return names;
     }

Modified: aries/trunk/jpa/jpa-parent/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-parent/pom.xml?rev=1703506&r1=1703505&r2=1703506&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-parent/pom.xml (original)
+++ aries/trunk/jpa/jpa-parent/pom.xml Thu Sep 17 07:18:26 2015
@@ -145,8 +145,8 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
+                    <source>1.6</source>
+                    <target>1.6</target>
                 </configuration>
             </plugin>
             <plugin>

Modified: aries/trunk/jpa/jpa-support/src/main/java/org/apache/aries/jpa/support/osgi/impl/EMFTracker.java
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-support/src/main/java/org/apache/aries/jpa/support/osgi/impl/EMFTracker.java?rev=1703506&r1=1703505&r2=1703506&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-support/src/main/java/org/apache/aries/jpa/support/osgi/impl/EMFTracker.java
(original)
+++ aries/trunk/jpa/jpa-support/src/main/java/org/apache/aries/jpa/support/osgi/impl/EMFTracker.java
Thu Sep 17 07:18:26 2015
@@ -104,13 +104,13 @@ public class EMFTracker extends ServiceT
     }
 
     private Dictionary<String, String> getEmSupplierProps(String unitName) {
-        Dictionary<String, String> props = new Hashtable<>();
+        Dictionary<String, String> props = new Hashtable<String, String>();
         props.put(JPA_UNIT_NAME, unitName);
         return props;
     }
 
     private Dictionary<String, String> rlTxManProps(String unitName) {
-        Dictionary<String, String> props = new Hashtable<>();
+        Dictionary<String, String> props = new Hashtable<String, String>();
         props.put(JPA_UNIT_NAME, unitName);
         props.put(TMTracker.TRANSACTION_TYPE, "RESOURCE_LOCAL");
         return props;

Modified: aries/trunk/jpa/jpa-support/src/main/java/org/apache/aries/jpa/support/osgi/impl/TMTracker.java
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-support/src/main/java/org/apache/aries/jpa/support/osgi/impl/TMTracker.java?rev=1703506&r1=1703505&r2=1703506&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-support/src/main/java/org/apache/aries/jpa/support/osgi/impl/TMTracker.java
(original)
+++ aries/trunk/jpa/jpa-support/src/main/java/org/apache/aries/jpa/support/osgi/impl/TMTracker.java
Thu Sep 17 07:18:26 2015
@@ -61,7 +61,7 @@ public class TMTracker extends ServiceTr
     }
 
     private Dictionary<String, String> xaTxManProps(String unitName) {
-        Dictionary<String, String> txmanProperties = new Hashtable<>();
+        Dictionary<String, String> txmanProperties = new Hashtable<String, String>();
         txmanProperties.put(EntityManagerFactoryBuilder.JPA_UNIT_NAME, unitName);
         txmanProperties.put(TRANSACTION_TYPE, "JTA");
         return txmanProperties;

Modified: aries/trunk/jpa/jpa-support/src/test/java/org/apache/aries/jpa/impl/DummyCoordination.java
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-support/src/test/java/org/apache/aries/jpa/impl/DummyCoordination.java?rev=1703506&r1=1703505&r2=1703506&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-support/src/test/java/org/apache/aries/jpa/impl/DummyCoordination.java
(original)
+++ aries/trunk/jpa/jpa-support/src/test/java/org/apache/aries/jpa/impl/DummyCoordination.java
Thu Sep 17 07:18:26 2015
@@ -30,7 +30,7 @@ import org.osgi.service.coordinator.Coor
 import org.osgi.service.coordinator.Participant;
 
 public class DummyCoordination implements Coordination {
-    private Set<Participant> participants = new HashSet<>();
+    private Set<Participant> participants = new HashSet<Participant>();
     private Map<Class<?>, Object> vars = new HashMap<Class<?>, Object>();
     private Coordination enclosing;
 

Modified: aries/trunk/jpa/jpa-support/src/test/java/org/apache/aries/jpa/impl/DummyCoordinator.java
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-support/src/test/java/org/apache/aries/jpa/impl/DummyCoordinator.java?rev=1703506&r1=1703505&r2=1703506&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-support/src/test/java/org/apache/aries/jpa/impl/DummyCoordinator.java
(original)
+++ aries/trunk/jpa/jpa-support/src/test/java/org/apache/aries/jpa/impl/DummyCoordinator.java
Thu Sep 17 07:18:26 2015
@@ -27,7 +27,7 @@ import org.osgi.service.coordinator.Part
 
 public class DummyCoordinator implements Coordinator {
 
-    private java.util.Deque<Coordination> coordinations = new ArrayDeque<>();
+    private java.util.Deque<Coordination> coordinations = new ArrayDeque<Coordination>();
 
     @Override
     public Coordination create(String name, long timeMillis) {



Mime
View raw message