[jboss-cvs] JBossAS SVN: r59720 - in trunk: ejb3/src/main/org/jboss/injection and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jan 17 18:05:52 EST 2007
Author: thomas.diesler at jboss.com
Date: 2007-01-17 18:05:52 -0500 (Wed, 17 Jan 2007)
New Revision: 59720
Added:
trunk/server/src/main/org/jboss/metamodel/descriptor/PortInfo.java
Modified:
trunk/ejb3/src/main/org/jboss/ejb3/metamodel/ApplicationClientDDObjectFactory.java
trunk/ejb3/src/main/org/jboss/ejb3/metamodel/EjbJarDDObjectFactory.java
trunk/ejb3/src/main/org/jboss/ejb3/metamodel/JBossClientDDObjectFactory.java
trunk/ejb3/src/main/org/jboss/ejb3/metamodel/JBossDDObjectFactory.java
trunk/ejb3/src/main/org/jboss/injection/WebServiceRefHandler.java
trunk/server/src/main/org/jboss/metamodel/descriptor/DDObjectFactory.java
trunk/server/src/main/org/jboss/metamodel/descriptor/EnvironmentRefGroup.java
trunk/server/src/main/org/jboss/metamodel/descriptor/ServiceRef.java
trunk/server/src/resources/dtd/service-ref_5_0.dtd
trunk/tomcat/src/main/org/jboss/web/metamodel/descriptor/JBossWebDDObjectFactory.java
trunk/tomcat/src/main/org/jboss/web/metamodel/descriptor/WebDDObjectFactory.java
Log:
Support full spec of service-ref_5_0.dtd
Modified: trunk/ejb3/src/main/org/jboss/ejb3/metamodel/ApplicationClientDDObjectFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/metamodel/ApplicationClientDDObjectFactory.java 2007-01-17 22:31:51 UTC (rev 59719)
+++ trunk/ejb3/src/main/org/jboss/ejb3/metamodel/ApplicationClientDDObjectFactory.java 2007-01-17 23:05:52 UTC (rev 59720)
@@ -46,32 +46,33 @@
public class ApplicationClientDDObjectFactory extends DDObjectFactory
{
private static final Logger log = Logger.getLogger(ApplicationClientDDObjectFactory.class);
-
+
// made public for the parsing deployer
public ApplicationClientDDObjectFactory()
{
-
+
}
-
+
public static ApplicationClientDD parse(URL ddResource) throws JBossXBException, IOException
{
- if(ddResource == null)
+ if (ddResource == null)
return null;
-
+
log.debug("found application-client.xml " + ddResource);
-
+
ApplicationClientDDObjectFactory factory = new ApplicationClientDDObjectFactory();
UnmarshallerFactory unmarshallerFactory = UnmarshallerFactory.newInstance();
- unmarshallerFactory.setFeature(Unmarshaller.SCHEMA_VALIDATION, true);
Unmarshaller unmarshaller = unmarshallerFactory.newUnmarshaller();
- JBossEntityResolver entityResolver = new JBossEntityResolver();
- unmarshaller.setEntityResolver(entityResolver);
+ unmarshaller.setEntityResolver(new JBossEntityResolver());
+ unmarshaller.setNamespaceAware(true);
+ unmarshaller.setSchemaValidation(true);
+ unmarshaller.setValidation(true);
- ApplicationClientDD dd = (ApplicationClientDD) unmarshaller.unmarshal(ddResource.openStream(), factory, null);
-
+ ApplicationClientDD dd = (ApplicationClientDD)unmarshaller.unmarshal(ddResource.openStream(), factory, null);
+
return dd;
}
-
+
public void addChild(ApplicationClientDD parent, EjbRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addEjbRef(ref);
@@ -87,14 +88,13 @@
public void addChild(ApplicationClientDD parent, LifecycleCallback lifecycleCallback, UnmarshallingContext navigator, String namespaceURI, String localName)
{
- if(localName.equals("post-construct"))
+ if (localName.equals("post-construct"))
parent.getPostConstructs().add(lifecycleCallback);
- else if(localName.equals("pre-destroy"))
+ else if (localName.equals("pre-destroy"))
parent.getPreDestroys().add(lifecycleCallback);
- else
- throw new IllegalArgumentException(localName);
+ else throw new IllegalArgumentException(localName);
}
-
+
public Object completeRoot(Object root, UnmarshallingContext ctx, String uri, String name)
{
throw new RuntimeException("NYI");
@@ -103,27 +103,27 @@
public Object newChild(ApplicationClientDD parent, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
Object child = super.newEnvRefGroupChild(localName);
- if(child != null) return child;
-
- if(localName.equals("post-construct") || localName.equals("pre-destroy"))
+ if (child != null)
+ return child;
+
+ if (localName.equals("post-construct") || localName.equals("pre-destroy"))
{
child = new LifecycleCallback();
}
-
+
// ignore things like display-name & description
-
+
return child;
}
-
+
public Object newRoot(Object root, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
final ApplicationClientDD dd;
- if(root == null)
+ if (root == null)
root = dd = new ApplicationClientDD();
- else
- dd = (ApplicationClientDD) root;
-
- if(attrs.getLength() > 0)
+ else dd = (ApplicationClientDD)root;
+
+ if (attrs.getLength() > 0)
{
for (int i = 0; i < attrs.getLength(); ++i)
{
@@ -131,23 +131,22 @@
{
dd.setVersion(attrs.getValue(i));
}
- else if(attrs.getLocalName(i).equals("metadata-complete"))
+ else if (attrs.getLocalName(i).equals("metadata-complete"))
{
dd.setMetadataComplete(Boolean.parseBoolean(attrs.getValue(i)));
}
- else if(attrs.getLocalName(i).equals("schemaLocation"))
+ else if (attrs.getLocalName(i).equals("schemaLocation"))
{
// ignore
}
- else if(attrs.getLocalName(i).equals("id"))
+ else if (attrs.getLocalName(i).equals("id"))
{
// ignore
}
- else
- throw new IllegalArgumentException(attrs.getLocalName(i));
+ else throw new IllegalArgumentException(attrs.getLocalName(i));
}
}
-
+
return root;
}
@@ -160,21 +159,20 @@
{
dd.setDisplayName(getValue(localName, value));
}
-// else if(localName.equals("description"))
-// {
-// // ignore
-// }
-// else
-// throw new IllegalArgumentException(localName);
+ // else if(localName.equals("description"))
+ // {
+ // // ignore
+ // }
+ // else
+ // throw new IllegalArgumentException(localName);
}
-
+
public void setValue(LifecycleCallback lifecycleCallback, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
- if(localName.equals("lifecycle-callback-class"))
+ if (localName.equals("lifecycle-callback-class"))
lifecycleCallback.setLifecycleCallbackClass(value);
- else if(localName.equals("lifecycle-callback-method"))
+ else if (localName.equals("lifecycle-callback-method"))
lifecycleCallback.setLifecycleCallbackMethod(value);
- else
- throw new IllegalArgumentException(localName);
+ else throw new IllegalArgumentException(localName);
}
}
Modified: trunk/ejb3/src/main/org/jboss/ejb3/metamodel/EjbJarDDObjectFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/metamodel/EjbJarDDObjectFactory.java 2007-01-17 22:31:51 UTC (rev 59719)
+++ trunk/ejb3/src/main/org/jboss/ejb3/metamodel/EjbJarDDObjectFactory.java 2007-01-17 23:05:52 UTC (rev 59720)
@@ -1,30 +1,30 @@
/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
package org.jboss.ejb3.metamodel;
import java.io.IOException;
import java.net.URL;
-import javax.management.ObjectName;
+import javax.management.ObjectName;
import org.jboss.ejb3.KernelAbstraction;
import org.jboss.ejb3.KernelAbstractionFactory;
@@ -36,7 +36,7 @@
import org.jboss.xb.binding.UnmarshallerFactory;
import org.jboss.xb.binding.UnmarshallingContext;
import org.xml.sax.Attributes;
-
+
import org.jboss.metadata.SecurityRoleRefMetaData;
import org.jboss.metamodel.descriptor.DDObjectFactory;
import org.jboss.metamodel.descriptor.EjbLocalRef;
@@ -63,11 +63,9 @@
public class EjbJarDDObjectFactory extends DDObjectFactory
{
- private static final Logger log = Logger
- .getLogger(EjbJarDDObjectFactory.class);
+ private static final Logger log = Logger.getLogger(EjbJarDDObjectFactory.class);
- public static EjbJarDD parse(URL ddResource)
- throws JBossXBException, IOException
+ public static EjbJarDD parse(URL ddResource) throws JBossXBException, IOException
{
ObjectModelFactory factory = null;
Unmarshaller unmarshaller = null;
@@ -78,22 +76,20 @@
log.debug("found ejb-jar.xml " + ddResource);
factory = new EjbJarDDObjectFactory();
- UnmarshallerFactory unmarshallerFactory = UnmarshallerFactory
- .newInstance();
- unmarshallerFactory.setFeature(Unmarshaller.SCHEMA_VALIDATION, true);
+ UnmarshallerFactory unmarshallerFactory = UnmarshallerFactory.newInstance();
unmarshaller = unmarshallerFactory.newUnmarshaller();
- JBossEntityResolver entityResolver = new JBossEntityResolver();
- unmarshaller.setEntityResolver(entityResolver);
+ unmarshaller.setEntityResolver(new JBossEntityResolver());
+ unmarshaller.setNamespaceAware(true);
+ unmarshaller.setSchemaValidation(true);
+ unmarshaller.setValidation(true);
- dd = (EjbJarDD) unmarshaller.unmarshal(ddResource.openStream(),
- factory, null);
+ dd = (EjbJarDD)unmarshaller.unmarshal(ddResource.openStream(), factory, null);
}
return dd;
}
- public Object newRoot(Object root, UnmarshallingContext navigator,
- String namespaceURI, String localName, Attributes attrs)
+ public Object newRoot(Object root, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
final EjbJarDD dd;
@@ -103,7 +99,7 @@
}
else
{
- dd = (EjbJarDD) root;
+ dd = (EjbJarDD)root;
}
if (attrs.getLength() > 0)
@@ -120,8 +116,7 @@
return root;
}
- public Object completeRoot(Object root, UnmarshallingContext ctx,
- String uri, String name)
+ public Object completeRoot(Object root, UnmarshallingContext ctx, String uri, String name)
{
return root;
}
@@ -131,8 +126,7 @@
/**
* Called when parsing of a new element started.
*/
- public Object newChild(EjbJarDD dd, UnmarshallingContext navigator,
- String namespaceURI, String localName, Attributes attrs)
+ public Object newChild(EjbJarDD dd, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
Object child = null;
@@ -159,8 +153,7 @@
/**
* Called when parsing of a new element started.
*/
- public Object newChild(EnterpriseBeans ejbs, UnmarshallingContext navigator,
- String namespaceURI, String localName, Attributes attrs)
+ public Object newChild(EnterpriseBeans ejbs, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
Object child = null;
@@ -192,7 +185,6 @@
return child;
}
-
private Object newEjbHasInterceptorsChild(EnterpriseBean parent, String localName)
{
Object child = null;
@@ -220,15 +212,15 @@
return child;
}
- public Object newChild(MessageDrivenBean parent,
- UnmarshallingContext navigator, String namespaceURI, String localName,
- Attributes attrs)
+ public Object newChild(MessageDrivenBean parent, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
Object child = newEjbChild(parent, localName);
- if (child != null) return child;
+ if (child != null)
+ return child;
child = newEjbHasInterceptorsChild(parent, localName);
- if (child != null) return child;
+ if (child != null)
+ return child;
if (localName.equals("message-driven-destination"))
{
@@ -242,16 +234,14 @@
return child;
}
- public Object newChild(ActivationConfig parent,
- UnmarshallingContext navigator, String namespaceURI, String localName,
- Attributes attrs)
+ public Object newChild(ActivationConfig parent, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
Object child = null;
- if (localName.equals("activation-config-property"))
- {
+ if (localName.equals("activation-config-property"))
+ {
child = new NameValuePair();
- }
+ }
return child;
}
@@ -259,19 +249,19 @@
/**
* Called when parsing of a new element started.
*/
- public Object newChild(SessionEnterpriseBean parent,
- UnmarshallingContext navigator, String namespaceURI, String localName,
- Attributes attrs)
+ public Object newChild(SessionEnterpriseBean parent, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
Object child = newEjbChild(parent, localName);
- if (child != null) return child;
+ if (child != null)
+ return child;
child = newEjbHasInterceptorsChild(parent, localName);
- if (child != null) return child;
+ if (child != null)
+ return child;
- if(localName.equals("security-role-ref"))
+ if (localName.equals("security-role-ref"))
{
- child = new SecurityRoleRefMetaData();
+ child = new SecurityRoleRefMetaData();
}
else if (localName.equals("security-identity"))
{
@@ -296,18 +286,16 @@
/**
* Called when parsing of a new element started.
*/
- public Object newChild(EntityEnterpriseBean parent,
- UnmarshallingContext navigator, String namespaceURI, String localName,
- Attributes attrs)
+ public Object newChild(EntityEnterpriseBean parent, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
Object child = null;
child = newEjbChild(parent, localName);
if (child == null)
{
- if(localName.equals("security-role-ref"))
+ if (localName.equals("security-role-ref"))
{
- child = new SecurityRoleRefMetaData();
+ child = new SecurityRoleRefMetaData();
}
else if (localName.equals("cmp-field"))
{
@@ -325,9 +313,7 @@
/**
* Called when parsing of a new element started.
*/
- public Object newChild(SecurityIdentity parent,
- UnmarshallingContext navigator, String namespaceURI, String localName,
- Attributes attrs)
+ public Object newChild(SecurityIdentity parent, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
Object child = null;
@@ -346,9 +332,7 @@
/**
* Called when parsing of a new element started.
*/
- public Object newChild(RemoveMethod parent,
- UnmarshallingContext navigator, String namespaceURI, String localName,
- Attributes attrs)
+ public Object newChild(RemoveMethod parent, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
Object child = null;
@@ -364,9 +348,7 @@
/**
* Called when parsing of a new element started.
*/
- public Object newChild(InitMethod parent,
- UnmarshallingContext navigator, String namespaceURI, String localName,
- Attributes attrs)
+ public Object newChild(InitMethod parent, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
Object child = null;
@@ -382,8 +364,7 @@
/**
* Called when a child element with simple content is read for DD.
*/
- public void setValue(RemoveMethod dd, UnmarshallingContext navigator,
- String namespaceURI, String localName, String value)
+ public void setValue(RemoveMethod dd, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (localName.equals("retain-if-exception"))
{
@@ -394,9 +375,7 @@
/**
* Called when parsing of a new element started.
*/
- public Object newChild(Relationships relationships,
- UnmarshallingContext navigator, String namespaceURI, String localName,
- Attributes attrs)
+ public Object newChild(Relationships relationships, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
Object child = null;
@@ -411,8 +390,7 @@
/**
* Called when parsing of a new element started.
*/
- public Object newChild(EjbRelation relation, UnmarshallingContext navigator,
- String namespaceURI, String localName, Attributes attrs)
+ public Object newChild(EjbRelation relation, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
Object child = null;
@@ -427,9 +405,7 @@
/**
* Called when parsing of a new element started.
*/
- public Object newChild(EjbRelationshipRole parent,
- UnmarshallingContext navigator, String namespaceURI, String localName,
- Attributes attrs)
+ public Object newChild(EjbRelationshipRole parent, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
Object child = null;
@@ -449,9 +425,7 @@
return child;
}
- public Object newChild(Interceptors interceptors,
- UnmarshallingContext navigator, String namespaceURI, String localName,
- Attributes attrs)
+ public Object newChild(Interceptors interceptors, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
Object child = null;
@@ -463,9 +437,7 @@
return child;
}
- public Object newChild(Interceptor interceptor,
- UnmarshallingContext navigator, String namespaceURI, String localName,
- Attributes attrs)
+ public Object newChild(Interceptor interceptor, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
Object child = null;
@@ -499,9 +471,7 @@
/**
* Called when parsing of a new element started.
*/
- public Object newChild(AssemblyDescriptor relationships,
- UnmarshallingContext navigator, String namespaceURI, String localName,
- Attributes attrs)
+ public Object newChild(AssemblyDescriptor relationships, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
Object child = null;
@@ -540,9 +510,7 @@
/**
* Called when parsing of a new element started.
*/
- public Object newChild(Inject inject,
- UnmarshallingContext navigator, String namespaceURI, String localName,
- Attributes attrs)
+ public Object newChild(Inject inject, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
Object child = null;
@@ -557,9 +525,7 @@
/**
* Called when parsing of a new element started.
*/
- public Object newChild(MethodPermission permission,
- UnmarshallingContext navigator, String namespaceURI, String localName,
- Attributes attrs)
+ public Object newChild(MethodPermission permission, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
Object child = null;
@@ -578,9 +544,7 @@
/**
* Called when parsing of a new element started.
*/
- public Object newChild(ExcludeList list,
- UnmarshallingContext navigator, String namespaceURI, String localName,
- Attributes attrs)
+ public Object newChild(ExcludeList list, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
Object child = null;
@@ -595,9 +559,7 @@
/**
* Called when parsing of a new element started.
*/
- public Object newChild(InitList list,
- UnmarshallingContext navigator, String namespaceURI, String localName,
- Attributes attrs)
+ public Object newChild(InitList list, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
Object child = null;
@@ -612,9 +574,7 @@
/**
* Called when parsing of a new element started.
*/
- public Object newChild(ContainerTransaction transaction,
- UnmarshallingContext navigator, String namespaceURI, String localName,
- Attributes attrs)
+ public Object newChild(ContainerTransaction transaction, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
Object child = null;
@@ -626,9 +586,7 @@
return child;
}
- public Object newChild(Method method,
- UnmarshallingContext navigator, String namespaceURI, String localName,
- Attributes attrs)
+ public Object newChild(Method method, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
Object child = null;
@@ -640,10 +598,7 @@
return child;
}
-
- public Object newChild(InterceptorBinding binding,
- UnmarshallingContext navigator, String namespaceURI, String localName,
- Attributes attrs)
+ public Object newChild(InterceptorBinding binding, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
Object child = null;
@@ -664,16 +619,13 @@
binding.setHasParameters();
}
-
return child;
}
-
/**
* Called when parsing character is complete.
*/
- public void addChild(MessageDrivenBean parent, ActivationConfig config,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(MessageDrivenBean parent, ActivationConfig config, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.setActivationConfig(config);
}
@@ -681,8 +633,7 @@
/**
* Called when parsing character is complete.
*/
- public void addChild(MessageDrivenBean parent, EjbRef ref,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(MessageDrivenBean parent, EjbRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addEjbRef(ref);
}
@@ -690,8 +641,7 @@
/**
* Called when parsing character is complete.
*/
- public void addChild(MessageDrivenBean parent, EjbLocalRef ref,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(MessageDrivenBean parent, EjbLocalRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addEjbLocalRef(ref);
}
@@ -699,8 +649,7 @@
/**
* Called when parsing character is complete.
*/
- public void addChild(MessageDrivenBean parent, EnvEntry entry,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(MessageDrivenBean parent, EnvEntry entry, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addEnvEntry(entry);
}
@@ -708,8 +657,7 @@
/**
* Called when parsing character is complete.
*/
- public void addChild(MessageDrivenBean parent, ResourceEnvRef envRef,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(MessageDrivenBean parent, ResourceEnvRef envRef, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addResourceEnvRef(envRef);
}
@@ -717,32 +665,27 @@
/**
* Called when parsing character is complete.
*/
- public void addChild(MessageDrivenBean parent, ResourceRef envRef,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(MessageDrivenBean parent, ResourceRef envRef, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addResourceRef(envRef);
}
- public void addChild(MessageDrivenBean parent, ServiceRef envRef,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(MessageDrivenBean parent, ServiceRef envRef, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addServiceRef(envRef);
}
-
- public void addChild(MessageDrivenBean parent, MessageDestinationRef ref,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+
+ public void addChild(MessageDrivenBean parent, MessageDestinationRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addMessageDestinationRef(ref);
}
- public void addChild(ActivationConfig parent, NameValuePair property,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(ActivationConfig parent, NameValuePair property, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addActivationConfigProperty(property);
}
- public void addChild(EjbJarDD parent, EnterpriseBeans ejbs,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(EjbJarDD parent, EnterpriseBeans ejbs, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.setEnterpriseBeans(ejbs);
}
@@ -750,44 +693,37 @@
/**
* Called when parsing character is complete.
*/
- public void addChild(EnterpriseBeans parent, EnterpriseBean ejb,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(EnterpriseBeans parent, EnterpriseBean ejb, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addEnterpriseBean(ejb);
}
- public void addChild(SessionEnterpriseBean parent, SecurityRoleRefMetaData child,
- UnmarshallingContext navigator, String namespaceURI, String localName)
- {
+ public void addChild(SessionEnterpriseBean parent, SecurityRoleRefMetaData child, UnmarshallingContext navigator, String namespaceURI, String localName)
+ {
parent.addSecurityRoleReference(child);
}
-
- public void addChild(SessionEnterpriseBean parent, SecurityIdentity si,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+
+ public void addChild(SessionEnterpriseBean parent, SecurityIdentity si, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.setSecurityIdentity(si);
}
- public void addChild(SecurityIdentity parent, RunAs runAs,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(SecurityIdentity parent, RunAs runAs, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.setRunAs(runAs);
}
- public void addChild(SessionEnterpriseBean parent, EjbLocalRef ref,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(SessionEnterpriseBean parent, EjbLocalRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addEjbLocalRef(ref);
}
- public void addChild(SessionEnterpriseBean parent, EjbRef ref,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(SessionEnterpriseBean parent, EjbRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addEjbRef(ref);
}
- public void addChild(SessionEnterpriseBean parent, PersistenceContextRef ref,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(SessionEnterpriseBean parent, PersistenceContextRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addPersistenceContextRef(ref);
}
@@ -795,8 +731,7 @@
/**
* Called when parsing character is complete.
*/
- public void addChild(SessionEnterpriseBean parent, PersistenceUnitRef ref,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(SessionEnterpriseBean parent, PersistenceUnitRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addPersistenceUnitRef(ref);
}
@@ -804,8 +739,7 @@
/**
* Called when parsing character is complete.
*/
- public void addChild(SessionEnterpriseBean parent, MessageDestinationRef ref,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(SessionEnterpriseBean parent, MessageDestinationRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addMessageDestinationRef(ref);
}
@@ -813,8 +747,7 @@
/**
* Called when parsing character is complete.
*/
- public void addChild(SessionEnterpriseBean parent, EnvEntry entry,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(SessionEnterpriseBean parent, EnvEntry entry, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addEnvEntry(entry);
}
@@ -822,8 +755,7 @@
/**
* Called when parsing character is complete.
*/
- public void addChild(SessionEnterpriseBean parent, ResourceEnvRef envRef,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(SessionEnterpriseBean parent, ResourceEnvRef envRef, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addResourceEnvRef(envRef);
}
@@ -831,8 +763,7 @@
/**
* Called when parsing character is complete.
*/
- public void addChild(SessionEnterpriseBean parent, ResourceRef envRef,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(SessionEnterpriseBean parent, ResourceRef envRef, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addResourceRef(envRef);
}
@@ -840,8 +771,7 @@
/**
* Called when parsing character is complete.
*/
- public void addChild(SessionEnterpriseBean parent, ServiceRef envRef,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(SessionEnterpriseBean parent, ServiceRef envRef, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addServiceRef(envRef);
}
@@ -849,8 +779,7 @@
/**
* Called when parsing character is complete.
*/
- public void addChild(SessionEnterpriseBean parent, Method method,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(SessionEnterpriseBean parent, Method method, UnmarshallingContext navigator, String namespaceURI, String localName)
{
if (localName.equals("around-invoke"))
{
@@ -877,23 +806,20 @@
/**
* Called when parsing character is complete.
*/
- public void addChild(EntityEnterpriseBean parent, CmpField field,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(EntityEnterpriseBean parent, CmpField field, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addCmpField(field);
}
-
- public void addChild(EntityEnterpriseBean parent, SecurityRoleRefMetaData child,
- UnmarshallingContext navigator, String namespaceURI, String localName)
- {
+
+ public void addChild(EntityEnterpriseBean parent, SecurityRoleRefMetaData child, UnmarshallingContext navigator, String namespaceURI, String localName)
+ {
parent.addSecurityRoleReference(child);
}
/**
* Called when parsing character is complete.
*/
- public void addChild(EntityEnterpriseBean parent, Query query,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(EntityEnterpriseBean parent, Query query, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addQuery(query);
}
@@ -901,8 +827,7 @@
/**
* Called when parsing character is complete.
*/
- public void addChild(EjbJarDD parent, Relationships relationships,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(EjbJarDD parent, Relationships relationships, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.setRelationships(relationships);
}
@@ -910,8 +835,7 @@
/**
* Called when parsing character is complete.
*/
- public void addChild(Relationships parent, EjbRelation relation,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(Relationships parent, EjbRelation relation, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addEjbRelation(relation);
}
@@ -919,8 +843,7 @@
/**
* Called when parsing character is complete.
*/
- public void addChild(EjbRelation parent, EjbRelationshipRole role,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(EjbRelation parent, EjbRelationshipRole role, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addEjbRelationshipRole(role);
}
@@ -928,9 +851,7 @@
/**
* Called when parsing character is complete.
*/
- public void addChild(EjbRelationshipRole parent,
- RelationshipRoleSource source, UnmarshallingContext navigator,
- String namespaceURI, String localName)
+ public void addChild(EjbRelationshipRole parent, RelationshipRoleSource source, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.setRelationshipRoleSource(source);
}
@@ -938,8 +859,7 @@
/**
* Called when parsing character is complete.
*/
- public void addChild(EjbRelationshipRole parent, CmrField field,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(EjbRelationshipRole parent, CmrField field, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.setCmrField(field);
}
@@ -947,8 +867,7 @@
/**
* Called when parsing character is complete.
*/
- public void addChild(EjbJarDD parent, AssemblyDescriptor descriptor,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(EjbJarDD parent, AssemblyDescriptor descriptor, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.setAssemblyDescriptor(descriptor);
}
@@ -956,8 +875,7 @@
/**
* Called when parsing character is complete.
*/
- public void addChild(AssemblyDescriptor parent, SecurityRole role,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(AssemblyDescriptor parent, SecurityRole role, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addSecurityRole(role);
}
@@ -965,8 +883,7 @@
/**
* Called when parsing character is complete.
*/
- public void addChild(AssemblyDescriptor parent, MethodPermission permission,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(AssemblyDescriptor parent, MethodPermission permission, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addMethodPermission(permission);
}
@@ -974,8 +891,7 @@
/**
* Called when parsing character is complete.
*/
- public void addChild(AssemblyDescriptor parent, ExcludeList list,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(AssemblyDescriptor parent, ExcludeList list, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.setExcludeList(list);
}
@@ -983,8 +899,7 @@
/**
* Called when parsing character is complete.
*/
- public void addChild(AssemblyDescriptor parent, ApplicationException exception,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(AssemblyDescriptor parent, ApplicationException exception, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addApplicationException(exception);
}
@@ -992,8 +907,7 @@
/**
* Called when parsing character is complete.
*/
- public void addChild(AssemblyDescriptor parent, InitList list,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(AssemblyDescriptor parent, InitList list, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.setInitList(list);
}
@@ -1001,8 +915,7 @@
/**
* Called when parsing character is complete.
*/
- public void addChild(AssemblyDescriptor parent, Inject inject,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(AssemblyDescriptor parent, Inject inject, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addInject(inject);
}
@@ -1010,8 +923,7 @@
/**
* Called when parsing character is complete.
*/
- public void addChild(AssemblyDescriptor parent, InterceptorBinding binding,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(AssemblyDescriptor parent, InterceptorBinding binding, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addInterceptorBinding(binding);
}
@@ -1019,8 +931,7 @@
/**
* Called when parsing character is complete.
*/
- public void addChild(ExcludeList parent, Method method,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(ExcludeList parent, Method method, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addMethod(method);
}
@@ -1028,8 +939,7 @@
/**
* Called when parsing character is complete.
*/
- public void addChild(InitList parent, Method method,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(InitList parent, Method method, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addMethod(method);
}
@@ -1037,8 +947,7 @@
/**
* Called when parsing character is complete.
*/
- public void addChild(MethodPermission parent, Method method,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(MethodPermission parent, Method method, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addMethod(method);
}
@@ -1046,20 +955,17 @@
/**
* Called when parsing character is complete.
*/
- public void addChild(Inject parent, Method method,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(Inject parent, Method method, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addMethod(method);
}
- public void addChild(EjbJarDD parent, Interceptors interceptors,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(EjbJarDD parent, Interceptors interceptors, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.setInterceptors(interceptors);
}
- public void addChild(Interceptors parent, Interceptor interceptor,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(Interceptors parent, Interceptor interceptor, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addInterceptor(interceptor);
}
@@ -1067,8 +973,7 @@
/**
* Called when parsing character is complete.
*/
- public void addChild(Interceptor parent, EjbLocalRef ref,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(Interceptor parent, EjbLocalRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addEjbLocalRef(ref);
}
@@ -1076,8 +981,7 @@
/**
* Called when parsing character is complete.
*/
- public void addChild(Interceptor parent, EjbRef ref,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(Interceptor parent, EjbRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addEjbRef(ref);
}
@@ -1085,8 +989,7 @@
/**
* Called when parsing character is complete.
*/
- public void addChild(Interceptor parent, PersistenceContextRef ref,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(Interceptor parent, PersistenceContextRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addPersistenceContextRef(ref);
}
@@ -1094,8 +997,7 @@
/**
* Called when parsing character is complete.
*/
- public void addChild(Interceptor parent, PersistenceUnitRef ref,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(Interceptor parent, PersistenceUnitRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addPersistenceUnitRef(ref);
}
@@ -1103,8 +1005,7 @@
/**
* Called when parsing character is complete.
*/
- public void addChild(Interceptor parent, MessageDestinationRef ref,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(Interceptor parent, MessageDestinationRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addMessageDestinationRef(ref);
}
@@ -1112,8 +1013,7 @@
/**
* Called when parsing character is complete.
*/
- public void addChild(Interceptor parent, EnvEntry entry,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(Interceptor parent, EnvEntry entry, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addEnvEntry(entry);
}
@@ -1121,8 +1021,7 @@
/**
* Called when parsing character is complete.
*/
- public void addChild(Interceptor parent, ResourceEnvRef ref,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(Interceptor parent, ResourceEnvRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addResourceEnvRef(ref);
}
@@ -1130,8 +1029,7 @@
/**
* Called when parsing character is complete.
*/
- public void addChild(Interceptor parent, ResourceRef ref,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(Interceptor parent, ResourceRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addResourceRef(ref);
}
@@ -1139,14 +1037,12 @@
/**
* Called when parsing character is complete.
*/
- public void addChild(Interceptor parent, ServiceRef ref,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(Interceptor parent, ServiceRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addServiceRef(ref);
}
- public void addChild(Interceptor parent, Method method,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(Interceptor parent, Method method, UnmarshallingContext navigator, String namespaceURI, String localName)
{
if (localName.equals("around-invoke"))
{
@@ -1173,9 +1069,7 @@
/**
* Called when parsing character is complete.
*/
- public void addChild(InterceptorBinding parent,
- InterceptorOrder order, UnmarshallingContext navigator,
- String namespaceURI, String localName)
+ public void addChild(InterceptorBinding parent, InterceptorOrder order, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.setOrderedInterceptorClasses(order);
}
@@ -1183,9 +1077,7 @@
/**
* Called when parsing character is complete.
*/
- public void addChild(InterceptorBinding parent,
- ExcludeDefaultInterceptors exclude, UnmarshallingContext navigator,
- String namespaceURI, String localName)
+ public void addChild(InterceptorBinding parent, ExcludeDefaultInterceptors exclude, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.setExcludeDefaultInterceptors(true);
}
@@ -1193,9 +1085,7 @@
/**
* Called when parsing character is complete.
*/
- public void addChild(InterceptorBinding parent,
- ExcludeClassInterceptors exclude, UnmarshallingContext navigator,
- String namespaceURI, String localName)
+ public void addChild(InterceptorBinding parent, ExcludeClassInterceptors exclude, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.setExcludeClassInterceptors(true);
}
@@ -1203,8 +1093,7 @@
/**
* Called when parsing character is complete.
*/
- public void addChild(ContainerTransaction parent, Method method,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(ContainerTransaction parent, Method method, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.setMethod(method);
}
@@ -1212,8 +1101,7 @@
/**
* Called when parsing character is complete.
*/
- public void addChild(MessageDrivenBean parent, MessageDrivenDestination destination,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(MessageDrivenBean parent, MessageDrivenDestination destination, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.setMessageDrivenDestination(destination);
}
@@ -1221,8 +1109,7 @@
/**
* Called when parsing character is complete.
*/
- public void addChild(MessageDrivenBean parent, Method method,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(MessageDrivenBean parent, Method method, UnmarshallingContext navigator, String namespaceURI, String localName)
{
if (localName.equals("around-invoke"))
{
@@ -1241,9 +1128,7 @@
/**
* Called when parsing character is complete.
*/
- public void addChild(AssemblyDescriptor parent,
- ContainerTransaction transaction, UnmarshallingContext navigator,
- String namespaceURI, String localName)
+ public void addChild(AssemblyDescriptor parent, ContainerTransaction transaction, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addContainerTransaction(transaction);
}
@@ -1251,8 +1136,7 @@
/**
* Called when a child element with simple content is read for DD.
*/
- public void setValue(EjbJarDD dd, UnmarshallingContext navigator,
- String namespaceURI, String localName, String value)
+ public void setValue(EjbJarDD dd, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (localName.equals("display-name"))
{
@@ -1263,8 +1147,7 @@
/**
* Called when a child element with simple content is read for DD.
*/
- public void setValue(NameValuePair property, UnmarshallingContext navigator,
- String namespaceURI, String localName, String value)
+ public void setValue(NameValuePair property, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (localName.equals("activation-config-property-name"))
{
@@ -1279,8 +1162,7 @@
/**
* Called when a child element with simple content is read for DD.
*/
- private boolean isEjbParentName(EnterpriseBean ejb, String localName,
- String value)
+ private boolean isEjbParentName(EnterpriseBean ejb, String localName, String value)
{
if (localName.equals("ejb-name"))
{
@@ -1319,9 +1201,7 @@
/**
* Called when a child element with simple content is read for DD.
*/
- public void setValue(MessageDrivenBean ejb,
- UnmarshallingContext navigator, String namespaceURI, String localName,
- String value)
+ public void setValue(MessageDrivenBean ejb, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (!isEjbParentName(ejb, localName, value))
{
@@ -1354,9 +1234,7 @@
/**
* Called when a child element with simple content is read for DD.
*/
- public void setValue(MessageDrivenDestination destination,
- UnmarshallingContext navigator, String namespaceURI, String localName,
- String value)
+ public void setValue(MessageDrivenDestination destination, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (localName.equals("destination-type"))
{
@@ -1371,9 +1249,7 @@
/**
* Called when a child element with simple content is read for DD.
*/
- public void setValue(SessionEnterpriseBean ejb,
- UnmarshallingContext navigator, String namespaceURI, String localName,
- String value)
+ public void setValue(SessionEnterpriseBean ejb, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (!isEjbParentName(ejb, localName, value))
{
@@ -1391,9 +1267,7 @@
/**
* Called when a child element with simple content is read for DD.
*/
- public void setValue(ApplicationException exception,
- UnmarshallingContext navigator, String namespaceURI, String localName,
- String value)
+ public void setValue(ApplicationException exception, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (localName.equals("exception-class"))
{
@@ -1408,9 +1282,7 @@
/**
* Called when a child element with simple content is read for DD.
*/
- public void setValue(EntityEnterpriseBean ejb,
- UnmarshallingContext navigator, String namespaceURI, String localName,
- String value)
+ public void setValue(EntityEnterpriseBean ejb, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (!isEjbParentName(ejb, localName, value))
{
@@ -1424,25 +1296,22 @@
/**
* <!ELEMENT security-role-ref (rolename,role-link))>
*/
- public void setValue(SecurityRoleRefMetaData parent,
- UnmarshallingContext navigator, String namespaceURI, String localName,
- String value)
+ public void setValue(SecurityRoleRefMetaData parent, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
- if(localName.equals("role-name"))
+ if (localName.equals("role-name"))
{
- parent.setName(value);
+ parent.setName(value);
}
- else if(localName.equals("role-link"))
+ else if (localName.equals("role-link"))
{
- parent.setLink(value);
+ parent.setLink(value);
}
}
-
+
/**
* Called when a child element with simple content is read for DD.
*/
- public void setValue(SecurityIdentity si, UnmarshallingContext navigator,
- String namespaceURI, String localName, String value)
+ public void setValue(SecurityIdentity si, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (localName.equals("use-caller-identity"))
{
@@ -1450,8 +1319,7 @@
}
}
- public void setValue(Interceptor interceptor, UnmarshallingContext navigator,
- String namespaceURI, String localName, String value)
+ public void setValue(Interceptor interceptor, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (localName.equals("interceptor-class"))
{
@@ -1462,8 +1330,7 @@
/**
* Called when a child element with simple content is read for DD.
*/
- public void setValue(EjbRelation relation, UnmarshallingContext navigator,
- String namespaceURI, String localName, String value)
+ public void setValue(EjbRelation relation, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (localName.equals("ejb-relation-name"))
{
@@ -1474,9 +1341,7 @@
/**
* Called when a child element with simple content is read for DD.
*/
- public void setValue(EjbRelationshipRole role,
- UnmarshallingContext navigator, String namespaceURI, String localName,
- String value)
+ public void setValue(EjbRelationshipRole role, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (localName.equals("ejb-relationship-role-name"))
{
@@ -1491,9 +1356,7 @@
/**
* Called when a child element with simple content is read for DD.
*/
- public void setValue(RelationshipRoleSource source,
- UnmarshallingContext navigator, String namespaceURI, String localName,
- String value)
+ public void setValue(RelationshipRoleSource source, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (localName.equals("ejb-name"))
{
@@ -1504,8 +1367,7 @@
/**
* Called when a child element with simple content is read for DD.
*/
- public void setValue(CmrField field, UnmarshallingContext navigator,
- String namespaceURI, String localName, String value)
+ public void setValue(CmrField field, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (localName.equals("cmr-field-name"))
{
@@ -1520,8 +1382,7 @@
/**
* Called when a child element with simple content is read for DD.
*/
- public void setValue(SecurityRole role, UnmarshallingContext navigator,
- String namespaceURI, String localName, String value)
+ public void setValue(SecurityRole role, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (localName.equals("role-name"))
{
@@ -1532,9 +1393,7 @@
/**
* Called when a child element with simple content is read for DD.
*/
- public void setValue(MethodPermission permission,
- UnmarshallingContext navigator, String namespaceURI, String localName,
- String value)
+ public void setValue(MethodPermission permission, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (localName.equals("role-name"))
{
@@ -1549,9 +1408,7 @@
/**
* Called when a child element with simple content is read for DD.
*/
- public void setValue(ContainerTransaction transaction,
- UnmarshallingContext navigator, String namespaceURI, String localName,
- String value)
+ public void setValue(ContainerTransaction transaction, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (localName.equals("trans-attribute"))
{
@@ -1562,8 +1419,7 @@
/**
* Called when a child element with simple content is read for DD.
*/
- public void setValue(Method method, UnmarshallingContext navigator,
- String namespaceURI, String localName, String value)
+ public void setValue(Method method, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (localName.equals("ejb-name"))
{
@@ -1586,8 +1442,7 @@
/**
* Called when a child element with simple content is read for DD.
*/
- public void setValue(Inject inject, UnmarshallingContext navigator,
- String namespaceURI, String localName, String value)
+ public void setValue(Inject inject, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (localName.equals("jndi-name"))
{
@@ -1595,8 +1450,7 @@
}
}
- public void setValue(InterceptorBinding binding, UnmarshallingContext navigator,
- String namespaceURI, String localName, String value)
+ public void setValue(InterceptorBinding binding, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (localName.equals("ejb-name"))
{
@@ -1624,34 +1478,34 @@
}
}
- public void setValue(InterceptorOrder order, UnmarshallingContext navigator,
- String namespaceURI, String localName, String value)
+ public void setValue(InterceptorOrder order, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (localName.equals("interceptor-class"))
{
order.addInterceptorClass(getValue(localName, value));
}
}
-
+
protected String getValue(String name, String value)
{
if (value.startsWith("${") && value.endsWith("}"))
{
try
{
- String propertyName = value.substring(2, value.length()-1);
+ String propertyName = value.substring(2, value.length() - 1);
ObjectName propertyServiceON = new ObjectName("jboss:type=Service,name=SystemProperties");
KernelAbstraction kernelAbstraction = KernelAbstractionFactory.getInstance();
- String propertyValue = (String)kernelAbstraction.invoke(propertyServiceON, "get", new Object[]{propertyName}, new String[]{"java.lang.String"});
+ String propertyValue = (String)kernelAbstraction.invoke(propertyServiceON, "get", new Object[] { propertyName }, new String[] { "java.lang.String" });
log.debug("Replaced ejb-jar.xml element " + name + " with value " + propertyValue);
return propertyValue;
}
catch (Exception e)
{
- log.warn("Unable to look up property service for ejb-jar.xml element " + name + " with value " + value + ". Caused by " + e.getClass() + " " + e.getMessage());
+ log.warn("Unable to look up property service for ejb-jar.xml element " + name + " with value " + value + ". Caused by " + e.getClass() + " "
+ + e.getMessage());
}
}
-
+
return value;
}
Modified: trunk/ejb3/src/main/org/jboss/ejb3/metamodel/JBossClientDDObjectFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/metamodel/JBossClientDDObjectFactory.java 2007-01-17 22:31:51 UTC (rev 59719)
+++ trunk/ejb3/src/main/org/jboss/ejb3/metamodel/JBossClientDDObjectFactory.java 2007-01-17 23:05:52 UTC (rev 59720)
@@ -1,24 +1,24 @@
/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
package org.jboss.ejb3.metamodel;
import java.io.IOException;
@@ -49,47 +49,47 @@
public class JBossClientDDObjectFactory extends DDObjectFactory
{
private static final Logger log = Logger.getLogger(JBossClientDDObjectFactory.class);
-
+
private ApplicationClientDD dd;
-
- public static ApplicationClientDD parse(URL ddResource, ApplicationClientDD dd)
- throws JBossXBException, IOException
+
+ public static ApplicationClientDD parse(URL ddResource, ApplicationClientDD dd) throws JBossXBException, IOException
{
// TODO: how to properly fix this
- if(dd == null)
+ if (dd == null)
dd = new ApplicationClientDD();
-
- if(ddResource == null)
+
+ if (ddResource == null)
return dd;
-
+
log.debug("found jboss-client.xml " + ddResource);
-
+
JBossClientDDObjectFactory factory = new JBossClientDDObjectFactory(dd);
UnmarshallerFactory unmarshallerFactory = UnmarshallerFactory.newInstance();
- unmarshallerFactory.setFeature(Unmarshaller.SCHEMA_VALIDATION, Boolean.TRUE);
Unmarshaller unmarshaller = unmarshallerFactory.newUnmarshaller();
- JBossEntityResolver entityResolver = new JBossEntityResolver();
- unmarshaller.setEntityResolver(entityResolver);
+ unmarshaller.setEntityResolver(new JBossEntityResolver());
+ unmarshaller.setNamespaceAware(true);
+ unmarshaller.setSchemaValidation(true);
+ unmarshaller.setValidation(true);
- dd = (ApplicationClientDD) unmarshaller.unmarshal(ddResource.openStream(), factory, null);
-
+ dd = (ApplicationClientDD)unmarshaller.unmarshal(ddResource.openStream(), factory, null);
+
return dd;
}
-
+
public JBossClientDDObjectFactory(ApplicationClientDD dd)
{
// JBossXB will otherwise fail later on
- if(dd == null)
+ if (dd == null)
throw new NullPointerException("dd is null");
-
+
this.dd = dd;
}
-
+
public void addChild(ApplicationClientDD parent, EjbRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
{
dd.updateEjbRef(ref);
}
-
+
public void addChild(ApplicationClientDD parent, MessageDestinationRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
{
dd.updateMessageDestinationRef(ref);
@@ -104,12 +104,12 @@
{
dd.updateResourceEnvRef(envRef);
}
-
+
public void addChild(ApplicationClientDD parent, ResourceRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
{
dd.updateResourceRef(ref);
}
-
+
public Object completeRoot(Object root, UnmarshallingContext navigator, String uri, String name)
{
return root;
@@ -118,16 +118,16 @@
public Object newChild(ApplicationClientDD dd, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
Object child = null;
-
+
child = newEnvRefGroupChild(localName);
- if(child != null)
+ if (child != null)
return child;
-
+
// space for more
-
+
return child;
}
-
+
public Object newRoot(Object root, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
return dd;
@@ -135,9 +135,9 @@
public void setValue(ApplicationClientDD dd, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
- if(localName.equals("jndi-name"))
+ if (localName.equals("jndi-name"))
dd.setJndiName(value);
- else if(localName.equals("depends"))
+ else if (localName.equals("depends"))
dd.addDependency(value);
}
}
Modified: trunk/ejb3/src/main/org/jboss/ejb3/metamodel/JBossDDObjectFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/metamodel/JBossDDObjectFactory.java 2007-01-17 22:31:51 UTC (rev 59719)
+++ trunk/ejb3/src/main/org/jboss/ejb3/metamodel/JBossDDObjectFactory.java 2007-01-17 23:05:52 UTC (rev 59720)
@@ -1,28 +1,28 @@
/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
package org.jboss.ejb3.metamodel;
import java.io.IOException;
-import java.net.URL;
+import java.net.URL;
import javax.management.ObjectName;
@@ -40,13 +40,13 @@
import org.jboss.metadata.SecurityRoleMetaData;
import org.jboss.metamodel.descriptor.DDObjectFactory;
import org.jboss.metamodel.descriptor.EjbLocalRef;
-import org.jboss.metamodel.descriptor.EjbRef;
+import org.jboss.metamodel.descriptor.EjbRef;
import org.jboss.metamodel.descriptor.InjectionTarget;
import org.jboss.metamodel.descriptor.JndiRef;
import org.jboss.metamodel.descriptor.MessageDestinationRef;
import org.jboss.metamodel.descriptor.NameValuePair;
import org.jboss.metamodel.descriptor.ResourceEnvRef;
-import org.jboss.metamodel.descriptor.ResourceRef;
+import org.jboss.metamodel.descriptor.ResourceRef;
import org.jboss.metamodel.descriptor.ServiceRef;
import org.jboss.metamodel.descriptor.ServiceRef;
@@ -59,36 +59,34 @@
*/
public class JBossDDObjectFactory extends DDObjectFactory
{
- private static final Logger log = Logger
- .getLogger(JBossDDObjectFactory.class);
+ private static final Logger log = Logger.getLogger(JBossDDObjectFactory.class);
private EjbJarDD dd;
private Class ejbClass;
-
- public static EjbJarDD parse(URL ddResource, EjbJarDD dd)
- throws JBossXBException, IOException
+
+ public static EjbJarDD parse(URL ddResource, EjbJarDD dd) throws JBossXBException, IOException
{
ObjectModelFactory factory = null;
Unmarshaller unmarshaller = null;
-
+
if (ddResource != null)
{
log.debug("found jboss.xml " + ddResource);
-
+
if (dd == null)
dd = new EjbJarDD();
-
+
factory = new JBossDDObjectFactory(dd);
UnmarshallerFactory unmarshallerFactory = UnmarshallerFactory.newInstance();
- unmarshallerFactory.setFeature(Unmarshaller.SCHEMA_VALIDATION, Boolean.TRUE);
unmarshaller = unmarshallerFactory.newUnmarshaller();
- JBossEntityResolver entityResolver = new JBossEntityResolver();
- unmarshaller.setEntityResolver(entityResolver);
-
- dd = (EjbJarDD) unmarshaller.unmarshal(ddResource.openStream(),
- factory, null);
+ unmarshaller.setEntityResolver(new JBossEntityResolver());
+ unmarshaller.setNamespaceAware(true);
+ unmarshaller.setSchemaValidation(true);
+ unmarshaller.setValidation(true);
+
+ dd = (EjbJarDD)unmarshaller.unmarshal(ddResource.openStream(), factory, null);
}
-
+
return dd;
}
@@ -101,14 +99,12 @@
/**
* Return the root.
*/
- public Object newRoot(Object root, UnmarshallingContext navigator,
- String namespaceURI, String localName, Attributes attrs)
+ public Object newRoot(Object root, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
return dd;
}
- public Object completeRoot(Object root, UnmarshallingContext ctx,
- String uri, String name)
+ public Object completeRoot(Object root, UnmarshallingContext ctx, String uri, String name)
{
return root;
}
@@ -118,8 +114,7 @@
/**
* Called when parsing of a new element started.
*/
- public Object newChild(EjbJarDD dd, UnmarshallingContext navigator,
- String namespaceURI, String localName, Attributes attrs)
+ public Object newChild(EjbJarDD dd, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
Object child = null;
@@ -148,18 +143,17 @@
return child;
}
-
+
/**
* Called when parsing of a new element started.
*/
- public Object newChild(Consumer consumer, UnmarshallingContext navigator,
- String namespaceURI, String localName, Attributes attrs)
+ public Object newChild(Consumer consumer, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
Object child = null;
-
+
if ((child = this.newEnvRefGroupChild(localName)) != null)
- return child;
-
+ return child;
+
if (localName.equals("current-message"))
{
child = new CurrentMessage();
@@ -192,21 +186,20 @@
{
child = new PoolConfig();
}
-
+
return child;
}
-
+
/**
* Called when parsing of a new element started.
*/
- public Object newChild(Service service, UnmarshallingContext navigator,
- String namespaceURI, String localName, Attributes attrs)
+ public Object newChild(Service service, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
Object child = null;
-
+
if ((child = this.newEnvRefGroupChild(localName)) != null)
- return child;
-
+ return child;
+
if (localName.equals("ignore-dependency"))
{
child = new InjectionTarget();
@@ -222,15 +215,14 @@
return child;
}
-
+
/**
* Called when parsing of a new element started.
*/
- public Object newChild(CurrentMessage message, UnmarshallingContext navigator,
- String namespaceURI, String localName, Attributes attrs)
+ public Object newChild(CurrentMessage message, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
Object child = null;
-
+
if (localName.equals("method"))
{
child = new Method();
@@ -238,15 +230,14 @@
return child;
}
-
+
/**
* Called when parsing of a new element started.
*/
- public Object newChild(MessageProperties properties, UnmarshallingContext navigator,
- String namespaceURI, String localName, Attributes attrs)
+ public Object newChild(MessageProperties properties, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
Object child = null;
-
+
if (localName.equals("method"))
{
child = new Method();
@@ -254,15 +245,14 @@
return child;
}
-
+
/**
* Called when parsing of a new element started.
*/
- public Object newChild(MethodAttributes attributes, UnmarshallingContext navigator,
- String namespaceURI, String localName, Attributes attrs)
+ public Object newChild(MethodAttributes attributes, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
Object child = null;
-
+
if (localName.equals("method"))
{
child = new Method();
@@ -270,13 +260,11 @@
return child;
}
-
+
/**
* Called when parsing of a new element started.
*/
- public Object newChild(AssemblyDescriptor descriptor,
- UnmarshallingContext navigator, String namespaceURI, String localName,
- Attributes attrs)
+ public Object newChild(AssemblyDescriptor descriptor, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
Object child = null;
@@ -285,8 +273,8 @@
child = new MessageDestination();
}
if (localName.equals("security-role"))
- {
- child = new SecurityRoleMetaData("dummy_to_be_replaced_in_setValue");
+ {
+ child = new SecurityRoleMetaData("dummy_to_be_replaced_in_setValue");
}
return child;
@@ -295,8 +283,7 @@
/**
* Called when parsing of a new element started.
*/
- public Object newChild(EnterpriseBeans ejbs, UnmarshallingContext navigator,
- String namespaceURI, String localName, Attributes attrs)
+ public Object newChild(EnterpriseBeans ejbs, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
Object child = null;
@@ -304,7 +291,7 @@
{
return child;
}
-
+
if (localName.equals("session"))
{
ejbClass = SessionEnterpriseBean.class;
@@ -355,30 +342,26 @@
{
child = new ActivationConfig();
}
-
+
return child;
}
-
- public Object newChild(ActivationConfig parent,
- UnmarshallingContext navigator, String namespaceURI, String localName,
- Attributes attrs)
+
+ public Object newChild(ActivationConfig parent, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
Object child = null;
- if (localName.equals("default-activation-config-property"))
- {
+ if (localName.equals("default-activation-config-property"))
+ {
child = new NameValuePair();
- }
+ }
return child;
}
-
- public Object newChild(XmlAnnotation parent,
- UnmarshallingContext navigator, String namespaceURI, String localName,
- Attributes attrs)
+
+ public Object newChild(XmlAnnotation parent, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
Object child = null;
-
+
if (localName.equals("injection-target"))
{
child = new InjectionTarget();
@@ -387,283 +370,246 @@
{
child = new NameValuePair();
}
-
+
return child;
}
-
- public void addChild(XmlAnnotation parent, NameValuePair property,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+
+ public void addChild(XmlAnnotation parent, NameValuePair property, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addProperty(property);
}
-
- public void addChild(XmlAnnotation parent, InjectionTarget injectionTarget,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+
+ public void addChild(XmlAnnotation parent, InjectionTarget injectionTarget, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.setInjectionTarget(injectionTarget);
}
-
- public void addChild(EnterpriseBeans parent, ActivationConfig config,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+
+ public void addChild(EnterpriseBeans parent, ActivationConfig config, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.setDefaultActivationConfig(config);
}
-
- public void addChild(ActivationConfig parent, NameValuePair property,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+
+ public void addChild(ActivationConfig parent, NameValuePair property, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addActivationConfigProperty(property);
}
-
- public void addChild(Consumer parent, Producer producer,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+
+ public void addChild(Consumer parent, Producer producer, UnmarshallingContext navigator, String namespaceURI, String localName)
{
if (producer.isLocal())
parent.addLocalProducer(producer);
- else
- parent.addProducer(producer);
+ else parent.addProducer(producer);
}
-
- public void addChild(Consumer parent, RemoteBinding binding,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+
+ public void addChild(Consumer parent, RemoteBinding binding, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addRemoteBinding(binding);
}
-
- public void addChild(AssemblyDescriptor parent, MessageDestination destination,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+
+ public void addChild(AssemblyDescriptor parent, MessageDestination destination, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addMessageDestination(destination);
}
-
- public void addChild(AssemblyDescriptor parent, SecurityRoleMetaData srm,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+
+ public void addChild(AssemblyDescriptor parent, SecurityRoleMetaData srm, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addSecurityRoleMetaData(srm);
}
-
-
+
/**
* Called when parsing character is complete.
*/
- public void addChild(EnterpriseBeans parent, CacheConfig config,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(EnterpriseBeans parent, CacheConfig config, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.setCacheConfig(config);
}
-
+
/**
* Called when parsing character is complete.
*/
- public void addChild(EnterpriseBeans parent, PoolConfig config,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(EnterpriseBeans parent, PoolConfig config, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.setPoolConfig(config);
}
-
+
/**
* Called when parsing character is complete.
*/
- public void addChild(EnterpriseBeans parent, MethodAttributes attributes,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(EnterpriseBeans parent, MethodAttributes attributes, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.setMethodAttributes(attributes);
}
-
- public void addChild(EnterpriseBeans parent, RemoteBinding binding,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+
+ public void addChild(EnterpriseBeans parent, RemoteBinding binding, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addRemoteBinding(binding);
}
-
- public void addChild(EnterpriseBeans parent, InjectionTarget ignoreDependency,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+
+ public void addChild(EnterpriseBeans parent, InjectionTarget ignoreDependency, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addIgnoreDependency(ignoreDependency);
}
-
- public void addChild(EnterpriseBeans parent, XmlAnnotation xmlAnnotation,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+
+ public void addChild(EnterpriseBeans parent, XmlAnnotation xmlAnnotation, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addXmlAnnotation(xmlAnnotation);
}
-
- public void addChild(MethodAttributes parent, Method method,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+
+ public void addChild(MethodAttributes parent, Method method, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addMethod(method);
}
-
- public void addChild(Consumer parent, CurrentMessage message,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+
+ public void addChild(Consumer parent, CurrentMessage message, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.setCurrentMessage(message);
}
-
- public void addChild(Consumer parent, PoolConfig config,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+
+ public void addChild(Consumer parent, PoolConfig config, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.setPoolConfig(config);
}
-
+
/**
* Called when parsing character is complete.
*/
- public void addChild(Consumer parent, MessageProperties message,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(Consumer parent, MessageProperties message, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.setMessageProperties(message);
}
-
+
/**
* Called when parsing character is complete.
*/
- public void addChild(CurrentMessage parent, Method method,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(CurrentMessage parent, Method method, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addMethod(method);
}
-
+
/**
* Called when parsing character is complete.
*/
- public void addChild(MessageProperties parent, Method method,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(MessageProperties parent, Method method, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addMethod(method);
}
-
+
/**
* Called when parsing character is complete.
*/
- public void addChild(EnterpriseBeans parent, Service service,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(EnterpriseBeans parent, Service service, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addEnterpriseBean(service);
}
-
+
/**
* Called when parsing character is complete.
*/
- public void addChild(Service parent, EjbRef ref,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(Service parent, EjbRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addEjbRef(ref);
}
-
+
/**
* Called when parsing character is complete.
*/
- public void addChild(Service parent, RemoteBinding binding,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(Service parent, RemoteBinding binding, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addRemoteBinding(binding);
}
-
+
/**
* Called when parsing character is complete.
*/
- public void addChild(Service parent, EjbLocalRef ref,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(Service parent, EjbLocalRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addEjbLocalRef(ref);
}
-
+
/**
* Called when parsing character is complete.
*/
- public void addChild(Service parent, ResourceRef ref,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(Service parent, ResourceRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addResourceRef(ref);
}
-
+
/**
* Called when parsing character is complete.
*/
- public void addChild(Service parent, JndiRef ref,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(Service parent, JndiRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addJndiRef(ref);
}
-
+
/**
* Called when parsing character is complete.
*/
- public void addChild(Service parent, ResourceEnvRef ref,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(Service parent, ResourceEnvRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addResourceEnvRef(ref);
}
-
+
/**
* Called when parsing character is complete.
*/
- public void addChild(Consumer parent, EjbRef ref,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(Consumer parent, EjbRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addEjbRef(ref);
}
-
+
/**
* Called when parsing character is complete.
*/
- public void addChild(Consumer parent, EjbLocalRef ref,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(Consumer parent, EjbLocalRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addEjbLocalRef(ref);
}
-
+
/**
* Called when parsing character is complete.
*/
- public void addChild(Consumer parent, ResourceRef ref,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(Consumer parent, ResourceRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addResourceRef(ref);
}
-
+
/**
* Called when parsing character is complete.
*/
- public void addChild(Consumer parent, JndiRef ref,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(Consumer parent, JndiRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addJndiRef(ref);
}
-
+
/**
* Called when parsing character is complete.
*/
- public void addChild(Consumer parent, ResourceEnvRef ref,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(Consumer parent, ResourceEnvRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addResourceEnvRef(ref);
}
-
+
/**
* Called when parsing character is complete.
*/
- public void addChild(EnterpriseBeans parent, Consumer consumer,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(EnterpriseBeans parent, Consumer consumer, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addEnterpriseBean(consumer);
}
-
+
/**
* Called when parsing character is complete.
*/
- public void addChild(EnterpriseBeans parent, JndiRef ref,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(EnterpriseBeans parent, JndiRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addJndiRef(ref);
}
-
+
/**
* Called when parsing character is complete.
*/
- public void addChild(EjbJarDD parent, ResourceManager manager,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(EjbJarDD parent, ResourceManager manager, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addResourceManager(manager);
}
@@ -671,16 +617,14 @@
/**
* Called when parsing character is complete.
*/
- public void addChild(EnterpriseBeans parent, EnterpriseBeans ejbs,
- UnmarshallingContext navigator, String namespaceURI, String localName)
- {
+ public void addChild(EnterpriseBeans parent, EnterpriseBeans ejbs, UnmarshallingContext navigator, String namespaceURI, String localName)
+ {
}
/**
* Called when parsing character is complete.
*/
- public void addChild(EnterpriseBeans parent, EjbRef ref,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(EnterpriseBeans parent, EjbRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.updateEjbRef(ref);
}
@@ -688,8 +632,7 @@
/**
* Called when parsing character is complete.
*/
- public void addChild(EnterpriseBeans parent, EjbLocalRef ref,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(EnterpriseBeans parent, EjbLocalRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.updateEjbLocalRef(ref);
}
@@ -697,50 +640,44 @@
/**
* Called when parsing character is complete.
*/
- public void addChild(EnterpriseBeans parent, ClusterConfig config,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(EnterpriseBeans parent, ClusterConfig config, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.setClusterConfig(config);
}
-
+
/**
* Called when parsing character is complete.
*/
- public void addChild(EnterpriseBeans parent, ResourceRef ref,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(EnterpriseBeans parent, ResourceRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.updateResourceRef(ref);
}
-
+
/**
* Called when parsing character is complete.
*/
- public void addChild(EnterpriseBeans parent, MessageDestinationRef ref,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(EnterpriseBeans parent, MessageDestinationRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.updateMessageDestinationRef(ref);
}
-
+
/**
* Called when parsing character is complete.
*/
- public void addChild(EnterpriseBeans parent, ServiceRef ref,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(EnterpriseBeans parent, ServiceRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addServiceRef(ref);
}
-
+
/**
* Called when parsing character is complete.
*/
- public void addChild(EnterpriseBeans parent, ResourceEnvRef ref,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(EnterpriseBeans parent, ResourceEnvRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.updateResourceEnvRef(ref);
}
-
- public void setValue(XmlAnnotation xmlAnnotation, UnmarshallingContext navigator,
- String namespaceURI, String localName, String value)
+
+ public void setValue(XmlAnnotation xmlAnnotation, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (localName.equals("annotation-class"))
{
@@ -751,11 +688,10 @@
xmlAnnotation.setAnnotationImplementationClass(getValue(localName, value));
}
}
-
- public void setValue(NameValuePair property, UnmarshallingContext navigator,
- String namespaceURI, String localName, String value)
+
+ public void setValue(NameValuePair property, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
- if (localName.equals("activation-config-property-name") || localName.equals("message-driven-config-property-name") || localName.equals("property-name"))
+ if (localName.equals("activation-config-property-name") || localName.equals("message-driven-config-property-name") || localName.equals("property-name"))
{
property.setName(getValue(localName, value));
}
@@ -764,9 +700,8 @@
property.setValue(getValue(localName, value));
}
}
-
- public void setValue(ResourceManager manager, UnmarshallingContext navigator,
- String namespaceURI, String localName, String value)
+
+ public void setValue(ResourceManager manager, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (localName.equals("res-name"))
{
@@ -777,9 +712,8 @@
manager.setResourceJndiName(getValue(localName, value));
}
}
-
- public void setValue(MessageDestination destination, UnmarshallingContext navigator,
- String namespaceURI, String localName, String value)
+
+ public void setValue(MessageDestination destination, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (localName.equals("message-destination-name"))
{
@@ -790,9 +724,8 @@
destination.setJndiName(getValue(localName, value));
}
}
-
- public void setValue(EnterpriseBeans ejbs, UnmarshallingContext navigator,
- String namespaceURI, String localName, String value)
+
+ public void setValue(EnterpriseBeans ejbs, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (localName.equals("ejb-name"))
{
@@ -851,12 +784,11 @@
ejbs.setConcurrent(getValue(localName, value));
}
}
-
+
/**
* Called when a child element with simple content is read for DD.
*/
- public void setValue(Service service, UnmarshallingContext navigator,
- String namespaceURI, String localName, String value)
+ public void setValue(Service service, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (localName.equals("ejb-name"))
{
@@ -903,12 +835,11 @@
service.addDependency(getValue(localName, value));
}
}
-
+
/**
* Called when a child element with simple content is read for DD.
*/
- public void setValue(Consumer consumer, UnmarshallingContext navigator,
- String namespaceURI, String localName, String value)
+ public void setValue(Consumer consumer, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (localName.equals("message-destination"))
{
@@ -956,12 +887,11 @@
consumer.addDependency(getValue(localName, value));
}
}
-
+
/**
* Called when a child element with simple content is read for DD.
*/
- public void setValue(RemoteBinding binding, UnmarshallingContext navigator,
- String namespaceURI, String localName, String value)
+ public void setValue(RemoteBinding binding, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (localName.equals("jndi-name"))
{
@@ -980,12 +910,11 @@
binding.setInterceptorStack(getValue(localName, value));
}
}
-
+
/**
* Called when a child element with simple content is read for DD.
*/
- public void setValue(MessageProperties properties, UnmarshallingContext navigator,
- String namespaceURI, String localName, String value)
+ public void setValue(MessageProperties properties, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (localName.equals("delivery"))
{
@@ -1004,8 +933,7 @@
/**
* Called when a child element with simple content is read for DD.
*/
- public void setValue(ClusterConfig config, UnmarshallingContext navigator,
- String namespaceURI, String localName, String value)
+ public void setValue(ClusterConfig config, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (localName.equals("load-balance-policy"))
{
@@ -1016,12 +944,11 @@
config.setPartition(getValue(localName, value));
}
}
-
+
/**
* Called when a child element with simple content is read for DD.
*/
- public void setValue(CacheConfig config, UnmarshallingContext navigator,
- String namespaceURI, String localName, String value)
+ public void setValue(CacheConfig config, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (localName.equals("cache-class"))
{
@@ -1044,12 +971,11 @@
config.setPersistenceManager(getValue(localName, value));
}
}
-
+
/**
* Called when a child element with simple content is read for DD.
*/
- public void setValue(PoolConfig config, UnmarshallingContext navigator,
- String namespaceURI, String localName, String value)
+ public void setValue(PoolConfig config, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (localName.equals("pool-class"))
{
@@ -1064,13 +990,11 @@
config.setTimeout(getValue(localName, value));
}
}
-
-
+
/**
* Called when a child element with simple content is read for DD.
*/
- public void setValue(Method method, UnmarshallingContext navigator,
- String namespaceURI, String localName, String value)
+ public void setValue(Method method, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (localName.equals("method-name"))
{
@@ -1085,8 +1009,7 @@
/**
* Called when a child element with simple content is read for DD.
*/
- public void setValue(EjbJarDD dd, UnmarshallingContext navigator,
- String namespaceURI, String localName, String value)
+ public void setValue(EjbJarDD dd, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (localName.equals("security-domain"))
{
@@ -1101,12 +1024,11 @@
dd.setJmxName(getValue(localName, value));
}
}
-
+
/**
* Called when a child element with simple content is read for DD.
*/
- public void setValue(Producer producer, UnmarshallingContext navigator,
- String namespaceURI, String localName, String value)
+ public void setValue(Producer producer, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (localName.equals("class"))
{
@@ -1117,42 +1039,43 @@
producer.setConnectionFactory(getValue(localName, value));
}
}
-
+
/**
* Called when a child element with simple content is read for DD.
*/
- public void setValue(SecurityRoleMetaData srm, UnmarshallingContext navigator,
- String namespaceURI, String localName, String value)
+ public void setValue(SecurityRoleMetaData srm, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (localName.equals("role-name"))
{
- srm.setRoleName(getValue(localName, value));
+ srm.setRoleName(getValue(localName, value));
}
else if (localName.equals("principal-name"))
{
srm.addPrincipalName(getValue(localName, value));
- }
+ }
}
-
+
protected String getValue(String name, String value)
{
if (value.startsWith("${") && value.endsWith("}"))
{
try
{
- String propertyName = value.substring(2, value.length()-1);
+ String propertyName = value.substring(2, value.length() - 1);
ObjectName propertyServiceON = new ObjectName("jboss:type=Service,name=SystemProperties");
KernelAbstraction kernelAbstraction = KernelAbstractionFactory.getInstance();
- String propertyValue = (String)kernelAbstraction.invoke(propertyServiceON, "get", new Object[]{propertyName}, new String[]{"java.lang.String"});
+ String propertyValue = (String)kernelAbstraction.invoke(propertyServiceON, "get", new Object[] { propertyName }, new String[] { "java.lang.String" });
log.debug("Replaced jboss.xml element " + name + " with value " + propertyValue);
return propertyValue;
}
catch (Exception e)
{
- log.warn("Unable to look up property service for jboss.xml element " + name + " with value " + value + ". Caused by " + e.getClass() + " " + e.getMessage());
+ log
+ .warn("Unable to look up property service for jboss.xml element " + name + " with value " + value + ". Caused by " + e.getClass() + " "
+ + e.getMessage());
}
}
-
+
return value;
- }
+ }
}
Modified: trunk/ejb3/src/main/org/jboss/injection/WebServiceRefHandler.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/injection/WebServiceRefHandler.java 2007-01-17 22:31:51 UTC (rev 59719)
+++ trunk/ejb3/src/main/org/jboss/injection/WebServiceRefHandler.java 2007-01-17 23:05:52 UTC (rev 59720)
@@ -54,10 +54,10 @@
for (ServiceRef sref : xml.getServiceRefs())
{
log.debug("@WebServiceRef override: " + sref);
- if (srefMap.get(sref.getEncName()) != null)
+ if (srefMap.get(sref.getServiceRefName()) != null)
throw new IllegalStateException ("Duplicate <service-ref-name> in " + sref);
- srefMap.put(sref.getEncName(), sref);
+ srefMap.put(sref.getServiceRefName(), sref);
}
}
@@ -154,7 +154,8 @@
else
{
log.debug("No override for @WebServiceRef.name: " + name);
- sref = new ServiceRef(name);
+ sref = new ServiceRef();
+ sref.setServiceRefName(name);
}
return sref;
}
Modified: trunk/server/src/main/org/jboss/metamodel/descriptor/DDObjectFactory.java
===================================================================
--- trunk/server/src/main/org/jboss/metamodel/descriptor/DDObjectFactory.java 2007-01-17 22:31:51 UTC (rev 59719)
+++ trunk/server/src/main/org/jboss/metamodel/descriptor/DDObjectFactory.java 2007-01-17 23:05:52 UTC (rev 59720)
@@ -1,24 +1,24 @@
/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
package org.jboss.metamodel.descriptor;
import javax.persistence.PersistenceContextType;
@@ -34,141 +34,109 @@
*/
public abstract class DDObjectFactory implements ObjectModelFactory
{
- private static final Logger log = Logger
- .getLogger(DDObjectFactory.class);
+ private static final Logger log = Logger.getLogger(DDObjectFactory.class);
- public Object newChild(PersistenceUnitRef ref,
- UnmarshallingContext navigator, String namespaceURI, String localName,
- Attributes attrs)
+ public Object newChild(PersistenceUnitRef ref, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
return newRefChild(ref, localName);
}
- public Object newChild(PersistenceContextRef ref,
- UnmarshallingContext navigator, String namespaceURI, String localName,
- Attributes attrs)
+ public Object newChild(PersistenceContextRef ref, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
return newRefChild(ref, localName);
}
- public Object newChild(EnvEntry ref,
- UnmarshallingContext navigator, String namespaceURI, String localName,
- Attributes attrs)
+ public Object newChild(EnvEntry ref, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
return newRefChild(ref, localName);
}
- public Object newChild(EjbRef ref,
- UnmarshallingContext navigator, String namespaceURI, String localName,
- Attributes attrs)
+ public Object newChild(EjbRef ref, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
return newRefChild(ref, localName);
}
- public Object newChild(EjbLocalRef ref,
- UnmarshallingContext navigator, String namespaceURI, String localName,
- Attributes attrs)
+ public Object newChild(EjbLocalRef ref, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
return newRefChild(ref, localName);
}
- public Object newChild(ResourceRef ref,
- UnmarshallingContext navigator, String namespaceURI, String localName,
- Attributes attrs)
+ public Object newChild(ResourceRef ref, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
return newRefChild(ref, localName);
}
- public Object newChild(ResourceEnvRef ref,
- UnmarshallingContext navigator, String namespaceURI, String localName,
- Attributes attrs)
+ public Object newChild(ResourceEnvRef ref, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
return newRefChild(ref, localName);
}
- public Object newChild(MessageDestinationRef ref,
- UnmarshallingContext navigator, String namespaceURI, String localName,
- Attributes attrs)
+ public Object newChild(MessageDestinationRef ref, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
return newRefChild(ref, localName);
}
- public Object newChild(ServiceRef ref,
- UnmarshallingContext navigator, String namespaceURI, String localName,
- Attributes attrs)
+ public Object newChild(ServiceRef ref, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
- return newRefChild(ref, localName);
+ return newServiceRefChild(ref, localName);
}
- public Object newChild(JndiRef ref,
- UnmarshallingContext navigator, String namespaceURI, String localName,
- Attributes attrs)
+ public Object newChild(JndiRef ref, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
return newRefChild(ref, localName);
}
- public void addChild(PersistenceUnitRef parent, InjectionTarget target,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(PersistenceUnitRef parent, InjectionTarget target, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.setInjectionTarget(target);
}
- public void addChild(PersistenceContextRef parent, InjectionTarget target,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(PersistenceContextRef parent, InjectionTarget target, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.setInjectionTarget(target);
}
- public void addChild(EnvEntry parent, InjectionTarget target,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(EnvEntry parent, InjectionTarget target, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.setInjectionTarget(target);
}
- public void addChild(EjbRef parent, InjectionTarget target,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(EjbRef parent, InjectionTarget target, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.setInjectionTarget(target);
}
- public void addChild(EjbLocalRef parent, InjectionTarget target,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(EjbLocalRef parent, InjectionTarget target, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.setInjectionTarget(target);
}
- public void addChild(ResourceRef parent, InjectionTarget target,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(ResourceRef parent, InjectionTarget target, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.setInjectionTarget(target);
}
- public void addChild(ResourceEnvRef parent, InjectionTarget target,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(ResourceEnvRef parent, InjectionTarget target, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.setInjectionTarget(target);
}
- public void addChild(MessageDestinationRef parent, InjectionTarget target,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(MessageDestinationRef parent, InjectionTarget target, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.setInjectionTarget(target);
}
- public void addChild(ServiceRef parent, InjectionTarget target,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(ServiceRef parent, InjectionTarget target, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.setInjectionTarget(target);
}
- public void addChild(JndiRef parent, InjectionTarget target,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(JndiRef parent, InjectionTarget target, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.setInjectionTarget(target);
}
- public void setValue(EjbLocalRef ref, UnmarshallingContext navigator,
- String namespaceURI, String localName, String value)
+ public void setValue(EjbLocalRef ref, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (localName.equals("ejb-ref-name"))
{
@@ -200,8 +168,7 @@
}
}
- public void setValue(EjbRef ref, UnmarshallingContext navigator,
- String namespaceURI, String localName, String value)
+ public void setValue(EjbRef ref, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (localName.equals("ejb-ref-name"))
{
@@ -236,8 +203,7 @@
/**
* Called when a child element with simple content is read for DD.
*/
- public void setValue(InjectionTarget target, UnmarshallingContext navigator,
- String namespaceURI, String localName, String value)
+ public void setValue(InjectionTarget target, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (localName.equals("injection-target-class"))
{
@@ -252,8 +218,7 @@
/**
* Called when a child element with simple content is read for DD.
*/
- public void setValue(MessageDestinationRef ref, UnmarshallingContext navigator,
- String namespaceURI, String localName, String value)
+ public void setValue(MessageDestinationRef ref, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (localName.equals("description"))
{
@@ -281,8 +246,7 @@
}
}
- public void setValue(EnvEntry entry, UnmarshallingContext navigator,
- String namespaceURI, String localName, String value)
+ public void setValue(EnvEntry entry, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (localName.equals("description"))
{
@@ -302,16 +266,13 @@
}
}
- public void setValue(ResourceEnvRef envRef, UnmarshallingContext navigator,
- String namespaceURI, String localName, String value)
+ public void setValue(ResourceEnvRef envRef, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
- if (localName.equals("res-ref-name")
- || localName.equals("resource-env-ref-name"))
+ if (localName.equals("res-ref-name") || localName.equals("resource-env-ref-name"))
{
envRef.setResRefName(getValue(localName, value));
}
- else if (localName.equals("res-type")
- || localName.equals("resource-env-ref-type"))
+ else if (localName.equals("res-type") || localName.equals("resource-env-ref-type"))
{
envRef.setResType(getValue(localName, value));
}
@@ -329,16 +290,13 @@
}
}
- public void setValue(ResourceRef ref, UnmarshallingContext navigator,
- String namespaceURI, String localName, String value)
+ public void setValue(ResourceRef ref, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
- if (localName.equals("res-ref-name")
- || localName.equals("resource-env-ref-name"))
+ if (localName.equals("res-ref-name") || localName.equals("resource-env-ref-name"))
{
ref.setResRefName(getValue(localName, value));
}
- else if (localName.equals("res-type")
- || localName.equals("resource-env-ref-type"))
+ else if (localName.equals("res-type") || localName.equals("resource-env-ref-type"))
{
ref.setResType(getValue(localName, value));
}
@@ -366,38 +324,96 @@
}
}
- public void setValue(ServiceRef ref, UnmarshallingContext navigator,
- String namespaceURI, String localName, String value)
+ public void setValue(ServiceRef ref, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (localName.equals("service-ref-name"))
{
- ref.setEncName(getValue(localName, value));
+ ref.setServiceRefName(value);
}
- else if (localName.equals("wsdl-override"))
+ else if (localName.equals("service-class-name"))
{
- ref.setWsdlLocation(getValue(localName, value));
+ ref.setServiceClassName(value);
}
+ else if (localName.equals("service-qname"))
+ {
+ ref.setServiceQName(navigator.resolveQName(value));
+ }
else if (localName.equals("config-name"))
{
- ref.setConfigName(getValue(localName, value));
+ ref.setConfigName(value);
}
else if (localName.equals("config-file"))
{
- ref.setConfigFile(getValue(localName, value));
+ ref.setConfigFile(value);
}
+ else if (localName.equals("wsdl-override"))
+ {
+ ref.setWsdlOverride(value);
+ }
}
- public void setValue(SecurityRole role, UnmarshallingContext navigator,
- String namespaceURI, String localName, String value)
+ private Object newServiceRefChild(ServiceRef ref, String localName)
{
+ Object child = newRefChild(ref, localName);
+
+ if (localName.equals("port-info"))
+ child = new PortInfo(ref);
+
+ return child;
+ }
+
+ public void addChild(ServiceRef parent, PortInfo portInfo, UnmarshallingContext navigator, String namespaceURI, String localName)
+ {
+ parent.getPortInfos().add(portInfo);
+ }
+
+ public void setValue(PortInfo portInfo, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+ {
+ if (localName.equals("service-endpoint-interface"))
+ {
+ portInfo.setServiceEndpointInterface(value);
+ }
+ else if (localName.equals("port-qname"))
+ {
+ portInfo.setPortQName(navigator.resolveQName(value));
+ }
+ }
+
+ public Object newChild(PortInfo portInfo, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
+ {
+ Object child = null;
+ if (localName.equals("stub-property"))
+ child = new NameValuePair();
+
+ return child;
+ }
+
+ public void addChild(PortInfo parent, NameValuePair stubProp, UnmarshallingContext navigator, String namespaceURI, String localName)
+ {
+ parent.getStubProperties().add(stubProp);
+ }
+
+ public void setValue(NameValuePair nvPair, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+ {
+ if (localName.equals("name"))
+ {
+ nvPair.setName(value);
+ }
+ else if (localName.equals("value"))
+ {
+ nvPair.setValue(value);
+ }
+ }
+
+ public void setValue(SecurityRole role, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+ {
if (localName.equals("role-name"))
{
role.setRoleName(getValue(localName, value));
}
}
- public void setValue(JndiRef ref, UnmarshallingContext navigator,
- String namespaceURI, String localName, String value)
+ public void setValue(JndiRef ref, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (localName.equals("mapped-name"))
{
@@ -409,8 +425,7 @@
}
}
- public void setValue(RunAs runAs, UnmarshallingContext navigator,
- String namespaceURI, String localName, String value)
+ public void setValue(RunAs runAs, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (localName.equals("role-name"))
{
@@ -418,8 +433,7 @@
}
}
- public void setValue(SecurityRoleRef ref, UnmarshallingContext navigator,
- String namespaceURI, String localName, String value)
+ public void setValue(SecurityRoleRef ref, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (localName.equals("role-name"))
{
@@ -431,8 +445,7 @@
}
}
- public void setValue(Listener listener, UnmarshallingContext navigator,
- String namespaceURI, String localName, String value)
+ public void setValue(Listener listener, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (localName.equals("listener-class"))
{
@@ -440,8 +453,7 @@
}
}
- public void setValue(MessageDestination destination, UnmarshallingContext navigator,
- String namespaceURI, String localName, String value)
+ public void setValue(MessageDestination destination, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (localName.equals("message-destination-name"))
{
@@ -453,8 +465,7 @@
}
}
- public void setValue(PersistenceUnitRef ref, UnmarshallingContext navigator,
- String namespaceURI, String localName, String value)
+ public void setValue(PersistenceUnitRef ref, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (localName.equals("persistence-unit-ref-name"))
{
@@ -535,8 +546,7 @@
return child;
}
- public void setValue(PersistenceContextRef ref, UnmarshallingContext navigator,
- String namespaceURI, String localName, String value)
+ public void setValue(PersistenceContextRef ref, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (localName.equals("persistence-context-ref-name"))
{
@@ -546,7 +556,7 @@
{
ref.setUnitName(getValue(localName, value));
}
- else if(localName.equals("persistence-context-type"))
+ else if (localName.equals("persistence-context-type"))
{
if (value.toLowerCase().equals("transaction"))
{
@@ -558,7 +568,7 @@
}
}
}
-
+
protected String getValue(String name, String value)
{
return value;
Modified: trunk/server/src/main/org/jboss/metamodel/descriptor/EnvironmentRefGroup.java
===================================================================
--- trunk/server/src/main/org/jboss/metamodel/descriptor/EnvironmentRefGroup.java 2007-01-17 22:31:51 UTC (rev 59719)
+++ trunk/server/src/main/org/jboss/metamodel/descriptor/EnvironmentRefGroup.java 2007-01-17 23:05:52 UTC (rev 59720)
@@ -141,7 +141,7 @@
public void addServiceRef(ServiceRef ref)
{
- serviceRefs.put(ref.getEncName(), ref);
+ serviceRefs.put(ref.getServiceRefName(), ref);
}
public void updateEjbRef(EjbRef updatedRef)
Added: trunk/server/src/main/org/jboss/metamodel/descriptor/PortInfo.java
===================================================================
--- trunk/server/src/main/org/jboss/metamodel/descriptor/PortInfo.java (rev 0)
+++ trunk/server/src/main/org/jboss/metamodel/descriptor/PortInfo.java 2007-01-17 23:05:52 UTC (rev 59720)
@@ -0,0 +1,104 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.metamodel.descriptor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.namespace.QName;
+
+// $Id$
+
+/**
+ * Represents a <port-info> element in <service-ref>
+ *
+ * @author Thomas.Diesler at jboss.com
+ */
+public class PortInfo
+{
+ private ServiceRef serviceRef;
+ private String serviceEndpointInterface;
+ private QName portQName;
+ private List<NameValuePair> stubProperties = new ArrayList<NameValuePair>();
+
+ public PortInfo(ServiceRef serviceRef)
+ {
+ this.serviceRef = serviceRef;
+ }
+
+ public ServiceRef getServiceRef()
+ {
+ return serviceRef;
+ }
+
+ public QName getPortQName()
+ {
+ return portQName;
+ }
+
+ public void setPortQName(QName portName)
+ {
+ this.portQName = portName;
+ }
+
+ public String getServiceEndpointInterface()
+ {
+ return serviceEndpointInterface;
+ }
+
+ public void setServiceEndpointInterface(String serviceEndpointInterface)
+ {
+ this.serviceEndpointInterface = serviceEndpointInterface;
+ }
+
+ public List<NameValuePair> getStubProperties()
+ {
+ return stubProperties;
+ }
+
+ public String toXMLFragment()
+ {
+ StringBuilder xml = new StringBuilder("<port-info>");
+
+ if (serviceEndpointInterface != null)
+ xml.append("<service-endpoint-interface>" + serviceEndpointInterface + "</service-endpoint-interface>");
+
+ if (portQName != null)
+ {
+ String nsDecl = "xmlns:" + portQName.getPrefix() + "='" + portQName.getNamespaceURI() + "'";
+ String qualname = portQName.getPrefix() + ":" + portQName.getLocalPart();
+ xml.append("<port-qname " + nsDecl + ">" + qualname + "</port-qname>");
+ }
+
+ for (NameValuePair nvp : stubProperties)
+ {
+ xml.append("<stub-property>");
+ xml.append("<name>" + nvp.getName() + "</name>");
+ xml.append("<value>" + nvp.getValue() + "</value>");
+ xml.append("</stub-property>");
+ }
+
+ xml.append("</port-info>");
+
+ return xml.toString();
+ }
+}
Property changes on: trunk/server/src/main/org/jboss/metamodel/descriptor/PortInfo.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/server/src/main/org/jboss/metamodel/descriptor/ServiceRef.java
===================================================================
--- trunk/server/src/main/org/jboss/metamodel/descriptor/ServiceRef.java 2007-01-17 22:31:51 UTC (rev 59719)
+++ trunk/server/src/main/org/jboss/metamodel/descriptor/ServiceRef.java 2007-01-17 23:05:52 UTC (rev 59720)
@@ -21,8 +21,13 @@
*/
package org.jboss.metamodel.descriptor;
-import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.namespace.QName;
+
+import org.jboss.xb.QNameBuilder;
+
// $Id$
/**
@@ -34,40 +39,59 @@
*/
public class ServiceRef extends Ref
{
- private String encName;
- private String wsdlLocation;
+ private String serviceRefName;
+ private String serviceClassName;
+ private QName serviceQName;
private String configName;
private String configFile;
+ private List<PortInfo> portInfos = new ArrayList<PortInfo>();
+ private String wsdlOverride;
- public ServiceRef()
+ public String getServiceRefName()
{
+ return serviceRefName;
}
- public ServiceRef(String name)
+ public void setServiceRefName(String name)
{
- this.encName = name;
+ this.serviceRefName = name;
}
- public String getEncName()
+ public String getServiceClassName()
{
- return encName;
+ return serviceClassName;
}
- public void setEncName(String name)
+ public void setServiceClassName(String serviceClassName)
{
- this.encName = name;
+ this.serviceClassName = serviceClassName;
}
- public String getWsdlLocation()
+ public QName getServiceQName()
{
- return wsdlLocation;
+ return serviceQName;
}
- public void setWsdlLocation(String wsdlLocation)
+ public void setServiceQName(QName serviceQName)
{
- this.wsdlLocation = wsdlLocation;
+ this.serviceQName = serviceQName;
}
+
+ public List<PortInfo> getPortInfos()
+ {
+ return portInfos;
+ }
+ public String getWsdlOverride()
+ {
+ return wsdlOverride;
+ }
+
+ public void setWsdlOverride(String wsdlLocation)
+ {
+ this.wsdlOverride = wsdlLocation;
+ }
+
public String getConfigFile()
{
return configFile;
@@ -88,29 +112,43 @@
this.configName = configName;
}
- public String toXMLFragment() throws IOException
+ public String toXMLFragment()
{
StringBuilder xml = new StringBuilder("<service-ref>");
- xml.append("<service-ref-name>" + encName + "</service-ref-name>");
+
+ xml.append("<service-ref-name>" + serviceRefName + "</service-ref-name>");
+
+ if (serviceClassName != null)
+ xml.append("<service-class-name>" + serviceClassName + "</service-class-name>");
+
+ if (serviceQName != null)
+ {
+ String nsDecl = "xmlns:" + serviceQName.getPrefix() + "='" + serviceQName.getNamespaceURI() + "'";
+ String qualname = serviceQName.getPrefix() + ":" + serviceQName.getLocalPart();
+ xml.append("<service-qname " + nsDecl + ">" + qualname + "</service-qname>");
+ }
+
if (configName != null)
xml.append("<config-name>" + configName + "</config-name>");
if (configFile != null)
xml.append("<config-file>" + configFile + "</config-file>");
- if (wsdlLocation != null)
- xml.append("<wsdl-location>" + wsdlLocation + "</wsdl-location>");
+
+ for (PortInfo portInfo : portInfos)
+ xml.append(portInfo.toXMLFragment());
+
+ if (wsdlOverride != null)
+ xml.append("<wsdl-override>" + wsdlOverride + "</wsdl-override>");
+
xml.append("</service-ref>");
return xml.toString();
}
-
+
public String toString()
{
StringBuffer sb = new StringBuffer(100);
sb.append("[");
- sb.append("name=").append(encName);
- sb.append(",config-name=").append(configName);
- sb.append(",config-file=").append(configFile);
- sb.append(",wsdl=").append(wsdlLocation);
+ sb.append("name=").append(serviceRefName);
sb.append("]");
return sb.toString();
}
Modified: trunk/server/src/resources/dtd/service-ref_5_0.dtd
===================================================================
--- trunk/server/src/resources/dtd/service-ref_5_0.dtd 2007-01-17 22:31:51 UTC (rev 59719)
+++ trunk/server/src/resources/dtd/service-ref_5_0.dtd 2007-01-17 23:05:52 UTC (rev 59720)
@@ -1,53 +1,146 @@
-<?xml version='1.0' encoding='UTF-8' ?>
+<?xml version='1.0' encoding='UTF-8'?>
<!--
- $Id: jboss-client_5_0.dtd 58121 2006-11-04 19:57:58Z thomas.diesler at jboss.com $
+ $Id: jboss-client_5_0.dtd 58121 2006-11-04 19:57:58Z thomas.diesler at jboss.com $
-->
-<!--
- The service-ref element provides jboss specific deployment values to
- the web service reference in application-client.xml, web.xml, ejb-jar.xml.
+<!--
+ WebServiceRef customization
+-->
+
+<!--
+ Runtime settings for a web service reference. In the simplest case,
+ there is no runtime information required for a service ref. Runtime info
+ is only needed in the following cases :
+ * to define the port that should be used to resolve a container-managed port
+ * to define default Stub property settings for Stub objects
+ * to define the URL of a final WSDL document to be used
+
Example:
- <service-ref>
- <service-ref-name>OrganizationService</service-ref-name>
- <wsdl-override>file:/wsdlRepository/organization-service.wsdl</wsdl-override>
- </service-ref>
+
+ <service-ref>
+ <service-ref-name>OrganizationService</service-ref-name>
+ <wsdl-override>file:/wsdlRepository/organization-service.wsdl</wsdl-override>
+ </service-ref>
- <service-ref>
- <service-ref-name>OrganizationService</service-ref-name>
- <config-name>Secure Client Config</config-name>
- <config-file>META-INF/jbossws-client-config.xml</config-file>
- </service-ref>
+ <service-ref>
+ <service-ref-name>OrganizationService</service-ref-name>
+ <config-name>Secure Client Config</config-name>
+ <config-file>META-INF/jbossws-client-config.xml</config-file>
+ </service-ref>
+
+ <service-ref>
+ <service-ref-name>SecureService</service-ref-name>
+ <port-info>
+ <service-endpoint-interface>org.jboss.tests.ws.jaxws.webserviceref.SecureEndpoint</service-endpoint-interface>
+ <wsdl-port xmlns:ns1='http://helloservice.org/wsdl'>HelloPort</wsdl-port>
+ <stub-property>
+ <name>javax.xml.ws.security.auth.password</name>
+ <value>kermit</value>
+ </stub-property>
+ <stub-property>
+ <name>javax.xml.ws.security.auth.username</name>
+ <value>thefrog</value>
+ </stub-property>
+ </port-info>
+ </service-ref>
-->
-<!ELEMENT service-ref (service-ref-name, config-name?, config-file?, wsdl-override?)>
+<!ELEMENT service-ref (service-ref-name, service-class-name?, service-qname?, config-name?, config-file?, port-info*, wsdl-override?)>
-<!-- The service-ref-name element gives the ENC relative name used by @WebServiceRef.name
-
-Used in: service-ref
+<!--
+ The service-ref-name element gives the ENC relative name.
+ Overrides @WebServiceRef.name
-->
<!ELEMENT service-ref-name (#PCDATA)>
-<!-- The optional config-name element gives the client configuration name that must be present in
-the configuration given by element config-file.
-
-The default is: Standard Client
+<!--
+ Name of the class that implements javax.xml.ws.Service.
+ Overrides @WebServiceRef.value
+-->
+<!ELEMENT service-class-name (#PCDATA)>
-Used in: service-ref
+<!--
+ The service-qname element declares the specific WSDL service element.
+ Specify the qualified service name in the form prefix:localPart
+
+ Example:
+ <service-qname xmlns:ns1='http://somensURI'>ns1:SomeService</service-qname>
-->
-<!ELEMENT config-name (#PCDATA)>
+<!ELEMENT service-qname (#PCDATA)>
-<!-- The optional config-file element gives the to a URL or resource name for the client configuration.
-The default is: META-INF/standard-jbossws-client-config.xml
+<!--
+ The optional config-name element gives the client configuration name that must be present in
+ the configuration given by element config-file. All newly created ports will be configured with
+ this config name.
-Used in: service-ref
+ The default is: Standard Client
-->
+<!ELEMENT config-name (#PCDATA)>
+
+<!--
+ The optional config-file element gives the to a URL or resource name for the client configuration.
+ All newly created ports will be configured with this config file.
+
+ The default is: META-INF/standard-jbossws-client-config.xml
+-->
<!ELEMENT config-file (#PCDATA)>
-<!-- The wsdl-override element the actual wsdl docuement the web service client
-uses to connect to the remote service. It overrides @WebServiceRef.wsdlLocation
+<!--
+ Information for a port within a service-reference.
+
+ Either service-endpoint-interface or wsdl-port or both
+ (service-endpoint-interface and wsdl-port) should be specified.
+
+ If both are specified, wsdl-port represents the
+ port the container should choose for container-managed port selection.
+
+ The same wsdl-port value must not appear in
+ more than one port-info entry within the same service-ref.
+
+ If a particular service-endpoint-interface is using container-managed port
+ selection, it must not appear in more than one port-info entry
+ within the same service-ref.
+-->
+<!ELEMENT port-info (service-endpoint-interface?, port-qname?, stub-property*)>
-Used in: service-ref
+<!--
+ Fully qualified name of service endpoint interface
-->
+<!ELEMENT service-endpoint-interface (#PCDATA)>
+
+<!--
+ Port used in port-info.
+ Specify the qualified port name in the form prefix:localPart
+
+ Example:
+ <port-qname xmlns:ns1='http://somensURI'>ns1:SomeService</port-qname>
+-->
+<!ELEMENT port-qname (#PCDATA)>
+
+<!--
+ Property values that should be set on a stub before it's returned to
+ to the web service client. The property names can be any properties supported
+ by the StubExt or Stub implementation.
+
+ See javadoc for org.jboss.ws.core.StubExt, javax.xml.rpc.Stub
+-->
+<!ELEMENT stub-property (name, value)>
+
+<!--
+ This text nodes holds a name string.
+-->
+<!ELEMENT name (#PCDATA)>
+
+<!--
+ This text nodes holds a value string.
+-->
+<!ELEMENT value (#PCDATA)>
+
+<!--
+ The wsdl-override element the actual wsdl docuement the web service client
+ uses to connect to the remote service.
+
+ Overrides @WebServiceRef.wsdlLocation
+-->
<!ELEMENT wsdl-override (#PCDATA)>
-
Modified: trunk/tomcat/src/main/org/jboss/web/metamodel/descriptor/JBossWebDDObjectFactory.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/metamodel/descriptor/JBossWebDDObjectFactory.java 2007-01-17 22:31:51 UTC (rev 59719)
+++ trunk/tomcat/src/main/org/jboss/web/metamodel/descriptor/JBossWebDDObjectFactory.java 2007-01-17 23:05:52 UTC (rev 59720)
@@ -1,24 +1,24 @@
/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
package org.jboss.web.metamodel.descriptor;
import org.jboss.logging.Logger;
@@ -52,15 +52,14 @@
*/
public class JBossWebDDObjectFactory extends DDObjectFactory
{
- private static final Logger log = Logger
- .getLogger(JBossWebDDObjectFactory.class);
+ private static final Logger log = Logger.getLogger(JBossWebDDObjectFactory.class);
private WebDD dd;
- public static WebDD parse(URL ddResource, WebDD dd)
- throws JBossXBException, IOException
+ public static WebDD parse(URL ddResource, WebDD dd) throws JBossXBException, IOException
{
- if (ddResource == null) return null;
+ if (ddResource == null)
+ return null;
log.debug("found jboss-web.xml " + ddResource);
InputStream is = ddResource.openStream();
@@ -68,22 +67,23 @@
return parse(dd, is);
}
- public static WebDD parse(WebDD dd, InputStream is)
- throws JBossXBException
+ public static WebDD parse(WebDD dd, InputStream is) throws JBossXBException
{
ObjectModelFactory factory = null;
Unmarshaller unmarshaller = null;
- if (dd == null) dd = new WebDD();
+ if (dd == null)
+ dd = new WebDD();
factory = new JBossWebDDObjectFactory(dd);
UnmarshallerFactory unmarshallerFactory = UnmarshallerFactory.newInstance();
- unmarshallerFactory.setFeature(Unmarshaller.SCHEMA_VALIDATION, Boolean.TRUE);
unmarshaller = unmarshallerFactory.newUnmarshaller();
- JBossEntityResolver entityResolver = new JBossEntityResolver();
- unmarshaller.setEntityResolver(entityResolver);
+ unmarshaller.setEntityResolver(new JBossEntityResolver());
+ unmarshaller.setNamespaceAware(true);
+ unmarshaller.setSchemaValidation(true);
+ unmarshaller.setValidation(true);
- dd = (WebDD) unmarshaller.unmarshal(is, factory, null);
+ dd = (WebDD)unmarshaller.unmarshal(is, factory, null);
return dd;
}
@@ -97,14 +97,12 @@
/**
* Return the root.
*/
- public Object newRoot(Object root, UnmarshallingContext navigator,
- String namespaceURI, String localName, Attributes attrs)
+ public Object newRoot(Object root, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
return dd;
}
- public Object completeRoot(Object root, UnmarshallingContext ctx,
- String uri, String name)
+ public Object completeRoot(Object root, UnmarshallingContext ctx, String uri, String name)
{
return root;
}
@@ -114,11 +112,10 @@
/**
* Called when parsing of a new element started.
*/
- public Object newChild(WebDD dd, UnmarshallingContext navigator,
- String namespaceURI, String localName, Attributes attrs)
+ public Object newChild(WebDD dd, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
Object child = null;
- log.debug("newChild, "+localName);
+ log.debug("newChild, " + localName);
if ((child = newEnvRefGroupChild(localName)) != null)
return child;
else if (localName.equals("security-role"))
@@ -134,48 +131,43 @@
return child;
}
- public void addChild(WebDD parent, ReplicationConfig config,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(WebDD parent, ReplicationConfig config, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.setReplicationConfig(config);
}
- public void addChild(WebDD parent, EjbLocalRef ref,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(WebDD parent, EjbLocalRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.updateEjbLocalRef(ref);
}
- public void addChild(WebDD parent, EjbRef ref,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(WebDD parent, EjbRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.updateEjbRef(ref);
}
- public void addChild(WebDD parent, EnvEntry ref,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(WebDD parent, EnvEntry ref, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addEnvEntry(ref);
}
- public void addChild(WebDD parent, MessageDestination destination,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(WebDD parent, MessageDestination destination, UnmarshallingContext navigator, String namespaceURI, String localName)
{
- log.debug("addMessageDestination, "+destination);
+ log.debug("addMessageDestination, " + destination);
parent.updateMessageDestination(destination);
// See if this message-destination resolves to an existing ref link
String link = destination.getMessageDestinationName();
- if( link != null )
+ if (link != null)
{
MessageDestinationRef ref = parent.getMessageDestinationRefForLink(link);
- if( ref != null )
+ if (ref != null)
{
- log.debug("ressolved "+ref+" to link mapedName: "+destination.getMappedName());
+ log.debug("ressolved " + ref + " to link mapedName: " + destination.getMappedName());
ref.setMappedName(destination.getMappedName());
}
}
}
-
+
public void addChild(WebDD parent, MessageDestinationRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
{
log.debug("addMessageDestinationRef, " + ref);
@@ -187,33 +179,27 @@
parent.addServiceRef(ref);
}
- public void addChild(WebDD parent, ResourceEnvRef ref,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(WebDD parent, ResourceEnvRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.updateResourceEnvRef(ref);
}
- public void addChild(WebDD parent, ResourceRef ref,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(WebDD parent, ResourceRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.updateResourceRef(ref);
}
- public void addChild(WebDD parent, SecurityRole role,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(WebDD parent, SecurityRole role, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.updateSecurityRole(role);
}
- public void addChild(WebDD parent, Servlet servlet,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(WebDD parent, Servlet servlet, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.updateServlet(servlet);
}
- public void setValue(WebDD dd,
- UnmarshallingContext navigator, String namespaceURI, String localName,
- String value)
+ public void setValue(WebDD dd, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (localName.equals("depends"))
{
@@ -225,9 +211,7 @@
}
}
- public void setValue(ReplicationConfig config,
- UnmarshallingContext navigator, String namespaceURI, String localName,
- String value)
+ public void setValue(ReplicationConfig config, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (localName.equals("replication-trigger"))
{
@@ -243,9 +227,7 @@
}
}
- public void setValue(Servlet servlet,
- UnmarshallingContext navigator, String namespaceURI, String localName,
- String value)
+ public void setValue(Servlet servlet, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (localName.equals("servlet-name"))
{
@@ -257,9 +239,7 @@
}
}
- public void setValue(ServletMapping mapping,
- UnmarshallingContext navigator, String namespaceURI, String localName,
- String value)
+ public void setValue(ServletMapping mapping, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (localName.equals("servlet-name"))
{
@@ -271,15 +251,12 @@
}
}
- public void setValue(SecurityRole role,
- UnmarshallingContext navigator, String namespaceURI, String localName,
- String value)
+ public void setValue(SecurityRole role, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (localName.equals("principal-name"))
{
role.setPrincipalName(value);
}
- else
- super.setValue(role, navigator, namespaceURI, localName, value);
+ else super.setValue(role, navigator, namespaceURI, localName, value);
}
}
Modified: trunk/tomcat/src/main/org/jboss/web/metamodel/descriptor/WebDDObjectFactory.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/metamodel/descriptor/WebDDObjectFactory.java 2007-01-17 22:31:51 UTC (rev 59719)
+++ trunk/tomcat/src/main/org/jboss/web/metamodel/descriptor/WebDDObjectFactory.java 2007-01-17 23:05:52 UTC (rev 59720)
@@ -1,24 +1,24 @@
/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
package org.jboss.web.metamodel.descriptor;
import org.jboss.logging.Logger;
@@ -55,63 +55,56 @@
*/
public class WebDDObjectFactory extends DDObjectFactory
{
- private static final Logger log = Logger
- .getLogger(WebDDObjectFactory.class);
+ private static final Logger log = Logger.getLogger(WebDDObjectFactory.class);
- public static WebDD parse(URL ddResource)
- throws JBossXBException, IOException
+ public static WebDD parse(URL ddResource) throws JBossXBException, IOException
{
- if (ddResource == null) return null;
+ if (ddResource == null)
+ return null;
log.debug("found web.xml " + ddResource);
InputStream is = ddResource.openStream();
return parse(is);
}
- public static WebDD parse(InputStream is)
- throws JBossXBException
+ public static WebDD parse(InputStream is) throws JBossXBException
{
ObjectModelFactory factory = null;
Unmarshaller unmarshaller = null;
WebDD dd = null;
factory = new WebDDObjectFactory();
- UnmarshallerFactory unmarshallerFactory = UnmarshallerFactory
- .newInstance();
- // unmarshallerFactory.setFeature(Unmarshaller.SCHEMA_VALIDATION, Boolean.TRUE);
+ UnmarshallerFactory unmarshallerFactory = UnmarshallerFactory.newInstance();
unmarshaller = unmarshallerFactory.newUnmarshaller();
- JBossEntityResolver entityResolver = new JBossEntityResolver();
- unmarshaller.setEntityResolver(entityResolver);
+ unmarshaller.setEntityResolver(new JBossEntityResolver());
+ unmarshaller.setNamespaceAware(true);
+ //unmarshaller.setSchemaValidation(true);
+ //unmarshaller.setValidation(true);
- dd = (WebDD) unmarshaller.unmarshal(is,
- factory, null);
+ dd = (WebDD)unmarshaller.unmarshal(is, factory, null);
return dd;
}
/**
* Return the root.
*/
- public Object newRoot(Object root, UnmarshallingContext navigator,
- String namespaceURI, String localName, Attributes attrs)
+ public Object newRoot(Object root, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
final WebDD dd;
if (root == null)
root = dd = new WebDD();
- else
- dd = (WebDD) root;
+ else dd = (WebDD)root;
return root;
}
- public Object completeRoot(Object root, UnmarshallingContext ctx,
- String uri, String name)
+ public Object completeRoot(Object root, UnmarshallingContext ctx, String uri, String name)
{
return root;
}
- public Object newChild(WebDD dd, UnmarshallingContext navigator,
- String namespaceURI, String localName, Attributes attrs)
+ public Object newChild(WebDD dd, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
Object child = null;
@@ -166,8 +159,7 @@
return child;
}
- public Object newChild(Filter filter, UnmarshallingContext navigator,
- String namespaceURI, String localName, Attributes attrs)
+ public Object newChild(Filter filter, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
Object child = null;
@@ -179,8 +171,7 @@
return child;
}
- public Object newChild(Servlet servlet, UnmarshallingContext navigator,
- String namespaceURI, String localName, Attributes attrs)
+ public Object newChild(Servlet servlet, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
Object child = null;
@@ -200,8 +191,7 @@
return child;
}
- public Object newChild(SecurityConstraint constraint, UnmarshallingContext navigator,
- String namespaceURI, String localName, Attributes attrs)
+ public Object newChild(SecurityConstraint constraint, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
Object child = null;
@@ -221,8 +211,7 @@
return child;
}
- public Object newChild(LoginConfig config, UnmarshallingContext navigator,
- String namespaceURI, String localName, Attributes attrs)
+ public Object newChild(LoginConfig config, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
Object child = null;
@@ -234,159 +223,132 @@
return child;
}
- public void addChild(WebDD parent, Filter filter,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(WebDD parent, Filter filter, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addFilter(filter);
}
- public void addChild(WebDD parent, FilterMapping mapping,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(WebDD parent, FilterMapping mapping, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addFilterMapping(mapping);
}
- public void addChild(WebDD parent, Listener listener,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(WebDD parent, Listener listener, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addListener(listener);
}
- public void addChild(WebDD parent, Servlet servlet,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(WebDD parent, Servlet servlet, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addServlet(servlet);
}
- public void addChild(WebDD parent, ServletMapping mapping,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(WebDD parent, ServletMapping mapping, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addServletMapping(mapping);
}
- public void addChild(WebDD parent, SessionConfig config,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(WebDD parent, SessionConfig config, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addSessionConfig(config);
}
- public void addChild(WebDD parent, SecurityConstraint constraint,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(WebDD parent, SecurityConstraint constraint, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addSecurityConstraint(constraint);
}
- public void addChild(WebDD parent, ErrorPage page,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(WebDD parent, ErrorPage page, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addErrorPage(page);
}
- public void addChild(WebDD parent, SecurityRole role,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(WebDD parent, SecurityRole role, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addSecurityRole(role);
}
- public void addChild(WebDD parent, EjbLocalRef ref,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(WebDD parent, EjbLocalRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addEjbLocalRef(ref);
}
- public void addChild(WebDD parent, EjbRef ref,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(WebDD parent, EjbRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addEjbRef(ref);
}
- public void addChild(WebDD parent, EnvEntry ref,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(WebDD parent, EnvEntry ref, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addEnvEntry(ref);
}
- public void addChild(WebDD parent, MessageDestinationRef ref,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(WebDD parent, MessageDestinationRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addMessageDestinationRef(ref);
}
- public void addChild(WebDD parent, ResourceEnvRef ref,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(WebDD parent, ResourceEnvRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addResourceEnvRef(ref);
}
- public void addChild(WebDD parent, ResourceRef ref,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(WebDD parent, ResourceRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addResourceRef(ref);
}
- public void addChild(WebDD parent, LoginConfig config,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(WebDD parent, LoginConfig config, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.setLoginConfig(config);
}
- public void addChild(WebDD parent, MessageDestination destination,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(WebDD parent, MessageDestination destination, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addMessageDestination(destination);
}
- public void addChild(Filter parent, NameValuePair param,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(Filter parent, NameValuePair param, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addInitParam(param);
}
- public void addChild(Servlet parent, NameValuePair param,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(Servlet parent, NameValuePair param, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addInitParam(param);
}
- public void addChild(Servlet parent, RunAs runAs,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(Servlet parent, RunAs runAs, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.setRunAs(runAs);
}
- public void addChild(Servlet parent, SecurityRoleRef ref,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(Servlet parent, SecurityRoleRef ref, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.addSecurityRoleRef(ref);
}
- public void addChild(SecurityConstraint parent, WebResourceCollection collection,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(SecurityConstraint parent, WebResourceCollection collection, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.setWebResourceCollection(collection);
}
- public void addChild(SecurityConstraint parent, AuthConstraint constraint,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(SecurityConstraint parent, AuthConstraint constraint, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.setAuthConstraint(constraint);
}
- public void addChild(SecurityConstraint parent, UserDataConstraint constraint,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(SecurityConstraint parent, UserDataConstraint constraint, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.setUserDataConstraint(constraint);
}
- public void addChild(LoginConfig parent, FormLoginConfig config,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(LoginConfig parent, FormLoginConfig config, UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.setFormLoginConfig(config);
}
- public void setValue(Filter filter,
- UnmarshallingContext navigator, String namespaceURI, String localName,
- String value)
+ public void setValue(Filter filter, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (localName.equals("filter-name"))
{
@@ -398,9 +360,7 @@
}
}
- public void setValue(FilterMapping mapping,
- UnmarshallingContext navigator, String namespaceURI, String localName,
- String value)
+ public void setValue(FilterMapping mapping, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (localName.equals("filter-name"))
{
@@ -416,9 +376,7 @@
}
}
- public void setValue(Servlet servlet,
- UnmarshallingContext navigator, String namespaceURI, String localName,
- String value)
+ public void setValue(Servlet servlet, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (localName.equals("servlet-name"))
{
@@ -438,9 +396,7 @@
}
}
- public void setValue(ServletMapping mapping,
- UnmarshallingContext navigator, String namespaceURI, String localName,
- String value)
+ public void setValue(ServletMapping mapping, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (localName.equals("servlet-name"))
{
@@ -452,9 +408,7 @@
}
}
- public void setValue(ErrorPage page,
- UnmarshallingContext navigator, String namespaceURI, String localName,
- String value)
+ public void setValue(ErrorPage page, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (localName.equals("error-code"))
{
@@ -466,9 +420,7 @@
}
}
- public void setValue(SessionConfig config,
- UnmarshallingContext navigator, String namespaceURI, String localName,
- String value)
+ public void setValue(SessionConfig config, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (localName.equals("session-timeout"))
{
@@ -476,8 +428,7 @@
}
}
- public void setValue(NameValuePair param, UnmarshallingContext navigator,
- String namespaceURI, String localName, String value)
+ public void setValue(NameValuePair param, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (localName.equals("param-name"))
{
@@ -489,8 +440,7 @@
}
}
- public void setValue(WebResourceCollection collection, UnmarshallingContext navigator,
- String namespaceURI, String localName, String value)
+ public void setValue(WebResourceCollection collection, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (localName.equals("web-resource-name"))
{
@@ -502,8 +452,7 @@
}
}
- public void setValue(AuthConstraint contraint, UnmarshallingContext navigator,
- String namespaceURI, String localName, String value)
+ public void setValue(AuthConstraint contraint, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (localName.equals("role-name"))
{
@@ -511,8 +460,7 @@
}
}
- public void setValue(UserDataConstraint contraint, UnmarshallingContext navigator,
- String namespaceURI, String localName, String value)
+ public void setValue(UserDataConstraint contraint, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (localName.equals("transport-guarantee"))
{
@@ -520,8 +468,7 @@
}
}
- public void setValue(LoginConfig config, UnmarshallingContext navigator,
- String namespaceURI, String localName, String value)
+ public void setValue(LoginConfig config, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (localName.equals("auth-method"))
{
@@ -533,8 +480,7 @@
}
}
- public void setValue(FormLoginConfig config, UnmarshallingContext navigator,
- String namespaceURI, String localName, String value)
+ public void setValue(FormLoginConfig config, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (localName.equals("form-login-page"))
{
More information about the jboss-cvs-commits
mailing list