svn commit: r1374099 - in /openejb/trunk/openejb: container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/util/ examples/webservice-ws-with-resources-config/src/main/resources/META-INF/ server/openejb-cxf/src/main/java/org/apache/open...

[rmannibucau]

Author: rmannibucau
Date: Thu Aug 16 23:00:50 2012
New Revision: 1374099

URL: http://svn.apache.org/viewvc?rev=1374099&view=rev
Log:
simplying the config and moving wss4jinterceptorfactory in config package

Added:
    
openejb/trunk/openejb/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/config/
    
openejb/trunk/openejb/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/config/WSS4JInInterceptorFactory.java
      - copied, changed from r1374094, 
openejb/trunk/openejb/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/WSS4JInInterceptorFactory.java
Removed:
    
openejb/trunk/openejb/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/WSS4JInInterceptorFactory.java
Modified:
    
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/util/ServiceInfos.java
    
openejb/trunk/openejb/examples/webservice-ws-with-resources-config/src/main/resources/META-INF/resources.xml

Modified: 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/util/ServiceInfos.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/util/ServiceInfos.java?rev=1374099&r1=1374098&r2=1374099&view=diff
==============================================================================
--- 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/util/ServiceInfos.java
 (original)
+++ 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/util/ServiceInfos.java
 Thu Aug 16 23:00:50 2012
@@ -24,6 +24,7 @@ import org.apache.openejb.config.sys.Map
 import org.apache.openejb.loader.SystemInstance;
 import org.apache.xbean.recipe.ObjectRecipe;
 import org.apache.xbean.recipe.Option;
+import org.apache.xbean.recipe.UnsetPropertiesRecipe;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -102,6 +103,10 @@ public final class ServiceInfos {
     }
 
     public static Object build(final Collection<ServiceInfo> services, final 
ServiceInfo info, final ObjectRecipe serviceRecipe) {
+        if (!info.properties.containsKey("properties")) {
+            info.properties.put("properties", new UnsetPropertiesRecipe());
+        }
+
         // we can't ask to have a setter for existing code
         serviceRecipe.allow(Option.FIELD_INJECTION);
         serviceRecipe.allow(Option.PRIVATE_PROPERTIES);

Modified: 
openejb/trunk/openejb/examples/webservice-ws-with-resources-config/src/main/resources/META-INF/resources.xml
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/webservice-ws-with-resources-config/src/main/resources/META-INF/resources.xml?rev=1374099&r1=1374098&r2=1374099&view=diff
==============================================================================
--- 
openejb/trunk/openejb/examples/webservice-ws-with-resources-config/src/main/resources/META-INF/resources.xml
 (original)
+++ 
openejb/trunk/openejb/examples/webservice-ws-with-resources-config/src/main/resources/META-INF/resources.xml
 Thu Aug 16 23:00:50 2012
@@ -19,16 +19,11 @@
 <resources>
   <!-- our bean config -->
   <Service class-name="org.superbiz.ws.security.CalculatorBean">
-    cxf.jaxws.in-interceptors = wss4j-in
+    cxf.jaxws.in-interceptors = wss4j
   </Service>
 
   <!-- the interceptors -->
-  <Service id="wss4j-in" 
class-name="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
-    properties = $in-prop
-  </Service>
-
-  <!-- the properties for saaj interceptors -->
-  <Service id="in-prop" class-name="org.apache.openejb.config.sys.MapFactory" 
factory-name="create" constructor="prop">
+  <Service id="wss4j" 
class-name="org.apache.openejb.server.cxf.config.WSS4JInInterceptorFactory" 
factory-name="create">
     action = UsernameToken
     passwordType = PasswordText
     passwordCallbackClass = org.superbiz.ws.security.PasswordCallbackHandler

Copied: 
openejb/trunk/openejb/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/config/WSS4JInInterceptorFactory.java
 (from r1374094, 
openejb/trunk/openejb/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/WSS4JInInterceptorFactory.java)
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/config/WSS4JInInterceptorFactory.java?p2=openejb/trunk/openejb/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/config/WSS4JInInterceptorFactory.java&p1=openejb/trunk/openejb/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/WSS4JInInterceptorFactory.java&r1=1374094&r2=1374099&rev=1374099&view=diff
==============================================================================
--- 
openejb/trunk/openejb/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/WSS4JInInterceptorFactory.java
 (original)
+++ 
openejb/trunk/openejb/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/config/WSS4JInInterceptorFactory.java
 Thu Aug 16 23:00:50 2012
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.openejb.server.cxf;
+package org.apache.openejb.server.cxf.config;
 
 import org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor;