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 2014/08/06 19:26:38 UTC

svn commit: r1616291 - in /tomee/tomee/trunk/container: openejb-api/src/main/java/org/apache/openejb/api/ openejb-api/src/main/java/org/apache/openejb/api/resource/ openejb-core/src/main/java/org/apache/openejb/assembler/classic/ openejb-core/src/main/...

Author: rmannibucau
Date: Wed Aug  6 17:26:38 2014
New Revision: 1616291

URL: http://svn.apache.org/r1616291
Log:
forgot to add PropertiesResourceProvider + moving DestroyableResource to get a consistent package

Added:
    tomee/tomee/trunk/container/openejb-api/src/main/java/org/apache/openejb/api/resource/
    tomee/tomee/trunk/container/openejb-api/src/main/java/org/apache/openejb/api/resource/DestroyableResource.java
      - copied, changed from r1616271, tomee/tomee/trunk/container/openejb-api/src/main/java/org/apache/openejb/api/DestroyableResource.java
    tomee/tomee/trunk/container/openejb-api/src/main/java/org/apache/openejb/api/resource/PropertiesResourceProvider.java
Removed:
    tomee/tomee/trunk/container/openejb-api/src/main/java/org/apache/openejb/api/DestroyableResource.java
Modified:
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java
    tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/resource/PropertiesProviderTest.java

Copied: tomee/tomee/trunk/container/openejb-api/src/main/java/org/apache/openejb/api/resource/DestroyableResource.java (from r1616271, tomee/tomee/trunk/container/openejb-api/src/main/java/org/apache/openejb/api/DestroyableResource.java)
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-api/src/main/java/org/apache/openejb/api/resource/DestroyableResource.java?p2=tomee/tomee/trunk/container/openejb-api/src/main/java/org/apache/openejb/api/resource/DestroyableResource.java&p1=tomee/tomee/trunk/container/openejb-api/src/main/java/org/apache/openejb/api/DestroyableResource.java&r1=1616271&r2=1616291&rev=1616291&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-api/src/main/java/org/apache/openejb/api/DestroyableResource.java (original)
+++ tomee/tomee/trunk/container/openejb-api/src/main/java/org/apache/openejb/api/resource/DestroyableResource.java Wed Aug  6 17:26:38 2014
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.openejb.api;
+package org.apache.openejb.api.resource;
 
 public interface DestroyableResource {
     void destroyResource();

Added: tomee/tomee/trunk/container/openejb-api/src/main/java/org/apache/openejb/api/resource/PropertiesResourceProvider.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-api/src/main/java/org/apache/openejb/api/resource/PropertiesResourceProvider.java?rev=1616291&view=auto
==============================================================================
--- tomee/tomee/trunk/container/openejb-api/src/main/java/org/apache/openejb/api/resource/PropertiesResourceProvider.java (added)
+++ tomee/tomee/trunk/container/openejb-api/src/main/java/org/apache/openejb/api/resource/PropertiesResourceProvider.java Wed Aug  6 17:26:38 2014
@@ -0,0 +1,24 @@
+/*
+ * 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.
+ */
+package org.apache.openejb.api.resource;
+
+import java.util.Properties;
+
+// see properties-provider for resources/services
+public interface PropertiesResourceProvider {
+    Properties provides();
+}

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java?rev=1616291&r1=1616290&r2=1616291&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java Wed Aug  6 17:26:38 2014
@@ -40,7 +40,7 @@ import org.apache.openejb.OpenEJB;
 import org.apache.openejb.OpenEJBException;
 import org.apache.openejb.OpenEJBRuntimeException;
 import org.apache.openejb.UndeployException;
-import org.apache.openejb.api.DestroyableResource;
+import org.apache.openejb.api.resource.DestroyableResource;
 import org.apache.openejb.assembler.classic.event.AssemblerAfterApplicationCreated;
 import org.apache.openejb.assembler.classic.event.AssemblerBeforeApplicationDestroyed;
 import org.apache.openejb.assembler.classic.event.AssemblerCreated;

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java?rev=1616291&r1=1616290&r2=1616291&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java Wed Aug  6 17:26:38 2014
@@ -16,7 +16,7 @@
  */
 package org.apache.openejb.threads.impl;
 
-import org.apache.openejb.api.DestroyableResource;
+import org.apache.openejb.api.resource.DestroyableResource;
 import org.apache.openejb.threads.future.CUFuture;
 import org.apache.openejb.threads.task.CUCallable;
 import org.apache.openejb.threads.task.CURunnable;

Modified: tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/resource/PropertiesProviderTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/resource/PropertiesProviderTest.java?rev=1616291&r1=1616290&r2=1616291&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/resource/PropertiesProviderTest.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/resource/PropertiesProviderTest.java Wed Aug  6 17:26:38 2014
@@ -18,8 +18,6 @@ package org.apache.openejb.resource;
 
 import org.apache.openejb.jee.EnterpriseBean;
 import org.apache.openejb.jee.SingletonBean;
-import org.apache.openejb.jee.jpa.unit.Persistence;
-import org.apache.openejb.jee.jpa.unit.PersistenceUnit;
 import org.apache.openejb.junit.ApplicationComposer;
 import org.apache.openejb.testing.Configuration;
 import org.apache.openejb.testing.Module;