geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r525609 [3/3] - in /geronimo/server/trunk/modules: geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/annotation/ geronimo-con...
Date Wed, 04 Apr 2007 21:20:05 GMT
Modified: geronimo/server/trunk/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/SwitchingServiceRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/SwitchingServiceRefBuilder.java?view=diff&rev=525609&r1=525608&r2=525609
==============================================================================
--- geronimo/server/trunk/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/SwitchingServiceRefBuilder.java
(original)
+++ geronimo/server/trunk/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/SwitchingServiceRefBuilder.java
Wed Apr  4 14:20:03 2007
@@ -17,10 +17,13 @@
 
 package org.apache.geronimo.naming.deployment;
 
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
+import javax.annotation.Resource;
 import javax.xml.namespace.QName;
 
 import org.apache.commons.logging.Log;
@@ -30,15 +33,21 @@
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.j2ee.deployment.Module;
+import org.apache.geronimo.j2ee.deployment.annotation.AnnotatedApp;
 import org.apache.geronimo.j2ee.deployment.annotation.HandlerChainAnnotationHelper;
+import org.apache.geronimo.j2ee.deployment.annotation.ResourceAnnotationHelper;
 import org.apache.geronimo.j2ee.deployment.annotation.WebServiceRefAnnotationHelper;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.kernel.config.Configuration;
 import org.apache.geronimo.kernel.repository.Environment;
 import org.apache.geronimo.xbeans.geronimo.naming.GerServiceRefDocument;
 import org.apache.geronimo.xbeans.geronimo.naming.GerServiceRefType;
+import org.apache.geronimo.xbeans.javaee.DescriptionType;
+import org.apache.geronimo.xbeans.javaee.FullyQualifiedClassType;
 import org.apache.geronimo.xbeans.javaee.InjectionTargetType;
+import org.apache.geronimo.xbeans.javaee.JndiNameType;
 import org.apache.geronimo.xbeans.javaee.ServiceRefType;
+import org.apache.geronimo.xbeans.javaee.XsdStringType;
 import org.apache.xmlbeans.QNameSet;
 import org.apache.xmlbeans.XmlObject;
 
@@ -193,8 +202,14 @@
 
         // Process all the annotations for this naming builder type
         //At the moment the only exception thrown is if the resulting doc is not valid. 
Bail now.
-        WebServiceRefAnnotationHelper.processAnnotations(module.getAnnotatedApp(), module.getClassFinder());
-        HandlerChainAnnotationHelper.processAnnotations(module.getAnnotatedApp(), module.getClassFinder());
+        try {
+            WebServiceRefAnnotationHelper.processAnnotations(module.getAnnotatedApp(), module.getClassFinder());
+            HandlerChainAnnotationHelper.processAnnotations(module.getAnnotatedApp(), module.getClassFinder());
+            ResourceAnnotationHelper.processAnnotations(module.getAnnotatedApp(), module.getClassFinder(),
ServiceRefProcessor.INSTANCE);
+        }
+        catch (Exception e) {
+            log.warn("Unable to process @Resource annotations for module" + module.getName(),
e);
+        }
     }
 
     public QNameSet getSpecQNameSet() {
@@ -203,6 +218,103 @@
 
     public QNameSet getPlanQNameSet() {
         return GER_SERVICE_REF_QNAME_SET;
+    }
+
+    public static class ServiceRefProcessor extends ResourceAnnotationHelper.ResourceProcessor
{
+
+        public static final ServiceRefProcessor INSTANCE = new ServiceRefProcessor();
+
+        private ServiceRefProcessor() {
+        }
+
+        public boolean processResource(AnnotatedApp annotatedApp, Resource annotation, Class
cls, Method method, Field field) {
+            log.debug("processResource( [annotatedApp] " + annotatedApp.toString() + ","
+ '\n' +
+                    "[annotation] " + annotation.toString() + "," + '\n' +
+                    "[cls] " + (cls != null ? cls.getName() : null) + "," + '\n' +
+                    "[method] " + (method != null ? method.getName() : null) + "," + '\n'
+
+                    "[field] " + (field != null ? field.getName() : null) + " ): Entry");
+
+            String resourceName = getResourceName(annotation, method, field);
+            String resourceType = getResourceType(annotation, method, field);
+
+            log.debug("processResource(): resourceName: " + resourceName);
+            log.debug("processResource(): resourceType: " + resourceType);
+
+            if (resourceType.equals("javax.xml.rpc.Service") ||
+                resourceType.equals("javax.xml.ws.Service") ||
+                resourceType.equals("javax.jws.WebService")) {
+
+                log.debug("processResource(): <service-ref> found");
+
+                boolean exists = false;
+                ServiceRefType[] serviceRefs = annotatedApp.getServiceRefArray();
+                for (ServiceRefType serviceRef : serviceRefs) {
+                    if (serviceRef.getServiceRefName().getStringValue().trim().equals(resourceName))
{
+                        if (method != null || field != null) {
+                            InjectionTargetType[] targets = serviceRef.getInjectionTargetArray();
+                            if (!hasTarget(method, field, targets)) {
+                                configureInjectionTarget(serviceRef.addNewInjectionTarget(),
method, field);
+                            }
+                        }
+                        exists = true;
+                        break;
+                    }
+                }
+                if (!exists) {
+                    try {
+
+                        log.debug("processResource(): Does not exist in DD: " + resourceName);
+
+                        // Doesn't exist in deployment descriptor -- add new
+                        ServiceRefType serviceRef = annotatedApp.addNewServiceRef();
+
+                        //------------------------------------------------------------------------------
+                        // <service-ref> required elements:
+                        //------------------------------------------------------------------------------
+
+                        // service-ref-name
+                        JndiNameType serviceRefName = serviceRef.addNewServiceRefName();
+                        serviceRefName.setStringValue(resourceName);
+                        serviceRef.setServiceRefName(serviceRefName);
+
+                        // service-ref-interface
+                        FullyQualifiedClassType serviceRefInterfaceClass = serviceRef.addNewServiceInterface();
+                        serviceRefInterfaceClass.setStringValue(resourceType);
+                        serviceRef.setServiceInterface(serviceRefInterfaceClass);
+
+                        //------------------------------------------------------------------------------
+                        // <service-ref> optional elements:
+                        //------------------------------------------------------------------------------
+
+                        // description
+                        String descriptionAnnotation = annotation.description();
+                        if (!descriptionAnnotation.equals("")) {
+                            DescriptionType description = serviceRef.addNewDescription();
+                            description.setStringValue(descriptionAnnotation);
+                        }
+
+                        // service-ref-type
+                        if (!serviceRef.isSetServiceRefType()) {
+                            FullyQualifiedClassType serviceRefTypeClass = serviceRef.addNewServiceRefType();
+                            serviceRefTypeClass.setStringValue(resourceType);
+                            serviceRef.setServiceRefType(serviceRefTypeClass);
+                        }
+
+                        // mappedName
+                        if (!serviceRef.isSetMappedName() && annotation.mappedName().trim().length()
> 0) {
+                            XsdStringType mappedName = serviceRef.addNewMappedName();
+                            mappedName.setStringValue(annotation.mappedName().trim());
+                            serviceRef.setMappedName(mappedName);
+                        }
+                    }
+                    catch (Exception anyException) {
+                        log.debug("SwitchServiceRefBuilder: Exception caught while processing
<service-ref>");
+                    }
+                }
+                return true;
+            }
+            return false;
+        }
     }
 
     public static final GBeanInfo GBEAN_INFO;

Added: geronimo/server/trunk/modules/geronimo-naming-builder/src/test/java/org/apache/geronimo/naming/deployment/annotation/AnnotationHelperTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-naming-builder/src/test/java/org/apache/geronimo/naming/deployment/annotation/AnnotationHelperTest.java?view=auto&rev=525609
==============================================================================
--- geronimo/server/trunk/modules/geronimo-naming-builder/src/test/java/org/apache/geronimo/naming/deployment/annotation/AnnotationHelperTest.java
(added)
+++ geronimo/server/trunk/modules/geronimo-naming-builder/src/test/java/org/apache/geronimo/naming/deployment/annotation/AnnotationHelperTest.java
Wed Apr  4 14:20:03 2007
@@ -0,0 +1,111 @@
+/**
+ *  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.geronimo.naming.deployment.annotation;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import javax.annotation.Resource;
+import javax.annotation.Resources;
+
+import org.apache.geronimo.j2ee.deployment.annotation.ResourceAnnotationHelper;
+import org.apache.geronimo.j2ee.deployment.annotation.AnnotatedWebApp;
+import org.apache.geronimo.naming.deployment.EnvironmentEntryBuilder;
+import org.apache.geronimo.naming.deployment.SwitchingServiceRefBuilder;
+import org.apache.geronimo.testsupport.XmlBeansTestSupport;
+import org.apache.geronimo.xbeans.javaee.WebAppDocument;
+import org.apache.geronimo.xbeans.javaee.WebAppType;
+import org.apache.xmlbeans.XmlObject;
+import org.apache.xbean.finder.ClassFinder;
+import org.apache.xmlbeans.XmlOptions;
+
+/**
+ * Testcases for each of the various AnnotationHelper class
+ */
+public class AnnotationHelperTest extends XmlBeansTestSupport {
+
+    private Class[] classes = {ResourceAnnotationTest.class};
+
+    private ClassFinder classFinder = new ClassFinder(classes);
+    private ClassLoader classLoader = this.getClass().getClassLoader();
+    private XmlOptions options = new XmlOptions();
+
+    public void testResourceAnnotationHelper() throws Exception {
+
+        //-------------------------------------------------
+        // Ensure annotations are discovered correctly
+        //-------------------------------------------------
+        List<Class> annotatedClasses = classFinder.findAnnotatedClasses(Resources.class);
+        assertNotNull(annotatedClasses);
+        assertEquals(1, annotatedClasses.size());
+        assertTrue(annotatedClasses.contains(ResourceAnnotationTest.class));
+
+        List<Method> annotatedMethods = classFinder.findAnnotatedMethods(Resource.class);
+        assertNotNull(annotatedMethods);
+        assertEquals(2, annotatedMethods.size());
+        assertTrue(annotatedMethods.contains(ResourceAnnotationTest.class.getDeclaredMethod("setAnnotatedMethod1",
new Class[]{String.class})));
+        assertTrue(annotatedMethods.contains(ResourceAnnotationTest.class.getDeclaredMethod("setAnnotatedMethod2",
new Class[]{String.class})));
+
+        List<Field> annotatedFields = classFinder.findAnnotatedFields(Resource.class);
+        assertNotNull(annotatedFields);
+        assertEquals(2, annotatedFields.size());
+        assertTrue(annotatedFields.contains(ResourceAnnotationTest.class.getDeclaredField("annotatedField1")));
+        assertTrue(annotatedFields.contains(ResourceAnnotationTest.class.getDeclaredField("annotatedField2")));
+
+        //-------------------------------------------------
+        // Ensure annotations are processed correctly
+        //-------------------------------------------------
+        //
+        // 2. env-entry
+        //
+        URL srcXML = classLoader.getResource("annotation/empty-web-src.xml");
+        XmlObject xmlObject = XmlObject.Factory.parse(srcXML, options);
+        WebAppDocument webAppDoc = (WebAppDocument) xmlObject.changeType(WebAppDocument.type);
+        WebAppType webApp = webAppDoc.getWebApp();
+        AnnotatedWebApp annotatedWebApp = new AnnotatedWebApp(webApp);
+        ResourceAnnotationHelper.processAnnotations(annotatedWebApp, classFinder, EnvironmentEntryBuilder.EnvEntryRefProcessor.INSTANCE);
+        URL expectedXML = classLoader.getResource("annotation/env-entry-expected.xml");
+        XmlObject expected = XmlObject.Factory.parse(expectedXML);
+        log.debug("[@Resource <env-entry> Source XML] " + '\n' + webApp.toString()
+ '\n');
+        log.debug("[@Resource <env-entry> Expected XML]" + '\n' + expected.toString()
+ '\n');
+        List problems = new ArrayList();
+        boolean ok = compareXmlObjects(webApp, expected, problems);
+        assertTrue("Differences: " + problems, ok);
+        //
+        // 3. service-ref
+        //
+        srcXML = classLoader.getResource("annotation/empty-web-src.xml");
+        xmlObject = XmlObject.Factory.parse(srcXML, options);
+        webAppDoc = (WebAppDocument) xmlObject.changeType(WebAppDocument.type);
+        webApp = webAppDoc.getWebApp();
+        annotatedWebApp = new AnnotatedWebApp(webApp);
+        ResourceAnnotationHelper.processAnnotations(annotatedWebApp, classFinder, SwitchingServiceRefBuilder.ServiceRefProcessor.INSTANCE);
+        expectedXML = classLoader.getResource("annotation/service-ref-expected.xml");
+        expected = XmlObject.Factory.parse(expectedXML);
+        log.debug("[@Resource <service-ref> Source XML] " + '\n' + webApp.toString()
+ '\n');
+        log.debug("[@Resource <service-ref> Expected XML]" + '\n' + expected.toString()
+ '\n');
+        problems = new ArrayList();
+        ok = compareXmlObjects(webApp, expected, problems);
+        assertTrue("Differences: " + problems, ok);
+    }
+
+}

Propchange: geronimo/server/trunk/modules/geronimo-naming-builder/src/test/java/org/apache/geronimo/naming/deployment/annotation/AnnotationHelperTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/modules/geronimo-naming-builder/src/test/java/org/apache/geronimo/naming/deployment/annotation/AnnotationHelperTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/modules/geronimo-naming-builder/src/test/java/org/apache/geronimo/naming/deployment/annotation/AnnotationHelperTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/modules/geronimo-naming-builder/src/test/java/org/apache/geronimo/naming/deployment/annotation/ResourceAnnotationTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-naming-builder/src/test/java/org/apache/geronimo/naming/deployment/annotation/ResourceAnnotationTest.java?view=auto&rev=525609
==============================================================================
--- geronimo/server/trunk/modules/geronimo-naming-builder/src/test/java/org/apache/geronimo/naming/deployment/annotation/ResourceAnnotationTest.java
(added)
+++ geronimo/server/trunk/modules/geronimo-naming-builder/src/test/java/org/apache/geronimo/naming/deployment/annotation/ResourceAnnotationTest.java
Wed Apr  4 14:20:03 2007
@@ -0,0 +1,70 @@
+/**
+ * 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.geronimo.naming.deployment.annotation;
+
+import javax.annotation.Resource;
+import javax.annotation.Resources;
+
+@Resources ({
+                @Resource(name = "Resource1",                   // 2. env-entry
+                          type = java.lang.String.class,
+                          authenticationType = Resource.AuthenticationType.APPLICATION,
+                          shareable = true,
+                          description = "description1",
+                          mappedName = "mappedName1"),
+                @Resource(name = "Resource2",                   // 3. service-ref
+                          type = javax.xml.ws.Service.class,
+                          authenticationType = Resource.AuthenticationType.APPLICATION)
+            })
+public class ResourceAnnotationTest {
+
+    @Resource(name = "Resource3",
+              type = java.lang.Object.class,
+              authenticationType = Resource.AuthenticationType.CONTAINER,
+              shareable = true,
+              mappedName = "mappedName3")
+    boolean annotatedField1;
+
+    @Resource(name = "Resource4",
+              type = javax.xml.ws.Service.class,               // 3. service-ref
+              shareable = false,
+              description = "description4",
+              mappedName = "mappedName4")
+    String annotatedField2;
+
+    //------------------------------------------------------------------------------------------
+    // Method name (for setter-based injection) must follow JavaBeans conventions:
+    // -- Must start with "set"
+    // -- Have one parameter
+    // -- Return void
+    //------------------------------------------------------------------------------------------
+    @Resource(name = "Resource5",                               // 1. resource-ref
+              type = javax.sql.DataSource.class,
+              authenticationType = Resource.AuthenticationType.CONTAINER,
+              description = "description5",
+              mappedName = "mappedName5")
+    public void setAnnotatedMethod1(String string) {
+    }
+
+    @Resource                                                   // 2. env-entry
+    public void setAnnotatedMethod2(String string) {
+    }
+
+}

Propchange: geronimo/server/trunk/modules/geronimo-naming-builder/src/test/java/org/apache/geronimo/naming/deployment/annotation/ResourceAnnotationTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/modules/geronimo-naming-builder/src/test/java/org/apache/geronimo/naming/deployment/annotation/ResourceAnnotationTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/modules/geronimo-naming-builder/src/test/java/org/apache/geronimo/naming/deployment/annotation/ResourceAnnotationTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/modules/geronimo-naming-builder/src/test/resources/annotation/empty-web-src.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-naming-builder/src/test/resources/annotation/empty-web-src.xml?view=auto&rev=525609
==============================================================================
--- geronimo/server/trunk/modules/geronimo-naming-builder/src/test/resources/annotation/empty-web-src.xml
(added)
+++ geronimo/server/trunk/modules/geronimo-naming-builder/src/test/resources/annotation/empty-web-src.xml
Wed Apr  4 14:20:03 2007
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   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.
+-->
+
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+   version="2.5" >
+
+    <display-name>Empty web application</display-name>
+    <description>Empty web application</description>
+
+</web-app>

Propchange: geronimo/server/trunk/modules/geronimo-naming-builder/src/test/resources/annotation/empty-web-src.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/modules/geronimo-naming-builder/src/test/resources/annotation/empty-web-src.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/modules/geronimo-naming-builder/src/test/resources/annotation/empty-web-src.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/modules/geronimo-naming-builder/src/test/resources/annotation/env-entry-expected.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-naming-builder/src/test/resources/annotation/env-entry-expected.xml?view=auto&rev=525609
==============================================================================
--- geronimo/server/trunk/modules/geronimo-naming-builder/src/test/resources/annotation/env-entry-expected.xml
(added)
+++ geronimo/server/trunk/modules/geronimo-naming-builder/src/test/resources/annotation/env-entry-expected.xml
Wed Apr  4 14:20:03 2007
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   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.
+-->
+
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+   version="2.5" >
+
+    <display-name>Empty web application</display-name>
+    <description>Empty web application</description>
+    <env-entry>
+        <description>description1</description>
+        <env-entry-name>Resource1</env-entry-name>
+        <env-entry-type>java.lang.String</env-entry-type>
+        <env-entry-value>mappedName1</env-entry-value>
+        <mapped-name>mappedName1</mapped-name>
+    </env-entry>
+    <env-entry>
+        <env-entry-name>org.apache.geronimo.j2ee.deployment.annotation.ResourceAnnotationTest/annotatedMethod2</env-entry-name>
+        <env-entry-type>java.lang.String</env-entry-type>
+    </env-entry>
+
+</web-app>

Propchange: geronimo/server/trunk/modules/geronimo-naming-builder/src/test/resources/annotation/env-entry-expected.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/modules/geronimo-naming-builder/src/test/resources/annotation/env-entry-expected.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/modules/geronimo-naming-builder/src/test/resources/annotation/env-entry-expected.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/modules/geronimo-naming-builder/src/test/resources/annotation/service-ref-expected.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-naming-builder/src/test/resources/annotation/service-ref-expected.xml?view=auto&rev=525609
==============================================================================
--- geronimo/server/trunk/modules/geronimo-naming-builder/src/test/resources/annotation/service-ref-expected.xml
(added)
+++ geronimo/server/trunk/modules/geronimo-naming-builder/src/test/resources/annotation/service-ref-expected.xml
Wed Apr  4 14:20:03 2007
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   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.
+-->
+
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+   version="2.5" >
+
+    <display-name>Empty web application</display-name>
+    <description>Empty web application</description>
+    <service-ref>
+        <service-ref-name>Resource2</service-ref-name>
+        <service-interface>javax.xml.ws.Service</service-interface>
+        <service-ref-type>javax.xml.ws.Service</service-ref-type>
+    </service-ref>
+    <service-ref>
+        <description>description4</description>
+        <service-ref-name>Resource4</service-ref-name>
+        <service-interface>javax.xml.ws.Service</service-interface>
+        <service-ref-type>javax.xml.ws.Service</service-ref-type>
+        <mapped-name>mappedName4</mapped-name>
+    </service-ref>
+
+</web-app>

Propchange: geronimo/server/trunk/modules/geronimo-naming-builder/src/test/resources/annotation/service-ref-expected.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/modules/geronimo-naming-builder/src/test/resources/annotation/service-ref-expected.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/modules/geronimo-naming-builder/src/test/resources/annotation/service-ref-expected.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml



Mime
View raw message