svn commit: r1543430 - in /tomee/tomee/trunk/container/openejb-core/src: main/java/org/apache/openejb/assembler/classic/ main/java/org/apache/openejb/resource/ test/java/org/apache/openejb/resource/

[rm...@apache.org]

Author: rmannibucau
Date: Tue Nov 19 13:50:21 2013
New Revision: 1543430

URL: http://svn.apache.org/r1543430
Log:
TOMEE-1080 allowing to create properties as resources easily

Added:
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/PropertiesFactory.java
    tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/resource/PropertiesInjectionTest.java
Modified:
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java

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=1543430&r1=1543429&r2=1543430&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 Tue Nov 19 13:50:21 2013
@@ -100,6 +100,7 @@ import org.apache.openejb.observer.Obser
 import org.apache.openejb.persistence.JtaEntityManagerRegistry;
 import org.apache.openejb.persistence.PersistenceClassLoaderHandler;
 import org.apache.openejb.resource.GeronimoConnectionManagerFactory;
+import org.apache.openejb.resource.PropertiesFactory;
 import org.apache.openejb.resource.jdbc.DataSourceFactory;
 import org.apache.openejb.resource.jdbc.managed.local.ManagedDataSource;
 import org.apache.openejb.spi.ApplicationServer;
@@ -2111,7 +2112,8 @@ public class Assembler extends Assembler
 
     public void createResource(final ResourceInfo serviceInfo) throws OpenEJBException {
         final ObjectRecipe serviceRecipe = createRecipe(serviceInfo);
-        if ("false".equalsIgnoreCase(serviceInfo.properties.getProperty("SkipImplicitAttributes", "false"))) {
+        final boolean properties = PropertiesFactory.class.getName().equals(serviceInfo.className);
+        if ("false".equalsIgnoreCase(serviceInfo.properties.getProperty("SkipImplicitAttributes", "false")) && !properties) {
             serviceRecipe.setProperty("transactionManager", transactionManager);
             serviceRecipe.setProperty("ServiceId", serviceInfo.id);
         }
@@ -2295,7 +2297,7 @@ public class Assembler extends Assembler
                     remoteResourceMonitor.registerIfNot();
                 }
             }
-        } else {
+        } else if (!Properties.class.isInstance(service)) {
             logUnusedProperties(serviceRecipe, serviceInfo);
         }
 

Added: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/PropertiesFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/PropertiesFactory.java?rev=1543430&view=auto
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/PropertiesFactory.java (added)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/PropertiesFactory.java Tue Nov 19 13:50:21 2013
@@ -0,0 +1,31 @@
+/*
+ * 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.resource;
+
+import java.util.Properties;
+
+public class PropertiesFactory {
+    private Properties properties;
+
+    public void setProperties(final Properties properties) {
+        this.properties = properties;
+    }
+
+    public Properties create() {
+        return properties;
+    }
+}

Added: tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/resource/PropertiesInjectionTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/resource/PropertiesInjectionTest.java?rev=1543430&view=auto
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/resource/PropertiesInjectionTest.java (added)
+++ tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/resource/PropertiesInjectionTest.java Tue Nov 19 13:50:21 2013
@@ -0,0 +1,57 @@
+/*
+ * 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.resource;
+
+import org.apache.openejb.jee.EjbJar;
+import org.apache.openejb.junit.ApplicationComposer;
+import org.apache.openejb.testing.Configuration;
+import org.apache.openejb.testing.Module;
+import org.apache.openejb.testng.PropertiesBuilder;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import javax.annotation.Resource;
+import java.util.Properties;
+
+import static org.junit.Assert.assertEquals;
+
+@RunWith(ApplicationComposer.class)
+public class PropertiesInjectionTest {
+    @Configuration
+    public Properties p() {
+        return new PropertiesBuilder()
+            .p("p", "new://Resource?class-name=" + PropertiesFactory.class.getName() + "&factory-name=create")
+            .p("p.attr1", "v1")
+            .p("p.attr2", "v2")
+            .build();
+    }
+
+    @Module
+    public EjbJar jar() {
+        return new EjbJar();
+    }
+
+    @Resource(name = "p")
+    private Properties p;
+
+    @Test
+    public void test() {
+        assertEquals("v1", p.getProperty("attr1"));
+        assertEquals("v2", p.getProperty("attr2"));
+        assertEquals(2, p.size());
+    }
+}