JBossWS SVN: r4612 - stack/native/trunk/src/main/java/javax/xml/soap.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-09-24 04:53:53 -0400 (Mon, 24 Sep 2007)
New Revision: 4612
Modified:
stack/native/trunk/src/main/java/javax/xml/soap/SOAPConnection.java
stack/native/trunk/src/main/java/javax/xml/soap/SOAPFactory.java
stack/native/trunk/src/main/java/javax/xml/soap/SOAPHeaderElement.java
Log:
JBCTS-312: javax.xml.soap signature tests
Modified: stack/native/trunk/src/main/java/javax/xml/soap/SOAPConnection.java
===================================================================
--- stack/native/trunk/src/main/java/javax/xml/soap/SOAPConnection.java 2007-09-22 12:47:12 UTC (rev 4611)
+++ stack/native/trunk/src/main/java/javax/xml/soap/SOAPConnection.java 2007-09-24 08:53:53 UTC (rev 4612)
@@ -21,8 +21,6 @@
*/
package javax.xml.soap;
-import org.jboss.util.NotImplementedException;
-
/** A point-to-point connection that a client can use for sending messages directly to a remote
* party (represented by a URL, for instance).
*
@@ -43,7 +41,7 @@
public abstract class SOAPConnection
{
public SOAPConnection()
- {
+ {
}
/** Sends the given message to the specified endpoint and blocks until it has returned the response.
@@ -63,7 +61,10 @@
* @throws SOAPException if there is a SOAP error
* @since SAAJ 1.3
*/
- public abstract SOAPMessage get(Object to) throws SOAPException;
+ public SOAPMessage get(Object to) throws SOAPException
+ {
+ throw new IllegalArgumentException("Should be implemented by concrete implementation of this class");
+ }
/** Closes this SOAPConnection object.
*
Modified: stack/native/trunk/src/main/java/javax/xml/soap/SOAPFactory.java
===================================================================
--- stack/native/trunk/src/main/java/javax/xml/soap/SOAPFactory.java 2007-09-22 12:47:12 UTC (rev 4611)
+++ stack/native/trunk/src/main/java/javax/xml/soap/SOAPFactory.java 2007-09-24 08:53:53 UTC (rev 4612)
@@ -23,10 +23,11 @@
// $Id$
+import org.w3c.dom.Element;
+
import javax.xml.namespace.QName;
+import java.lang.reflect.Method;
-import org.w3c.dom.Element;
-
/** SOAPFactory is a factory for creating various objects that exist in the SOAP XML tree.
*
* SOAPFactory can be used to create XML fragments that will eventually end up in the SOAP part.
@@ -41,15 +42,15 @@
public abstract class SOAPFactory
{
private static SOAPFactory soapFactory;
-
- /**
- * Creates a new SOAPFactory object that is an instance of the default implementation (SOAP 1.1),
+
+ /**
+ * Creates a new SOAPFactory object that is an instance of the default implementation (SOAP 1.1),
* This method uses the following ordered lookup procedure to determine the SOAPFactory implementation class to load:
- *
+ *
* Use the javax.xml.soap.SOAPFactory system property.
* Use the properties file "lib/jaxm.properties" in the JRE directory. This configuration file is in standard java.util.Properties format and contains the fully qualified name of the implementation class with the key being the system property defined above.
* Use the Services API (as detailed in the JAR specification), if available, to determine the classname. The Services API will look for a classname in the file META-INF/services/javax.xml.soap.SOAPFactory in jars available to the runtime.
- * Use the SAAJMetaFactory instance to locate the SOAPFactory implementation class.
+ * Use the SAAJMetaFactory instance to locate the SOAPFactory implementation class.
*
* @return a new instance of a SOAPFactory
* @throws SOAPException if there was an error creating the default SOAPFactory
@@ -61,20 +62,23 @@
try
{
String propertyName = "javax.xml.soap.SOAPFactory";
- soapFactory = (SOAPFactory)SAAJFactoryLoader.loadFactory(propertyName, null);
+
+ Class loaderClass = Class.forName("org.jboss.ws.soap.SAAJFactoryLoader");
+ Method m = loaderClass.getMethod("loadFactory", new Class[] {String.class, String.class});
+ soapFactory = (SOAPFactory)m.invoke(null, new Object[] {propertyName, null});
}
- catch (RuntimeException rte)
+ catch (Exception rte)
{
throw new SOAPException(rte);
}
-
+
// Use the SAAJMetaFactory instance to locate the MessageFactory implementation class.
if (soapFactory == null)
{
SAAJMetaFactory saajFactory = SAAJMetaFactory.getInstance();
soapFactory = saajFactory.newSOAPFactory(SOAPConstants.DEFAULT_SOAP_PROTOCOL);
}
-
+
if (soapFactory == null)
throw new SOAPException("Failed to to determine the SOAPFactory implementation class");
}
@@ -83,10 +87,10 @@
/**
- * Creates a new SOAPFactory object that is an instance of the specified implementation, this method uses the SAAJMetaFactory
+ * Creates a new SOAPFactory object that is an instance of the specified implementation, this method uses the SAAJMetaFactory
* to locate the implementation class and create the SOAPFactory instance.
- *
- * @param protocol a string constant representing the class of the specified message factory implementation.
+ *
+ * @param protocol a string constant representing the class of the specified message factory implementation.
* May be either DYNAMIC_SOAP_PROTOCOL, DEFAULT_SOAP_PROTOCOL (which is the same as) SOAP_1_1_PROTOCOL, or SOAP_1_2_PROTOCOL.
* @throws SOAPException if there was an error creating the specified SOAPFactory
* @since SAAJ 1.3
@@ -95,13 +99,13 @@
{
SAAJMetaFactory saajFactory = SAAJMetaFactory.getInstance();
SOAPFactory factory = saajFactory.newSOAPFactory(protocol);
-
+
if (factory == null)
throw new SOAPException("Failed to to determine the SOAPFactory implementation class");
-
+
return factory;
}
-
+
/** Creates a new Detail object which serves as a container for DetailEntry objects.
*
* This factory method creates Detail objects for use in situations where it is not practical to use the SOAPFault abstraction.
@@ -112,16 +116,19 @@
public abstract Detail createDetail() throws SOAPException;
/**
- * Creates a SOAPElement object from an existing DOM Element. If the DOM Element that is passed in as an argument is already a
- * SOAPElement then this method must return it unmodified without any further work. Otherwise, a new SOAPElement is created and
- * a deep copy is made of the domElement argument. The concrete type of the return value will depend on the name of the domElement
+ * Creates a SOAPElement object from an existing DOM Element. If the DOM Element that is passed in as an argument is already a
+ * SOAPElement then this method must return it unmodified without any further work. Otherwise, a new SOAPElement is created and
+ * a deep copy is made of the domElement argument. The concrete type of the return value will depend on the name of the domElement
* argument. If any part of the tree rooted in domElement violates SOAP rules, a SOAPException will be thrown.
* @param domElement the Element to be copied.
* @return a new SOAPElement that is a copy of domElement.
* @throws SOAPException if there is an error in creating the SOAPElement object
* @since SAAJ 1.3
*/
- public abstract SOAPElement createElement(Element domElement) throws SOAPException;
+ public SOAPElement createElement(Element domElement) throws SOAPException
+ {
+ throw new IllegalArgumentException("Should be implemented by concrete implementation of this class");
+ }
/** Create a SOAPElement object initialized with the given local name.
*
@@ -150,16 +157,19 @@
public abstract SOAPElement createElement(Name name) throws SOAPException;
/**
- * Creates a SOAPElement object initialized with the given QName object.
- * The concrete type of the return value will depend on the name given to the new SOAPElement.
- * For instance, a new SOAPElement with the name "{http://www.w3.org/2003/05/soap-envelope}Envelope" would
+ * Creates a SOAPElement object initialized with the given QName object.
+ * The concrete type of the return value will depend on the name given to the new SOAPElement.
+ * For instance, a new SOAPElement with the name "{http://www.w3.org/2003/05/soap-envelope}Envelope" would
* cause a SOAPEnvelope that supports SOAP 1.2 behavior to be created.
* @param qname a QName object with the XML name for the new element
* @return the new SOAPElement object that was created
* @throws SOAPException if there is an error in creating the SOAPElement object
* @since SAAJ 1.3
*/
- public abstract SOAPElement createElement(QName qname) throws SOAPException;
+ public SOAPElement createElement(QName qname) throws SOAPException
+ {
+ throw new IllegalArgumentException("Should be implemented by concrete implementation of this class");
+ }
/**
* Creates a new SOAPFault object initialized with the given reasonText and faultCode
Modified: stack/native/trunk/src/main/java/javax/xml/soap/SOAPHeaderElement.java
===================================================================
--- stack/native/trunk/src/main/java/javax/xml/soap/SOAPHeaderElement.java 2007-09-22 12:47:12 UTC (rev 4611)
+++ stack/native/trunk/src/main/java/javax/xml/soap/SOAPHeaderElement.java 2007-09-24 08:53:53 UTC (rev 4612)
@@ -54,14 +54,14 @@
/**
* Sets the relay attribute for this SOAPHeaderElement to be either true or false.
- *
- * The SOAP relay attribute is set to true to indicate that the SOAP header block must be relayed by any node that is
- * targeted by the header block but not actually process it. This attribute is ignored on header blocks whose mustUnderstand
- * attribute is set to true or that are targeted at the ultimate reciever (which is the default).
+ *
+ * The SOAP relay attribute is set to true to indicate that the SOAP header block must be relayed by any node that is
+ * targeted by the header block but not actually process it. This attribute is ignored on header blocks whose mustUnderstand
+ * attribute is set to true or that are targeted at the ultimate reciever (which is the default).
* The default value of this attribute is false.
* @param relay the new value of the relay attribute
* @throws SOAPException if there is a problem in setting the relay attribute.
- * @throws UnsupportedOperationException if this message does not support the SOAP 1.2 concept of Relay attribute.
+ * @throws UnsupportedOperationException if this message does not support the SOAP 1.2 concept of Relay attribute.
* @since SAAJ 1.3
*/
public void setRelay(boolean relay) throws SOAPException;
@@ -74,7 +74,7 @@
*/
public String getRole();
- /**
+ /**
* Sets the Role associated with this SOAPHeaderElement object to the specified Role.
*
* @param roleURI the URI of the Role
@@ -82,7 +82,7 @@
* @throws UnsupportedOperationException if this message does not support the SOAP 1.2 concept of Fault Role
* @since SAAJ 1.3
*/
- public void setRole(String roleURI);
+ public void setRole(String roleURI) throws SOAPException;
/** Sets the actor associated with this SOAPHeaderElement object to the specified actor.
* The default value of an actor is: SOAPConstants.URI_SOAP_ACTOR_NEXT
16 years, 7 months
- 1
- 0
JBossWS SVN: r4611 - legacy/branches.
by jbossws-commits＠lists.jboss.org
Author: mageshbk(a)jboss.com
Date: 2007-09-22 08:47:12 -0400 (Sat, 22 Sep 2007)
New Revision: 4611
Added:
legacy/branches/jbossws-1.0.4.GA_JBWS-1821/
Log:
made a copy
Copied: legacy/branches/jbossws-1.0.4.GA_JBWS-1821 (from rev 4610, legacy/tags/jbossws-1.0.4.GA)
16 years, 7 months
- 1
- 0
JBossWS SVN: r4610 - stack/native/trunk.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-09-21 09:39:58 -0400 (Fri, 21 Sep 2007)
New Revision: 4610
Modified:
stack/native/trunk/version.properties
Log:
Fix version.id
Modified: stack/native/trunk/version.properties
===================================================================
--- stack/native/trunk/version.properties 2007-09-21 09:38:36 UTC (rev 4609)
+++ stack/native/trunk/version.properties 2007-09-21 13:39:58 UTC (rev 4610)
@@ -5,8 +5,8 @@
specification.vendor=JBoss (http://www.jboss.org)
specification.version=jbossws-2.0
-version.id=2.0.1.GA_SP1
-repository.id=2.0.1.GA_SP1
+version.id=2.1.0.DEV
+repository.id=snapshot
implementation.title=JBoss Web Services - Native
implementation.url=http://www.jboss.org/products/jbossws
@@ -56,6 +56,7 @@
gnu-getopt=1.0.10
hibernate=3.2.1.GA
javassist=3.5.0.CR1
+jaxbintros=1.0.0.beta2
jaxen=1.1-beta-10
jboss-common-core=2.0.2.GA
jboss-common-logging-log4j=2.0.2.GA
@@ -66,7 +67,6 @@
jboss-security=4.0.5.GA
jboss-vfs=2.0.0.Beta2
jbossas-core-libs=4.2.0.GA
-jaxbintros=1.0.0.beta2
junit=3.8.1
oswego-concurrent=1.3.4
qdox=1.4
16 years, 7 months
- 1
- 0
JBossWS SVN: r4609 - stack/native/tags/jbossws-native-2.0.1.SP1.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-09-21 05:38:36 -0400 (Fri, 21 Sep 2007)
New Revision: 4609
Modified:
stack/native/tags/jbossws-native-2.0.1.SP1/version.properties
Log:
update to jaxbintros beta2
Modified: stack/native/tags/jbossws-native-2.0.1.SP1/version.properties
===================================================================
--- stack/native/tags/jbossws-native-2.0.1.SP1/version.properties 2007-09-21 09:37:58 UTC (rev 4608)
+++ stack/native/tags/jbossws-native-2.0.1.SP1/version.properties 2007-09-21 09:38:36 UTC (rev 4609)
@@ -66,7 +66,7 @@
jboss-security=4.0.5.GA
jboss-vfs=2.0.0.Beta2
jbossas-core-libs=4.2.0.GA
-jaxbintros=1.0.0.beta1
+jaxbintros=1.0.0.beta2
junit=3.8.1
oswego-concurrent=1.3.4
qdox=1.4
16 years, 7 months
- 1
- 0
JBossWS SVN: r4608 - stack/native/tags/jbossws-native-2.0.1.SP1.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-09-21 05:37:58 -0400 (Fri, 21 Sep 2007)
New Revision: 4608
Modified:
stack/native/tags/jbossws-native-2.0.1.SP1/version.properties
Log:
fix version info
Modified: stack/native/tags/jbossws-native-2.0.1.SP1/version.properties
===================================================================
--- stack/native/tags/jbossws-native-2.0.1.SP1/version.properties 2007-09-21 09:08:32 UTC (rev 4607)
+++ stack/native/tags/jbossws-native-2.0.1.SP1/version.properties 2007-09-21 09:37:58 UTC (rev 4608)
@@ -5,8 +5,8 @@
specification.vendor=JBoss (http://www.jboss.org)
specification.version=jbossws-2.0
-version.id=2.0.1.GA_SP1
-repository.id=2.0.1.GA_SP1
+version.id=2.0.1.SP1
+repository.id=2.0.1.SP1
implementation.title=JBoss Web Services - Native
implementation.url=http://www.jboss.org/products/jbossws
16 years, 7 months
- 1
- 0
JBossWS SVN: r4607 - projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-09-21 05:08:32 -0400 (Fri, 21 Sep 2007)
New Revision: 4607
Modified:
projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/XmlAccessorTypeHandler.java
projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/XmlAttributeHandler.java
projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/XmlElementHandler.java
projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/XmlRootElementHandler.java
projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/XmlTypeHandler.java
Log:
Don't use parent classloader to create proxy. Breaks with AS 5
Modified: projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/XmlAccessorTypeHandler.java
===================================================================
--- projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/XmlAccessorTypeHandler.java 2007-09-21 09:07:56 UTC (rev 4606)
+++ projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/XmlAccessorTypeHandler.java 2007-09-21 09:08:32 UTC (rev 4607)
@@ -47,7 +47,7 @@
public static Annotation createProxy(XmlAccessorTypeIntro xmlAccessorTypeIntro)
{
- return (Annotation)Proxy.newProxyInstance(XmlAccessorType.class.getClassLoader(),
+ return (Annotation)Proxy.newProxyInstance(XmlAccessorTypeIntro.class.getClassLoader(),
new Class[]{XmlAccessorType.class, ClassValue.class},
new XmlAccessorTypeHandler(xmlAccessorTypeIntro));
}
Modified: projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/XmlAttributeHandler.java
===================================================================
--- projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/XmlAttributeHandler.java 2007-09-21 09:07:56 UTC (rev 4606)
+++ projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/XmlAttributeHandler.java 2007-09-21 09:08:32 UTC (rev 4607)
@@ -42,7 +42,7 @@
public static Annotation createProxy(XmlAttributeIntro xmlAttributeIntro)
{
- return (Annotation)Proxy.newProxyInstance(XmlAttribute.class.getClassLoader(),
+ return (Annotation)Proxy.newProxyInstance(XmlAttributeIntro.class.getClassLoader(),
new Class[]{XmlAttribute.class},
new XmlAttributeHandler(xmlAttributeIntro));
}
Modified: projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/XmlElementHandler.java
===================================================================
--- projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/XmlElementHandler.java 2007-09-21 09:07:56 UTC (rev 4606)
+++ projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/XmlElementHandler.java 2007-09-21 09:08:32 UTC (rev 4607)
@@ -43,7 +43,7 @@
public static Annotation createProxy(XmlElementIntro xmlElementIntro)
{
- return (Annotation)Proxy.newProxyInstance(XmlElement.class.getClassLoader(),
+ return (Annotation)Proxy.newProxyInstance(XmlElementIntro.class.getClassLoader(),
new Class[]{XmlElement.class, ClassValue.class},
new XmlElementHandler(xmlElementIntro));
}
Modified: projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/XmlRootElementHandler.java
===================================================================
--- projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/XmlRootElementHandler.java 2007-09-21 09:07:56 UTC (rev 4606)
+++ projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/XmlRootElementHandler.java 2007-09-21 09:08:32 UTC (rev 4607)
@@ -46,7 +46,7 @@
public static Annotation createProxy(XmlRootElementIntro xmlRootElementIntro)
{
- return (Annotation)Proxy.newProxyInstance(XmlRootElement.class.getClassLoader(),
+ return (Annotation)Proxy.newProxyInstance(XmlRootElementIntro.class.getClassLoader(),
new Class[]{XmlRootElement.class, ClassValue.class},
new XmlRootElementHandler(xmlRootElementIntro));
}
Modified: projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/XmlTypeHandler.java
===================================================================
--- projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/XmlTypeHandler.java 2007-09-21 09:07:56 UTC (rev 4606)
+++ projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/XmlTypeHandler.java 2007-09-21 09:08:32 UTC (rev 4607)
@@ -46,7 +46,7 @@
public static Annotation createProxy(XmlTypeIntro xmlTypeIntro)
{
- return (Annotation)Proxy.newProxyInstance(XmlType.class.getClassLoader(),
+ return (Annotation)Proxy.newProxyInstance(XmlTypeIntro.class.getClassLoader(),
new Class[]{XmlType.class, ClassValue.class},
new XmlTypeHandler(xmlTypeIntro));
}
16 years, 7 months
- 1
- 0
JBossWS SVN: r4606 - in projects/jaxbintros: ant-import and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-09-21 05:07:56 -0400 (Fri, 21 Sep 2007)
New Revision: 4606
Added:
projects/jaxbintros/src/main/resources/jboss-jaxb-intros.jar/
Removed:
projects/jaxbintros/src/main/resources/jboss-jaxb-intro.jar/
Modified:
projects/jaxbintros/ant-import/build-release.xml
projects/jaxbintros/build.xml
Log:
Fix release targets
Modified: projects/jaxbintros/ant-import/build-release.xml
===================================================================
--- projects/jaxbintros/ant-import/build-release.xml 2007-09-21 09:07:11 UTC (rev 4605)
+++ projects/jaxbintros/ant-import/build-release.xml 2007-09-21 09:07:56 UTC (rev 4606)
@@ -19,10 +19,10 @@
<!-- jboss/jbossws-jboss42 -->
<property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/>
- <mkdir dir="${jboss.repository.dir}/jbossws-jboss42/${repository.id}/lib"/>
- <copy todir="${jboss.repository.dir}/jbossws-jboss42/${repository.id}/lib" overwrite="true">
+ <mkdir dir="${jboss.repository.dir}/jaxbintros/${repository.id}/lib"/>
+ <copy todir="${jboss.repository.dir}/jaxbintros/${repository.id}/lib" overwrite="true">
<fileset dir="${jaxbintro.dir}/output/lib">
- <include name="jboss-jaxb-intro.jar"/>
+ <include name="jboss-jaxb-intros.jar"/>
<include name="jboss-jaxb-intro-src.zip"/>
</fileset>
</copy>
Modified: projects/jaxbintros/build.xml
===================================================================
--- projects/jaxbintros/build.xml 2007-09-21 09:07:11 UTC (rev 4605)
+++ projects/jaxbintros/build.xml 2007-09-21 09:07:56 UTC (rev 4606)
@@ -104,11 +104,11 @@
<!-- Build jbossws-jboss42.jar -->
<mkdir dir="${jaxbintro.output.lib.dir}"/>
- <jar jarfile="${jaxbintro.output.lib.dir}/jboss-jaxb-intro.jar" manifest="${jaxbintro.output.etc.dir}/default.mf">
+ <jar jarfile="${jaxbintro.output.lib.dir}/jboss-jaxb-intros.jar" manifest="${jaxbintro.output.etc.dir}/default.mf">
<fileset dir="${jaxbintro.output.classes.dir}">
<include name="org/jboss/jaxb/**"/>
</fileset>
- <metainf dir="${jaxbintro.resources.dir}/jboss-jaxb-intro.jar/META-INF"/>
+ <metainf dir="${jaxbintro.resources.dir}/jboss-jaxb-intros.jar/META-INF"/>
</jar>
<!-- Build jbossws-jboss42-src.zip -->
Copied: projects/jaxbintros/src/main/resources/jboss-jaxb-intros.jar (from rev 4601, projects/jaxbintros/src/main/resources/jboss-jaxb-intro.jar)
16 years, 7 months
- 1
- 0
JBossWS SVN: r4605 - stack/native/trunk.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-09-21 05:07:11 -0400 (Fri, 21 Sep 2007)
New Revision: 4605
Modified:
stack/native/trunk/version.properties
Log:
Update jaxbintros to beta2. Fixes a classloading problem with AS 5
Modified: stack/native/trunk/version.properties
===================================================================
--- stack/native/trunk/version.properties 2007-09-21 08:39:58 UTC (rev 4604)
+++ stack/native/trunk/version.properties 2007-09-21 09:07:11 UTC (rev 4605)
@@ -66,7 +66,7 @@
jboss-security=4.0.5.GA
jboss-vfs=2.0.0.Beta2
jbossas-core-libs=4.2.0.GA
-jaxbintros=1.0.0.beta1
+jaxbintros=1.0.0.beta2
junit=3.8.1
oswego-concurrent=1.3.4
qdox=1.4
16 years, 7 months
- 1
- 0
JBossWS SVN: r4604 - in projects/jaxbintros/src/main/java/org/jboss/jaxb/intros: configmodel and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-09-21 04:39:58 -0400 (Fri, 21 Sep 2007)
New Revision: 4604
Modified:
projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/ConfigurationException.java
projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/IntroductionsAnnotationReader.java
projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/IntroductionsConfigParser.java
projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/ClassIntroConfig.java
projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/ClassMemberIntroConfig.java
projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/FieldIntroConfig.java
projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/JaxbIntros.java
projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/MethodIntroConfig.java
projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/ObjectFactory.java
projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/XmlAccessorTypeIntro.java
projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/XmlAttributeIntro.java
projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/XmlElementIntro.java
projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/XmlRootElementIntro.java
projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/XmlTypeIntro.java
projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/package-info.java
projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/ClassValue.java
projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/XmlAccessorTypeHandler.java
projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/XmlAttributeHandler.java
projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/XmlElementHandler.java
projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/XmlRootElementHandler.java
projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/XmlTypeHandler.java
Log:
reformat code
Modified: projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/ConfigurationException.java
===================================================================
--- projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/ConfigurationException.java 2007-09-21 08:38:24 UTC (rev 4603)
+++ projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/ConfigurationException.java 2007-09-21 08:39:58 UTC (rev 4604)
@@ -23,14 +23,18 @@
/**
* JAXB Introductions configuration error.
- *
+ *
* @author <a href="mailto:tom.fennelly@jboss.com">tom.fennelly(a)jboss.com</a>
*/
-public class ConfigurationException extends RuntimeException {
- public ConfigurationException(String message) {
- super(message);
- }
- public ConfigurationException(String message, Throwable cause) {
- super(message, cause);
- }
+public class ConfigurationException extends RuntimeException
+{
+ public ConfigurationException(String message)
+ {
+ super(message);
+ }
+
+ public ConfigurationException(String message, Throwable cause)
+ {
+ super(message, cause);
+ }
}
Modified: projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/IntroductionsAnnotationReader.java
===================================================================
--- projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/IntroductionsAnnotationReader.java 2007-09-21 08:38:24 UTC (rev 4603)
+++ projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/IntroductionsAnnotationReader.java 2007-09-21 08:39:58 UTC (rev 4604)
@@ -46,325 +46,417 @@
*
* @author <a href="mailto:tom.fennelly@jboss.com">tom.fennelly(a)jboss.com</a>
*/
-public class IntroductionsAnnotationReader extends AbstractInlineAnnotationReaderImpl<Type,Class,Field,Method> implements RuntimeAnnotationReader {
+public class IntroductionsAnnotationReader extends AbstractInlineAnnotationReaderImpl<Type, Class, Field, Method> implements RuntimeAnnotationReader
+{
- private static final Log logger = LogFactory.getLog(IntroductionsAnnotationReader.class);
- private RuntimeAnnotationReader baseReader = new RuntimeInlineAnnotationReader();
- private JaxbIntros introductions;
+ private static final Log logger = LogFactory.getLog(IntroductionsAnnotationReader.class);
+ private RuntimeAnnotationReader baseReader = new RuntimeInlineAnnotationReader();
+ private JaxbIntros introductions;
- public IntroductionsAnnotationReader(JaxbIntros introductions) {
- if(introductions == null) {
- throw new IllegalArgumentException("arg 'introductions' is null.");
- }
- this.introductions = introductions;
- }
+ public IntroductionsAnnotationReader(JaxbIntros introductions)
+ {
+ if (introductions == null)
+ {
+ throw new IllegalArgumentException("arg 'introductions' is null.");
+ }
+ this.introductions = introductions;
+ }
- public <A extends Annotation> A getFieldAnnotation(Class<A> annotation, Field field, Locatable srcPos) {
- Annotation proxy = getProxy(annotation, field);
+ public <A extends Annotation> A getFieldAnnotation(Class<A> annotation, Field field, Locatable srcPos)
+ {
+ Annotation proxy = getProxy(annotation, field);
- if(proxy != null) {
- return (A) proxy;
- }
+ if (proxy != null)
+ {
+ return (A)proxy;
+ }
- return LocatableAnnotation.create(field.getAnnotation(annotation),srcPos);
- }
+ return LocatableAnnotation.create(field.getAnnotation(annotation), srcPos);
+ }
- public boolean hasFieldAnnotation(Class<? extends Annotation> annotationType, Field field) {
- FieldIntroConfig fieldIntroConfig = getFieldIntroConfig(field);
+ public boolean hasFieldAnnotation(Class<? extends Annotation> annotationType, Field field)
+ {
+ FieldIntroConfig fieldIntroConfig = getFieldIntroConfig(field);
- if(fieldIntroConfig != null) {
- return isMemberAnnotationIntroAvailable(annotationType, fieldIntroConfig);
- }
+ if (fieldIntroConfig != null)
+ {
+ return isMemberAnnotationIntroAvailable(annotationType, fieldIntroConfig);
+ }
- return field.isAnnotationPresent(annotationType);
- }
+ return field.isAnnotationPresent(annotationType);
+ }
- public Annotation[] getAllFieldAnnotations(Field field, Locatable srcPos) {
- return getAllAnnotations(field, srcPos);
- }
+ public Annotation[] getAllFieldAnnotations(Field field, Locatable srcPos)
+ {
+ return getAllAnnotations(field, srcPos);
+ }
- public <A extends Annotation> A getMethodAnnotation(Class<A> annotation, Method method, Locatable srcPos) {
- Annotation proxy = getProxy(annotation, method);
+ public <A extends Annotation> A getMethodAnnotation(Class<A> annotation, Method method, Locatable srcPos)
+ {
+ Annotation proxy = getProxy(annotation, method);
- if(proxy != null) {
- return (A) proxy;
- }
+ if (proxy != null)
+ {
+ return (A)proxy;
+ }
- return LocatableAnnotation.create(method.getAnnotation(annotation),srcPos);
- }
+ return LocatableAnnotation.create(method.getAnnotation(annotation), srcPos);
+ }
- public boolean hasMethodAnnotation(Class<? extends Annotation> annotation, Method method) {
- MethodIntroConfig methodAnnotations = getMethodIntroConfig(method);
+ public boolean hasMethodAnnotation(Class<? extends Annotation> annotation, Method method)
+ {
+ MethodIntroConfig methodAnnotations = getMethodIntroConfig(method);
- if(methodAnnotations != null) {
- return isMemberAnnotationIntroAvailable(annotation, methodAnnotations);
- }
+ if (methodAnnotations != null)
+ {
+ return isMemberAnnotationIntroAvailable(annotation, methodAnnotations);
+ }
- return method.isAnnotationPresent(annotation);
- }
+ return method.isAnnotationPresent(annotation);
+ }
- public Annotation[] getAllMethodAnnotations(Method method, Locatable srcPos) {
- return getAllAnnotations(method, srcPos);
- }
+ public Annotation[] getAllMethodAnnotations(Method method, Locatable srcPos)
+ {
+ return getAllAnnotations(method, srcPos);
+ }
- public <A extends Annotation> A getMethodParameterAnnotation(Class<A> annotation, Method method, int paramIndex, Locatable srcPos) {
- return baseReader.getMethodParameterAnnotation(annotation, method, paramIndex, srcPos);
- }
+ public <A extends Annotation> A getMethodParameterAnnotation(Class<A> annotation, Method method, int paramIndex, Locatable srcPos)
+ {
+ return baseReader.getMethodParameterAnnotation(annotation, method, paramIndex, srcPos);
+ }
- public <A extends Annotation> A getClassAnnotation(Class<A> annotation, Class clazz, Locatable srcPos) {
- Annotation proxy = getProxy(annotation, clazz);
+ public <A extends Annotation> A getClassAnnotation(Class<A> annotation, Class clazz, Locatable srcPos)
+ {
+ Annotation proxy = getProxy(annotation, clazz);
- if(proxy != null) {
- return (A) proxy;
- }
+ if (proxy != null)
+ {
+ return (A)proxy;
+ }
- return LocatableAnnotation.create(((Class<?>)clazz).getAnnotation(annotation),srcPos);
- }
+ return LocatableAnnotation.create(((Class<?>)clazz).getAnnotation(annotation), srcPos);
+ }
- public boolean hasClassAnnotation(Class clazz, Class<? extends Annotation> annotationType) {
- ClassIntroConfig classAnnotations = getClassIntroConfig(clazz);
+ public boolean hasClassAnnotation(Class clazz, Class<? extends Annotation> annotationType)
+ {
+ ClassIntroConfig classAnnotations = getClassIntroConfig(clazz);
- if(classAnnotations != null) {
- return isClassAnnotationIntroAvailable(annotationType, classAnnotations);
- }
+ if (classAnnotations != null)
+ {
+ return isClassAnnotationIntroAvailable(annotationType, classAnnotations);
+ }
- return clazz.isAnnotationPresent(annotationType);
- }
+ return clazz.isAnnotationPresent(annotationType);
+ }
- public <A extends Annotation> A getPackageAnnotation(Class<A> a, Class clazz, Locatable srcPos) {
- return baseReader.getPackageAnnotation(a, clazz, srcPos);
- }
+ public <A extends Annotation> A getPackageAnnotation(Class<A> a, Class clazz, Locatable srcPos)
+ {
+ return baseReader.getPackageAnnotation(a, clazz, srcPos);
+ }
- public Class getClassValue(Annotation a, String name) {
- if(a instanceof ClassValue) {
- return ((ClassValue)a).getClassValue(a, name);
- }
- return (Class) baseReader.getClassValue(a, name);
- }
+ public Class getClassValue(Annotation a, String name)
+ {
+ if (a instanceof ClassValue)
+ {
+ return ((ClassValue)a).getClassValue(a, name);
+ }
+ return (Class)baseReader.getClassValue(a, name);
+ }
- public Class[] getClassArrayValue(Annotation a, String name) {
- if(a instanceof ClassValue) {
- return ((ClassValue)a).getClassArrayValue(a, name);
- }
- return (Class[]) baseReader.getClassArrayValue(a, name);
- }
+ public Class[] getClassArrayValue(Annotation a, String name)
+ {
+ if (a instanceof ClassValue)
+ {
+ return ((ClassValue)a).getClassArrayValue(a, name);
+ }
+ return (Class[])baseReader.getClassArrayValue(a, name);
+ }
- protected String fullName(Method m) {
- return m.getDeclaringClass().getName()+'#'+m.getName();
- }
+ protected String fullName(Method m)
+ {
+ return m.getDeclaringClass().getName() + '#' + m.getName();
+ }
- private ClassIntroConfig getClassIntroConfig(Class clazz) {
- String className = clazz.getName();
- ClassIntroConfig globalIntro = null;
+ private ClassIntroConfig getClassIntroConfig(Class clazz)
+ {
+ String className = clazz.getName();
+ ClassIntroConfig globalIntro = null;
- for(ClassIntroConfig classIntro : introductions.getClazz()) {
- if(classIntro.getName().equals(className)) {
- return classIntro;
- } else if(globalIntro == null && isRegexMatch(className, classIntro.getName())) {
- globalIntro = classIntro;
- }
- }
+ for (ClassIntroConfig classIntro : introductions.getClazz())
+ {
+ if (classIntro.getName().equals(className))
+ {
+ return classIntro;
+ }
+ else if (globalIntro == null && isRegexMatch(className, classIntro.getName()))
+ {
+ globalIntro = classIntro;
+ }
+ }
- return globalIntro;
- }
+ return globalIntro;
+ }
- private FieldIntroConfig getFieldIntroConfig(Field field) {
- ClassIntroConfig classIntroConfig = getClassIntroConfig(field.getDeclaringClass());
+ private FieldIntroConfig getFieldIntroConfig(Field field)
+ {
+ ClassIntroConfig classIntroConfig = getClassIntroConfig(field.getDeclaringClass());
- if(classIntroConfig != null) {
- String fieldName = field.getName();
+ if (classIntroConfig != null)
+ {
+ String fieldName = field.getName();
- for(FieldIntroConfig fieldIntro : classIntroConfig.getField()) {
- if(fieldIntro.getName().equals(fieldName)) {
- return fieldIntro;
- } else if(isRegexMatch(fieldName, fieldIntro.getName())) {
- return fieldIntro;
- }
+ for (FieldIntroConfig fieldIntro : classIntroConfig.getField())
+ {
+ if (fieldIntro.getName().equals(fieldName))
+ {
+ return fieldIntro;
}
- }
+ else if (isRegexMatch(fieldName, fieldIntro.getName()))
+ {
+ return fieldIntro;
+ }
+ }
+ }
- return null;
- }
+ return null;
+ }
- private MethodIntroConfig getMethodIntroConfig(Method method) {
- ClassIntroConfig classIntroConfig = getClassIntroConfig(method.getDeclaringClass());
+ private MethodIntroConfig getMethodIntroConfig(Method method)
+ {
+ ClassIntroConfig classIntroConfig = getClassIntroConfig(method.getDeclaringClass());
- if(classIntroConfig != null) {
- String methodName = method.getName();
+ if (classIntroConfig != null)
+ {
+ String methodName = method.getName();
- for(MethodIntroConfig methodIntro : classIntroConfig.getMethod()) {
- if(methodIntro.getName().equals(methodName)) {
- return methodIntro;
- } else if(isRegexMatch(methodName, methodIntro.getName())) {
- return methodIntro;
- }
+ for (MethodIntroConfig methodIntro : classIntroConfig.getMethod())
+ {
+ if (methodIntro.getName().equals(methodName))
+ {
+ return methodIntro;
}
- }
+ else if (isRegexMatch(methodName, methodIntro.getName()))
+ {
+ return methodIntro;
+ }
+ }
+ }
- return null;
- }
+ return null;
+ }
- private static Map<String, Pattern> patternCache = new HashMap<String, Pattern>();
- private boolean isRegexMatch(String string, String regex) {
- Pattern pattern = patternCache.get(regex);
+ private static Map<String, Pattern> patternCache = new HashMap<String, Pattern>();
- if(pattern == null) {
- try {
- pattern = Pattern.compile(regex);
- } catch(Exception e) {
- logger.warn("Error compiling '" + regex + "' as a regular expression: " + e.getMessage());
- return false;
- }
- patternCache.put(regex, pattern);
- }
+ private boolean isRegexMatch(String string, String regex)
+ {
+ Pattern pattern = patternCache.get(regex);
- return pattern.matcher(string).matches();
- }
+ if (pattern == null)
+ {
+ try
+ {
+ pattern = Pattern.compile(regex);
+ }
+ catch (Exception e)
+ {
+ logger.warn("Error compiling '" + regex + "' as a regular expression: " + e.getMessage());
+ return false;
+ }
+ patternCache.put(regex, pattern);
+ }
- private Annotation getMemberAnnotationProxy(Class annotation, ClassMemberIntroConfig memberIntroConfig) {
- Annotation proxy = null;
+ return pattern.matcher(string).matches();
+ }
- if(annotation == javax.xml.bind.annotation.XmlAttribute.class) {
- XmlAttributeIntro xmlAttributeIntro = memberIntroConfig.getXmlAttribute();
- if(xmlAttributeIntro != null) {
- proxy = XmlAttributeHandler.createProxy(xmlAttributeIntro);
- }
- } else if(annotation == javax.xml.bind.annotation.XmlElement.class) {
- XmlElementIntro xmlElementIntro = memberIntroConfig.getXmlElement();
- if(xmlElementIntro != null) {
- proxy = XmlElementHandler.createProxy(xmlElementIntro);
- }
- }
+ private Annotation getMemberAnnotationProxy(Class annotation, ClassMemberIntroConfig memberIntroConfig)
+ {
+ Annotation proxy = null;
- return proxy;
- }
+ if (annotation == javax.xml.bind.annotation.XmlAttribute.class)
+ {
+ XmlAttributeIntro xmlAttributeIntro = memberIntroConfig.getXmlAttribute();
+ if (xmlAttributeIntro != null)
+ {
+ proxy = XmlAttributeHandler.createProxy(xmlAttributeIntro);
+ }
+ }
+ else if (annotation == javax.xml.bind.annotation.XmlElement.class)
+ {
+ XmlElementIntro xmlElementIntro = memberIntroConfig.getXmlElement();
+ if (xmlElementIntro != null)
+ {
+ proxy = XmlElementHandler.createProxy(xmlElementIntro);
+ }
+ }
- private Annotation getClassAnnotationProxy(Class annotation, ClassIntroConfig classIntroConfig) {
- Annotation proxy = null;
+ return proxy;
+ }
- if(annotation == javax.xml.bind.annotation.XmlAccessorType.class) {
- XmlAccessorTypeIntro xmlAccessorTypeIntro = classIntroConfig.getXmlAccessorType();
- if(xmlAccessorTypeIntro != null) {
- proxy = XmlAccessorTypeHandler.createProxy(xmlAccessorTypeIntro);
- }
- } else if(annotation == javax.xml.bind.annotation.XmlType.class) {
- XmlTypeIntro xmlTypeIntro = classIntroConfig.getXmlType();
- if(xmlTypeIntro != null) {
- proxy = XmlTypeHandler.createProxy(xmlTypeIntro);
- }
- } else if(annotation == javax.xml.bind.annotation.XmlRootElement.class) {
- XmlRootElementIntro xmlRootElementIntro = classIntroConfig.getXmlRootElement();
- if(xmlRootElementIntro != null) {
- proxy = XmlRootElementHandler.createProxy(xmlRootElementIntro);
- }
- }
+ private Annotation getClassAnnotationProxy(Class annotation, ClassIntroConfig classIntroConfig)
+ {
+ Annotation proxy = null;
- return proxy;
- }
+ if (annotation == javax.xml.bind.annotation.XmlAccessorType.class)
+ {
+ XmlAccessorTypeIntro xmlAccessorTypeIntro = classIntroConfig.getXmlAccessorType();
+ if (xmlAccessorTypeIntro != null)
+ {
+ proxy = XmlAccessorTypeHandler.createProxy(xmlAccessorTypeIntro);
+ }
+ }
+ else if (annotation == javax.xml.bind.annotation.XmlType.class)
+ {
+ XmlTypeIntro xmlTypeIntro = classIntroConfig.getXmlType();
+ if (xmlTypeIntro != null)
+ {
+ proxy = XmlTypeHandler.createProxy(xmlTypeIntro);
+ }
+ }
+ else if (annotation == javax.xml.bind.annotation.XmlRootElement.class)
+ {
+ XmlRootElementIntro xmlRootElementIntro = classIntroConfig.getXmlRootElement();
+ if (xmlRootElementIntro != null)
+ {
+ proxy = XmlRootElementHandler.createProxy(xmlRootElementIntro);
+ }
+ }
- private boolean isMemberAnnotationIntroAvailable(Class<? extends Annotation> annotation, ClassMemberIntroConfig memberIntroConfig) {
- if(annotation == javax.xml.bind.annotation.XmlAttribute.class) {
- return (memberIntroConfig.getXmlAttribute() != null);
- } else if(annotation == javax.xml.bind.annotation.XmlElement.class) {
- return (memberIntroConfig.getXmlElement() != null);
- }
+ return proxy;
+ }
- return false;
- }
+ private boolean isMemberAnnotationIntroAvailable(Class<? extends Annotation> annotation, ClassMemberIntroConfig memberIntroConfig)
+ {
+ if (annotation == javax.xml.bind.annotation.XmlAttribute.class)
+ {
+ return (memberIntroConfig.getXmlAttribute() != null);
+ }
+ else if (annotation == javax.xml.bind.annotation.XmlElement.class)
+ {
+ return (memberIntroConfig.getXmlElement() != null);
+ }
- private boolean isClassAnnotationIntroAvailable(Class<? extends Annotation> annotation, ClassIntroConfig classIntroConfig) {
- if(annotation == javax.xml.bind.annotation.XmlType.class) {
- return (classIntroConfig.getXmlType() != null);
- } else if(annotation == javax.xml.bind.annotation.XmlAccessorType.class) {
- return (classIntroConfig.getXmlAccessorType() != null);
- } else if(annotation == javax.xml.bind.annotation.XmlRootElement.class) {
- return (classIntroConfig.getXmlRootElement() != null);
- }
+ return false;
+ }
- return false;
- }
+ private boolean isClassAnnotationIntroAvailable(Class<? extends Annotation> annotation, ClassIntroConfig classIntroConfig)
+ {
+ if (annotation == javax.xml.bind.annotation.XmlType.class)
+ {
+ return (classIntroConfig.getXmlType() != null);
+ }
+ else if (annotation == javax.xml.bind.annotation.XmlAccessorType.class)
+ {
+ return (classIntroConfig.getXmlAccessorType() != null);
+ }
+ else if (annotation == javax.xml.bind.annotation.XmlRootElement.class)
+ {
+ return (classIntroConfig.getXmlRootElement() != null);
+ }
- private Annotation[] getAllAnnotations(Member member, Locatable srcPos) {
- Annotation[] r = ((AnnotatedElement)member).getAnnotations();
- List<Annotation> annotations = new ArrayList<Annotation>();
+ return false;
+ }
- for( int i = 0; i < r.length; i++ ) {
- Class<? extends Object> annType = r[i].getClass();
- if(annType == XmlAttribute.class || annType == XmlElement.class) {
- // We'll handle these explicitly (below)!!
- continue;
- }
- annotations.add(LocatableAnnotation.create(r[i], srcPos));
- }
+ private Annotation[] getAllAnnotations(Member member, Locatable srcPos)
+ {
+ Annotation[] r = ((AnnotatedElement)member).getAnnotations();
+ List<Annotation> annotations = new ArrayList<Annotation>();
- // Now we explicitly handle the supported Introduction annotations...
- ClassMemberIntroConfig memberIntroConfig = null;
- if(member instanceof Field) {
- memberIntroConfig = getFieldIntroConfig((Field)member);
- } else if(member instanceof Method) {
- memberIntroConfig = getMethodIntroConfig((Method)member);
- }
- if(memberIntroConfig != null) {
- addMemberAnnotation(XmlAttribute.class, memberIntroConfig, annotations, member, srcPos);
- addMemberAnnotation(XmlElement.class, memberIntroConfig, annotations, member, srcPos);
- }
+ for (int i = 0; i < r.length; i++)
+ {
+ Class<? extends Object> annType = r[i].getClass();
+ if (annType == XmlAttribute.class || annType == XmlElement.class)
+ {
+ // We'll handle these explicitly (below)!!
+ continue;
+ }
+ annotations.add(LocatableAnnotation.create(r[i], srcPos));
+ }
- r = annotations.toArray(new Annotation[annotations.size()]);
+ // Now we explicitly handle the supported Introduction annotations...
+ ClassMemberIntroConfig memberIntroConfig = null;
+ if (member instanceof Field)
+ {
+ memberIntroConfig = getFieldIntroConfig((Field)member);
+ }
+ else if (member instanceof Method)
+ {
+ memberIntroConfig = getMethodIntroConfig((Method)member);
+ }
+ if (memberIntroConfig != null)
+ {
+ addMemberAnnotation(XmlAttribute.class, memberIntroConfig, annotations, member, srcPos);
+ addMemberAnnotation(XmlElement.class, memberIntroConfig, annotations, member, srcPos);
+ }
- return r;
- }
+ r = annotations.toArray(new Annotation[annotations.size()]);
- private void addMemberAnnotation(Class annotationType, ClassMemberIntroConfig memberIntroConfig, List<Annotation> annotations, Member member, Locatable srcPos) {
- Annotation annotation = getMemberAnnotationProxy(annotationType, memberIntroConfig);
- if(annotation != null) {
- annotations.add(annotation);
- } else {
- annotation = ((AnnotatedElement)member).getAnnotation(annotationType);
- if(annotation != null) {
- annotations.add(LocatableAnnotation.create(annotation, srcPos));
- }
- }
- }
+ return r;
+ }
- private Annotation getProxy(Class annotation, Field field) {
- FieldIntroConfig fieldIntroConfig = getFieldIntroConfig(field);
+ private void addMemberAnnotation(Class annotationType, ClassMemberIntroConfig memberIntroConfig, List<Annotation> annotations, Member member, Locatable srcPos)
+ {
+ Annotation annotation = getMemberAnnotationProxy(annotationType, memberIntroConfig);
+ if (annotation != null)
+ {
+ annotations.add(annotation);
+ }
+ else
+ {
+ annotation = ((AnnotatedElement)member).getAnnotation(annotationType);
+ if (annotation != null)
+ {
+ annotations.add(LocatableAnnotation.create(annotation, srcPos));
+ }
+ }
+ }
- if(fieldIntroConfig != null) {
- Annotation proxy = getMemberAnnotationProxy(annotation, fieldIntroConfig);
- if(proxy != null) {
- return proxy;
- }
- }
+ private Annotation getProxy(Class annotation, Field field)
+ {
+ FieldIntroConfig fieldIntroConfig = getFieldIntroConfig(field);
- return null;
- }
+ if (fieldIntroConfig != null)
+ {
+ Annotation proxy = getMemberAnnotationProxy(annotation, fieldIntroConfig);
+ if (proxy != null)
+ {
+ return proxy;
+ }
+ }
- private Annotation getProxy(Class annotation, Method method) {
- MethodIntroConfig methodIntroConfig = getMethodIntroConfig(method);
+ return null;
+ }
- if(methodIntroConfig != null) {
- Annotation proxy = getMemberAnnotationProxy(annotation, methodIntroConfig);
- if(proxy != null) {
- return proxy;
- }
- }
+ private Annotation getProxy(Class annotation, Method method)
+ {
+ MethodIntroConfig methodIntroConfig = getMethodIntroConfig(method);
- return null;
- }
+ if (methodIntroConfig != null)
+ {
+ Annotation proxy = getMemberAnnotationProxy(annotation, methodIntroConfig);
+ if (proxy != null)
+ {
+ return proxy;
+ }
+ }
- private Annotation getProxy(Class annotation, Class clazz) {
- ClassIntroConfig classIntroConfig = getClassIntroConfig(clazz);
+ return null;
+ }
- if(classIntroConfig != null) {
- Annotation proxy = getClassAnnotationProxy(annotation, classIntroConfig);
- if(proxy != null) {
- return proxy;
- }
- }
+ private Annotation getProxy(Class annotation, Class clazz)
+ {
+ ClassIntroConfig classIntroConfig = getClassIntroConfig(clazz);
- return null;
- }
+ if (classIntroConfig != null)
+ {
+ Annotation proxy = getClassAnnotationProxy(annotation, classIntroConfig);
+ if (proxy != null)
+ {
+ return proxy;
+ }
+ }
+ return null;
+ }
-
+
}
Modified: projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/IntroductionsConfigParser.java
===================================================================
--- projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/IntroductionsConfigParser.java 2007-09-21 08:38:24 UTC (rev 4603)
+++ projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/IntroductionsConfigParser.java 2007-09-21 08:39:58 UTC (rev 4604)
@@ -28,26 +28,31 @@
/**
* Configuration Parser for a JBossESB JAXB Annotations Introduction Configuration.
- *
+ *
* @author <a href="mailto:tom.fennelly@jboss.com">tom.fennelly(a)jboss.com</a>
*/
-public abstract class IntroductionsConfigParser {
+public abstract class IntroductionsConfigParser
+{
- /**
- * Parse a JAXB Annotations Introduction Configuration stream.
- *
- * @param config The configuration stream.
- * @return The configuration model.
- * @throws ConfigurationException Bad configuration.
- */
- public static JaxbIntros parseConfig(InputStream config) throws ConfigurationException {
- try {
- JAXBContext jaxbContext = JAXBContext.newInstance(JaxbIntros.class);
- Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
+ /**
+ * Parse a JAXB Annotations Introduction Configuration stream.
+ *
+ * @param config The configuration stream.
+ * @return The configuration model.
+ * @throws ConfigurationException Bad configuration.
+ */
+ public static JaxbIntros parseConfig(InputStream config) throws ConfigurationException
+ {
+ try
+ {
+ JAXBContext jaxbContext = JAXBContext.newInstance(JaxbIntros.class);
+ Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
- return (JaxbIntros) unmarshaller.unmarshal(config);
- } catch (JAXBException e) {
- throw new ConfigurationException("Bad JAXB Annotations Introduction Configuration.", e);
- }
- }
+ return (JaxbIntros)unmarshaller.unmarshal(config);
+ }
+ catch (JAXBException e)
+ {
+ throw new ConfigurationException("Bad JAXB Annotations Introduction Configuration.", e);
+ }
+ }
}
\ No newline at end of file
Modified: projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/ClassIntroConfig.java
===================================================================
--- projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/ClassIntroConfig.java 2007-09-21 08:38:24 UTC (rev 4603)
+++ projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/ClassIntroConfig.java 2007-09-21 08:39:58 UTC (rev 4604)
@@ -20,9 +20,9 @@
/**
* <p>Java class for Class complex type.
- *
+ * <p/>
* <p>The following schema fragment specifies the expected content contained within this class.
- *
+ * <p/>
* <pre>
* <complexType name="Class">
* <complexContent>
@@ -39,185 +39,176 @@
* </complexContent>
* </complexType>
* </pre>
- *
- *
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "Class", propOrder = {
- "xmlAccessorType",
- "xmlType",
- "xmlRootElement",
- "field",
- "method"
-})
-public class ClassIntroConfig {
+ "xmlAccessorType",
+ "xmlType",
+ "xmlRootElement",
+ "field",
+ "method"
+ })
+public class ClassIntroConfig
+{
- @XmlElement(name = "XmlAccessorType")
- protected XmlAccessorTypeIntro xmlAccessorType;
- @XmlElement(name = "XmlType")
- protected XmlTypeIntro xmlType;
- @XmlElement(name = "XmlRootElement")
- protected XmlRootElementIntro xmlRootElement;
- @XmlElement(name = "Field")
- protected List<FieldIntroConfig> field;
- @XmlElement(name = "Method")
- protected List<MethodIntroConfig> method;
- @XmlAttribute(required = true)
- @XmlSchemaType(name = "anySimpleType")
- protected String name;
+ @XmlElement(name = "XmlAccessorType")
+ protected XmlAccessorTypeIntro xmlAccessorType;
+ @XmlElement(name = "XmlType")
+ protected XmlTypeIntro xmlType;
+ @XmlElement(name = "XmlRootElement")
+ protected XmlRootElementIntro xmlRootElement;
+ @XmlElement(name = "Field")
+ protected List<FieldIntroConfig> field;
+ @XmlElement(name = "Method")
+ protected List<MethodIntroConfig> method;
+ @XmlAttribute(required = true)
+ @XmlSchemaType(name = "anySimpleType")
+ protected String name;
- /**
- * Gets the value of the xmlAccessorType property.
- *
- * @return
- * possible object is
- * {@link XmlAccessorTypeIntro }
- *
- */
- public XmlAccessorTypeIntro getXmlAccessorType() {
- return xmlAccessorType;
- }
+ /**
+ * Gets the value of the xmlAccessorType property.
+ *
+ * @return possible object is
+ * {@link XmlAccessorTypeIntro }
+ */
+ public XmlAccessorTypeIntro getXmlAccessorType()
+ {
+ return xmlAccessorType;
+ }
- /**
- * Sets the value of the xmlAccessorType property.
- *
- * @param value
- * allowed object is
- * {@link XmlAccessorTypeIntro }
- *
- */
- public void setXmlAccessorType(XmlAccessorTypeIntro value) {
- this.xmlAccessorType = value;
- }
+ /**
+ * Sets the value of the xmlAccessorType property.
+ *
+ * @param value allowed object is
+ * {@link XmlAccessorTypeIntro }
+ */
+ public void setXmlAccessorType(XmlAccessorTypeIntro value)
+ {
+ this.xmlAccessorType = value;
+ }
- /**
- * Gets the value of the xmlType property.
- *
- * @return
- * possible object is
- * {@link XmlTypeIntro }
- *
- */
- public XmlTypeIntro getXmlType() {
- return xmlType;
- }
+ /**
+ * Gets the value of the xmlType property.
+ *
+ * @return possible object is
+ * {@link XmlTypeIntro }
+ */
+ public XmlTypeIntro getXmlType()
+ {
+ return xmlType;
+ }
- /**
- * Sets the value of the xmlType property.
- *
- * @param value
- * allowed object is
- * {@link XmlTypeIntro }
- *
- */
- public void setXmlType(XmlTypeIntro value) {
- this.xmlType = value;
- }
+ /**
+ * Sets the value of the xmlType property.
+ *
+ * @param value allowed object is
+ * {@link XmlTypeIntro }
+ */
+ public void setXmlType(XmlTypeIntro value)
+ {
+ this.xmlType = value;
+ }
- /**
- * Gets the value of the xmlRootElement property.
- *
- * @return
- * possible object is
- * {@link XmlRootElementIntro }
- *
- */
- public XmlRootElementIntro getXmlRootElement() {
- return xmlRootElement;
- }
+ /**
+ * Gets the value of the xmlRootElement property.
+ *
+ * @return possible object is
+ * {@link XmlRootElementIntro }
+ */
+ public XmlRootElementIntro getXmlRootElement()
+ {
+ return xmlRootElement;
+ }
- /**
- * Sets the value of the xmlRootElement property.
- *
- * @param value
- * allowed object is
- * {@link XmlRootElementIntro }
- *
- */
- public void setXmlRootElement(XmlRootElementIntro value) {
- this.xmlRootElement = value;
- }
+ /**
+ * Sets the value of the xmlRootElement property.
+ *
+ * @param value allowed object is
+ * {@link XmlRootElementIntro }
+ */
+ public void setXmlRootElement(XmlRootElementIntro value)
+ {
+ this.xmlRootElement = value;
+ }
- /**
- * Gets the value of the field property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the field property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getField().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link FieldIntroConfig }
- *
- *
- */
- public List<FieldIntroConfig> getField() {
- if (field == null) {
- field = new ArrayList<FieldIntroConfig>();
- }
- return this.field;
- }
+ /**
+ * Gets the value of the field property.
+ * <p/>
+ * <p/>
+ * This accessor method returns a reference to the live list,
+ * not a snapshot. Therefore any modification you make to the
+ * returned list will be present inside the JAXB object.
+ * This is why there is not a <CODE>set</CODE> method for the field property.
+ * <p/>
+ * <p/>
+ * For example, to add a new item, do as follows:
+ * <pre>
+ * getField().add(newItem);
+ * </pre>
+ * <p/>
+ * <p/>
+ * <p/>
+ * Objects of the following type(s) are allowed in the list
+ * {@link FieldIntroConfig }
+ */
+ public List<FieldIntroConfig> getField()
+ {
+ if (field == null)
+ {
+ field = new ArrayList<FieldIntroConfig>();
+ }
+ return this.field;
+ }
- /**
- * Gets the value of the method property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the method property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getMethod().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link MethodIntroConfig }
- *
- *
- */
- public List<MethodIntroConfig> getMethod() {
- if (method == null) {
- method = new ArrayList<MethodIntroConfig>();
- }
- return this.method;
- }
+ /**
+ * Gets the value of the method property.
+ * <p/>
+ * <p/>
+ * This accessor method returns a reference to the live list,
+ * not a snapshot. Therefore any modification you make to the
+ * returned list will be present inside the JAXB object.
+ * This is why there is not a <CODE>set</CODE> method for the method property.
+ * <p/>
+ * <p/>
+ * For example, to add a new item, do as follows:
+ * <pre>
+ * getMethod().add(newItem);
+ * </pre>
+ * <p/>
+ * <p/>
+ * <p/>
+ * Objects of the following type(s) are allowed in the list
+ * {@link MethodIntroConfig }
+ */
+ public List<MethodIntroConfig> getMethod()
+ {
+ if (method == null)
+ {
+ method = new ArrayList<MethodIntroConfig>();
+ }
+ return this.method;
+ }
- /**
- * Gets the value of the name property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getName() {
- return name;
- }
+ /**
+ * Gets the value of the name property.
+ *
+ * @return possible object is
+ * {@link String }
+ */
+ public String getName()
+ {
+ return name;
+ }
- /**
- * Sets the value of the name property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setName(String value) {
- this.name = value;
- }
+ /**
+ * Sets the value of the name property.
+ *
+ * @param value allowed object is
+ * {@link String }
+ */
+ public void setName(String value)
+ {
+ this.name = value;
+ }
}
Modified: projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/ClassMemberIntroConfig.java
===================================================================
--- projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/ClassMemberIntroConfig.java 2007-09-21 08:38:24 UTC (rev 4603)
+++ projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/ClassMemberIntroConfig.java 2007-09-21 08:39:58 UTC (rev 4604)
@@ -19,11 +19,11 @@
/**
* Java Class Member (Field, Method Constructor) JAXB Annotation Introductions configuration base type.
- *
+ * <p/>
* <p>Java class for class-member-intro-config complex type.
- *
+ * <p/>
* <p>The following schema fragment specifies the expected content contained within this class.
- *
+ * <p/>
* <pre>
* <complexType name="class-member-intro-config">
* <complexContent>
@@ -37,98 +37,91 @@
* </complexContent>
* </complexType>
* </pre>
- *
- *
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "class-member-intro-config", propOrder = {
- "xmlElement",
- "xmlAttribute"
-})
+ "xmlElement",
+ "xmlAttribute"
+ })
@XmlSeeAlso({
- MethodIntroConfig.class,
- FieldIntroConfig.class
-})
-public class ClassMemberIntroConfig {
+ MethodIntroConfig.class,
+ FieldIntroConfig.class
+ })
+public class ClassMemberIntroConfig
+{
- @XmlElement(name = "XmlElement")
- protected XmlElementIntro xmlElement;
- @XmlElement(name = "XmlAttribute")
- protected XmlAttributeIntro xmlAttribute;
- @XmlAttribute(required = true)
- @XmlSchemaType(name = "anySimpleType")
- protected String name;
+ @XmlElement(name = "XmlElement")
+ protected XmlElementIntro xmlElement;
+ @XmlElement(name = "XmlAttribute")
+ protected XmlAttributeIntro xmlAttribute;
+ @XmlAttribute(required = true)
+ @XmlSchemaType(name = "anySimpleType")
+ protected String name;
- /**
- * Gets the value of the xmlElement property.
- *
- * @return
- * possible object is
- * {@link XmlElementIntro }
- *
- */
- public XmlElementIntro getXmlElement() {
- return xmlElement;
- }
+ /**
+ * Gets the value of the xmlElement property.
+ *
+ * @return possible object is
+ * {@link XmlElementIntro }
+ */
+ public XmlElementIntro getXmlElement()
+ {
+ return xmlElement;
+ }
- /**
- * Sets the value of the xmlElement property.
- *
- * @param value
- * allowed object is
- * {@link XmlElementIntro }
- *
- */
- public void setXmlElement(XmlElementIntro value) {
- this.xmlElement = value;
- }
+ /**
+ * Sets the value of the xmlElement property.
+ *
+ * @param value allowed object is
+ * {@link XmlElementIntro }
+ */
+ public void setXmlElement(XmlElementIntro value)
+ {
+ this.xmlElement = value;
+ }
- /**
- * Gets the value of the xmlAttribute property.
- *
- * @return
- * possible object is
- * {@link XmlAttributeIntro }
- *
- */
- public XmlAttributeIntro getXmlAttribute() {
- return xmlAttribute;
- }
+ /**
+ * Gets the value of the xmlAttribute property.
+ *
+ * @return possible object is
+ * {@link XmlAttributeIntro }
+ */
+ public XmlAttributeIntro getXmlAttribute()
+ {
+ return xmlAttribute;
+ }
- /**
- * Sets the value of the xmlAttribute property.
- *
- * @param value
- * allowed object is
- * {@link XmlAttributeIntro }
- *
- */
- public void setXmlAttribute(XmlAttributeIntro value) {
- this.xmlAttribute = value;
- }
+ /**
+ * Sets the value of the xmlAttribute property.
+ *
+ * @param value allowed object is
+ * {@link XmlAttributeIntro }
+ */
+ public void setXmlAttribute(XmlAttributeIntro value)
+ {
+ this.xmlAttribute = value;
+ }
- /**
- * Gets the value of the name property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getName() {
- return name;
- }
+ /**
+ * Gets the value of the name property.
+ *
+ * @return possible object is
+ * {@link String }
+ */
+ public String getName()
+ {
+ return name;
+ }
- /**
- * Sets the value of the name property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setName(String value) {
- this.name = value;
- }
+ /**
+ * Sets the value of the name property.
+ *
+ * @param value allowed object is
+ * {@link String }
+ */
+ public void setName(String value)
+ {
+ this.name = value;
+ }
}
Modified: projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/FieldIntroConfig.java
===================================================================
--- projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/FieldIntroConfig.java 2007-09-21 08:38:24 UTC (rev 4603)
+++ projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/FieldIntroConfig.java 2007-09-21 08:39:58 UTC (rev 4604)
@@ -15,9 +15,9 @@
/**
* <p>Java class for Field complex type.
- *
+ * <p/>
* <p>The following schema fragment specifies the expected content contained within this class.
- *
+ * <p/>
* <pre>
* <complexType name="Field">
* <complexContent>
@@ -26,13 +26,11 @@
* </complexContent>
* </complexType>
* </pre>
- *
- *
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "Field")
public class FieldIntroConfig
- extends ClassMemberIntroConfig
+ extends ClassMemberIntroConfig
{
Modified: projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/JaxbIntros.java
===================================================================
--- projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/JaxbIntros.java 2007-09-21 08:38:24 UTC (rev 4603)
+++ projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/JaxbIntros.java 2007-09-21 08:39:58 UTC (rev 4604)
@@ -21,9 +21,9 @@
/**
* <p>Java class for anonymous complex type.
- *
+ * <p/>
* <p>The following schema fragment specifies the expected content contained within this class.
- *
+ * <p/>
* <pre>
* <complexType>
* <complexContent>
@@ -36,73 +36,70 @@
* </complexContent>
* </complexType>
* </pre>
- *
- *
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {
- "clazz"
-})
+ "clazz"
+ })
@XmlRootElement(name = "jaxb-intros")
-public class JaxbIntros {
+public class JaxbIntros
+{
- @XmlElement(name = "Class", required = true)
- protected List<ClassIntroConfig> clazz;
- @XmlAttribute(name = "default-namespace")
- @XmlSchemaType(name = "anySimpleType")
- protected String defaultNamespace;
+ @XmlElement(name = "Class", required = true)
+ protected List<ClassIntroConfig> clazz;
+ @XmlAttribute(name = "default-namespace")
+ @XmlSchemaType(name = "anySimpleType")
+ protected String defaultNamespace;
- /**
- * Gets the value of the clazz property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the clazz property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getClazz().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link ClassIntroConfig }
- *
- *
- */
- public List<ClassIntroConfig> getClazz() {
- if (clazz == null) {
- clazz = new ArrayList<ClassIntroConfig>();
- }
- return this.clazz;
- }
+ /**
+ * Gets the value of the clazz property.
+ * <p/>
+ * <p/>
+ * This accessor method returns a reference to the live list,
+ * not a snapshot. Therefore any modification you make to the
+ * returned list will be present inside the JAXB object.
+ * This is why there is not a <CODE>set</CODE> method for the clazz property.
+ * <p/>
+ * <p/>
+ * For example, to add a new item, do as follows:
+ * <pre>
+ * getClazz().add(newItem);
+ * </pre>
+ * <p/>
+ * <p/>
+ * <p/>
+ * Objects of the following type(s) are allowed in the list
+ * {@link ClassIntroConfig }
+ */
+ public List<ClassIntroConfig> getClazz()
+ {
+ if (clazz == null)
+ {
+ clazz = new ArrayList<ClassIntroConfig>();
+ }
+ return this.clazz;
+ }
- /**
- * Gets the value of the defaultNamespace property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getDefaultNamespace() {
- return defaultNamespace;
- }
+ /**
+ * Gets the value of the defaultNamespace property.
+ *
+ * @return possible object is
+ * {@link String }
+ */
+ public String getDefaultNamespace()
+ {
+ return defaultNamespace;
+ }
- /**
- * Sets the value of the defaultNamespace property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setDefaultNamespace(String value) {
- this.defaultNamespace = value;
- }
+ /**
+ * Sets the value of the defaultNamespace property.
+ *
+ * @param value allowed object is
+ * {@link String }
+ */
+ public void setDefaultNamespace(String value)
+ {
+ this.defaultNamespace = value;
+ }
}
Modified: projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/MethodIntroConfig.java
===================================================================
--- projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/MethodIntroConfig.java 2007-09-21 08:38:24 UTC (rev 4603)
+++ projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/MethodIntroConfig.java 2007-09-21 08:39:58 UTC (rev 4604)
@@ -15,9 +15,9 @@
/**
* <p>Java class for Method complex type.
- *
+ * <p/>
* <p>The following schema fragment specifies the expected content contained within this class.
- *
+ * <p/>
* <pre>
* <complexType name="Method">
* <complexContent>
@@ -26,13 +26,11 @@
* </complexContent>
* </complexType>
* </pre>
- *
- *
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "Method")
public class MethodIntroConfig
- extends ClassMemberIntroConfig
+ extends ClassMemberIntroConfig
{
Modified: projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/ObjectFactory.java
===================================================================
--- projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/ObjectFactory.java 2007-09-21 08:38:24 UTC (rev 4603)
+++ projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/ObjectFactory.java 2007-09-21 08:39:58 UTC (rev 4604)
@@ -15,198 +15,198 @@
/**
- * This object contains factory methods for each
- * Java content interface and Java element interface
- * generated in the org.jboss.jaxb.intros.configmodel package.
- * <p>An ObjectFactory allows you to programatically
- * construct new instances of the Java representation
- * for XML content. The Java representation of XML
- * content can consist of schema derived interfaces
- * and classes representing the binding of schema
- * type definitions, element declarations and model
- * groups. Factory methods for each of these are
+ * This object contains factory methods for each
+ * Java content interface and Java element interface
+ * generated in the org.jboss.jaxb.intros.configmodel package.
+ * <p>An ObjectFactory allows you to programatically
+ * construct new instances of the Java representation
+ * for XML content. The Java representation of XML
+ * content can consist of schema derived interfaces
+ * and classes representing the binding of schema
+ * type definitions, element declarations and model
+ * groups. Factory methods for each of these are
* provided in this class.
- *
*/
@XmlRegistry
-public class ObjectFactory {
+public class ObjectFactory
+{
- private final static QName _XmlElement_QNAME = new QName("http://www.jboss.org/xsd/jaxb/intros", "XmlElement");
- private final static QName _XmlRootElement_QNAME = new QName("http://www.jboss.org/xsd/jaxb/intros", "XmlRootElement");
- private final static QName _Class_QNAME = new QName("http://www.jboss.org/xsd/jaxb/intros", "Class");
- private final static QName _XmlType_QNAME = new QName("http://www.jboss.org/xsd/jaxb/intros", "XmlType");
- private final static QName _XmlAttribute_QNAME = new QName("http://www.jboss.org/xsd/jaxb/intros", "XmlAttribute");
- private final static QName _Method_QNAME = new QName("http://www.jboss.org/xsd/jaxb/intros", "Method");
- private final static QName _Field_QNAME = new QName("http://www.jboss.org/xsd/jaxb/intros", "Field");
- private final static QName _XmlAccessorType_QNAME = new QName("http://www.jboss.org/xsd/jaxb/intros", "XmlAccessorType");
- private final static QName _ClassMemberIntroConfig_QNAME = new QName("http://www.jboss.org/xsd/jaxb/intros", "class-member-intro-config");
+ private final static QName _XmlElement_QNAME = new QName("http://www.jboss.org/xsd/jaxb/intros", "XmlElement");
+ private final static QName _XmlRootElement_QNAME = new QName("http://www.jboss.org/xsd/jaxb/intros", "XmlRootElement");
+ private final static QName _Class_QNAME = new QName("http://www.jboss.org/xsd/jaxb/intros", "Class");
+ private final static QName _XmlType_QNAME = new QName("http://www.jboss.org/xsd/jaxb/intros", "XmlType");
+ private final static QName _XmlAttribute_QNAME = new QName("http://www.jboss.org/xsd/jaxb/intros", "XmlAttribute");
+ private final static QName _Method_QNAME = new QName("http://www.jboss.org/xsd/jaxb/intros", "Method");
+ private final static QName _Field_QNAME = new QName("http://www.jboss.org/xsd/jaxb/intros", "Field");
+ private final static QName _XmlAccessorType_QNAME = new QName("http://www.jboss.org/xsd/jaxb/intros", "XmlAccessorType");
+ private final static QName _ClassMemberIntroConfig_QNAME = new QName("http://www.jboss.org/xsd/jaxb/intros", "class-member-intro-config");
- /**
- * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.jboss.jaxb.intros.configmodel
- *
- */
- public ObjectFactory() {
- }
+ /**
+ * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.jboss.jaxb.intros.configmodel
+ */
+ public ObjectFactory()
+ {
+ }
- /**
- * Create an instance of {@link ClassIntroConfig }
- *
- */
- public ClassIntroConfig createClassIntroConfig() {
- return new ClassIntroConfig();
- }
+ /**
+ * Create an instance of {@link ClassIntroConfig }
+ */
+ public ClassIntroConfig createClassIntroConfig()
+ {
+ return new ClassIntroConfig();
+ }
- /**
- * Create an instance of {@link FieldIntroConfig }
- *
- */
- public FieldIntroConfig createFieldIntroConfig() {
- return new FieldIntroConfig();
- }
+ /**
+ * Create an instance of {@link FieldIntroConfig }
+ */
+ public FieldIntroConfig createFieldIntroConfig()
+ {
+ return new FieldIntroConfig();
+ }
- /**
- * Create an instance of {@link XmlAttributeIntro }
- *
- */
- public XmlAttributeIntro createXmlAttributeIntro() {
- return new XmlAttributeIntro();
- }
+ /**
+ * Create an instance of {@link XmlAttributeIntro }
+ */
+ public XmlAttributeIntro createXmlAttributeIntro()
+ {
+ return new XmlAttributeIntro();
+ }
- /**
- * Create an instance of {@link JaxbIntros }
- *
- */
- public JaxbIntros createJaxbIntros() {
- return new JaxbIntros();
- }
+ /**
+ * Create an instance of {@link JaxbIntros }
+ */
+ public JaxbIntros createJaxbIntros()
+ {
+ return new JaxbIntros();
+ }
- /**
- * Create an instance of {@link XmlRootElementIntro }
- *
- */
- public XmlRootElementIntro createXmlRootElementIntro() {
- return new XmlRootElementIntro();
- }
+ /**
+ * Create an instance of {@link XmlRootElementIntro }
+ */
+ public XmlRootElementIntro createXmlRootElementIntro()
+ {
+ return new XmlRootElementIntro();
+ }
- /**
- * Create an instance of {@link XmlElementIntro }
- *
- */
- public XmlElementIntro createXmlElementIntro() {
- return new XmlElementIntro();
- }
+ /**
+ * Create an instance of {@link XmlElementIntro }
+ */
+ public XmlElementIntro createXmlElementIntro()
+ {
+ return new XmlElementIntro();
+ }
- /**
- * Create an instance of {@link MethodIntroConfig }
- *
- */
- public MethodIntroConfig createMethodIntroConfig() {
- return new MethodIntroConfig();
- }
+ /**
+ * Create an instance of {@link MethodIntroConfig }
+ */
+ public MethodIntroConfig createMethodIntroConfig()
+ {
+ return new MethodIntroConfig();
+ }
- /**
- * Create an instance of {@link ClassMemberIntroConfig }
- *
- */
- public ClassMemberIntroConfig createClassMemberIntroConfig() {
- return new ClassMemberIntroConfig();
- }
+ /**
+ * Create an instance of {@link ClassMemberIntroConfig }
+ */
+ public ClassMemberIntroConfig createClassMemberIntroConfig()
+ {
+ return new ClassMemberIntroConfig();
+ }
- /**
- * Create an instance of {@link XmlTypeIntro }
- *
- */
- public XmlTypeIntro createXmlTypeIntro() {
- return new XmlTypeIntro();
- }
+ /**
+ * Create an instance of {@link XmlTypeIntro }
+ */
+ public XmlTypeIntro createXmlTypeIntro()
+ {
+ return new XmlTypeIntro();
+ }
- /**
- * Create an instance of {@link XmlAccessorTypeIntro }
- *
- */
- public XmlAccessorTypeIntro createXmlAccessorTypeIntro() {
- return new XmlAccessorTypeIntro();
- }
+ /**
+ * Create an instance of {@link XmlAccessorTypeIntro }
+ */
+ public XmlAccessorTypeIntro createXmlAccessorTypeIntro()
+ {
+ return new XmlAccessorTypeIntro();
+ }
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link XmlElementIntro }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://www.jboss.org/xsd/jaxb/intros", name = "XmlElement")
- public JAXBElement<XmlElementIntro> createXmlElement(XmlElementIntro value) {
- return new JAXBElement<XmlElementIntro>(_XmlElement_QNAME, XmlElementIntro.class, null, value);
- }
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link XmlElementIntro }{@code >}}
+ */
+ @XmlElementDecl(namespace = "http://www.jboss.org/xsd/jaxb/intros", name = "XmlElement")
+ public JAXBElement<XmlElementIntro> createXmlElement(XmlElementIntro value)
+ {
+ return new JAXBElement<XmlElementIntro>(_XmlElement_QNAME, XmlElementIntro.class, null, value);
+ }
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link XmlRootElementIntro }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://www.jboss.org/xsd/jaxb/intros", name = "XmlRootElement")
- public JAXBElement<XmlRootElementIntro> createXmlRootElement(XmlRootElementIntro value) {
- return new JAXBElement<XmlRootElementIntro>(_XmlRootElement_QNAME, XmlRootElementIntro.class, null, value);
- }
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link XmlRootElementIntro }{@code >}}
+ */
+ @XmlElementDecl(namespace = "http://www.jboss.org/xsd/jaxb/intros", name = "XmlRootElement")
+ public JAXBElement<XmlRootElementIntro> createXmlRootElement(XmlRootElementIntro value)
+ {
+ return new JAXBElement<XmlRootElementIntro>(_XmlRootElement_QNAME, XmlRootElementIntro.class, null, value);
+ }
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link ClassIntroConfig }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://www.jboss.org/xsd/jaxb/intros", name = "Class")
- public JAXBElement<ClassIntroConfig> createClass(ClassIntroConfig value) {
- return new JAXBElement<ClassIntroConfig>(_Class_QNAME, ClassIntroConfig.class, null, value);
- }
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link ClassIntroConfig }{@code >}}
+ */
+ @XmlElementDecl(namespace = "http://www.jboss.org/xsd/jaxb/intros", name = "Class")
+ public JAXBElement<ClassIntroConfig> createClass(ClassIntroConfig value)
+ {
+ return new JAXBElement<ClassIntroConfig>(_Class_QNAME, ClassIntroConfig.class, null, value);
+ }
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link XmlTypeIntro }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://www.jboss.org/xsd/jaxb/intros", name = "XmlType")
- public JAXBElement<XmlTypeIntro> createXmlType(XmlTypeIntro value) {
- return new JAXBElement<XmlTypeIntro>(_XmlType_QNAME, XmlTypeIntro.class, null, value);
- }
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link XmlTypeIntro }{@code >}}
+ */
+ @XmlElementDecl(namespace = "http://www.jboss.org/xsd/jaxb/intros", name = "XmlType")
+ public JAXBElement<XmlTypeIntro> createXmlType(XmlTypeIntro value)
+ {
+ return new JAXBElement<XmlTypeIntro>(_XmlType_QNAME, XmlTypeIntro.class, null, value);
+ }
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link XmlAttributeIntro }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://www.jboss.org/xsd/jaxb/intros", name = "XmlAttribute")
- public JAXBElement<XmlAttributeIntro> createXmlAttribute(XmlAttributeIntro value) {
- return new JAXBElement<XmlAttributeIntro>(_XmlAttribute_QNAME, XmlAttributeIntro.class, null, value);
- }
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link XmlAttributeIntro }{@code >}}
+ */
+ @XmlElementDecl(namespace = "http://www.jboss.org/xsd/jaxb/intros", name = "XmlAttribute")
+ public JAXBElement<XmlAttributeIntro> createXmlAttribute(XmlAttributeIntro value)
+ {
+ return new JAXBElement<XmlAttributeIntro>(_XmlAttribute_QNAME, XmlAttributeIntro.class, null, value);
+ }
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link MethodIntroConfig }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://www.jboss.org/xsd/jaxb/intros", name = "Method", substitutionHeadNamespace = "http://www.jboss.org/xsd/jaxb/intros", substitutionHeadName = "class-member-intro-config")
- public JAXBElement<MethodIntroConfig> createMethod(MethodIntroConfig value) {
- return new JAXBElement<MethodIntroConfig>(_Method_QNAME, MethodIntroConfig.class, null, value);
- }
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link MethodIntroConfig }{@code >}}
+ */
+ @XmlElementDecl(namespace = "http://www.jboss.org/xsd/jaxb/intros", name = "Method", substitutionHeadNamespace = "http://www.jboss.org/xsd/jaxb/intros", substitutionHeadName = "class-member-intro-config")
+ public JAXBElement<MethodIntroConfig> createMethod(MethodIntroConfig value)
+ {
+ return new JAXBElement<MethodIntroConfig>(_Method_QNAME, MethodIntroConfig.class, null, value);
+ }
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link FieldIntroConfig }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://www.jboss.org/xsd/jaxb/intros", name = "Field", substitutionHeadNamespace = "http://www.jboss.org/xsd/jaxb/intros", substitutionHeadName = "class-member-intro-config")
- public JAXBElement<FieldIntroConfig> createField(FieldIntroConfig value) {
- return new JAXBElement<FieldIntroConfig>(_Field_QNAME, FieldIntroConfig.class, null, value);
- }
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link FieldIntroConfig }{@code >}}
+ */
+ @XmlElementDecl(namespace = "http://www.jboss.org/xsd/jaxb/intros", name = "Field", substitutionHeadNamespace = "http://www.jboss.org/xsd/jaxb/intros", substitutionHeadName = "class-member-intro-config")
+ public JAXBElement<FieldIntroConfig> createField(FieldIntroConfig value)
+ {
+ return new JAXBElement<FieldIntroConfig>(_Field_QNAME, FieldIntroConfig.class, null, value);
+ }
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link XmlAccessorTypeIntro }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://www.jboss.org/xsd/jaxb/intros", name = "XmlAccessorType")
- public JAXBElement<XmlAccessorTypeIntro> createXmlAccessorType(XmlAccessorTypeIntro value) {
- return new JAXBElement<XmlAccessorTypeIntro>(_XmlAccessorType_QNAME, XmlAccessorTypeIntro.class, null, value);
- }
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link XmlAccessorTypeIntro }{@code >}}
+ */
+ @XmlElementDecl(namespace = "http://www.jboss.org/xsd/jaxb/intros", name = "XmlAccessorType")
+ public JAXBElement<XmlAccessorTypeIntro> createXmlAccessorType(XmlAccessorTypeIntro value)
+ {
+ return new JAXBElement<XmlAccessorTypeIntro>(_XmlAccessorType_QNAME, XmlAccessorTypeIntro.class, null, value);
+ }
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link Object }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://www.jboss.org/xsd/jaxb/intros", name = "class-member-intro-config")
- public JAXBElement<Object> createClassMemberIntroConfig(Object value) {
- return new JAXBElement<Object>(_ClassMemberIntroConfig_QNAME, Object.class, null, value);
- }
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link Object }{@code >}}
+ */
+ @XmlElementDecl(namespace = "http://www.jboss.org/xsd/jaxb/intros", name = "class-member-intro-config")
+ public JAXBElement<Object> createClassMemberIntroConfig(Object value)
+ {
+ return new JAXBElement<Object>(_ClassMemberIntroConfig_QNAME, Object.class, null, value);
+ }
}
Modified: projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/XmlAccessorTypeIntro.java
===================================================================
--- projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/XmlAccessorTypeIntro.java 2007-09-21 08:38:24 UTC (rev 4603)
+++ projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/XmlAccessorTypeIntro.java 2007-09-21 08:39:58 UTC (rev 4604)
@@ -18,9 +18,9 @@
/**
* <p>Java class for XmlAccessorType complex type.
- *
+ * <p/>
* <p>The following schema fragment specifies the expected content contained within this class.
- *
+ * <p/>
* <pre>
* <complexType name="XmlAccessorType">
* <complexContent>
@@ -39,43 +39,43 @@
* </complexContent>
* </complexType>
* </pre>
- *
- *
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "XmlAccessorType")
-public class XmlAccessorTypeIntro {
+public class XmlAccessorTypeIntro
+{
- @XmlAttribute
- @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
- protected String value;
+ @XmlAttribute
+ @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+ protected String value;
- /**
- * Gets the value of the value property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getValue() {
- if (value == null) {
- return "NONE";
- } else {
- return value;
- }
- }
+ /**
+ * Gets the value of the value property.
+ *
+ * @return possible object is
+ * {@link String }
+ */
+ public String getValue()
+ {
+ if (value == null)
+ {
+ return "NONE";
+ }
+ else
+ {
+ return value;
+ }
+ }
- /**
- * Sets the value of the value property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setValue(String value) {
- this.value = value;
- }
+ /**
+ * Sets the value of the value property.
+ *
+ * @param value allowed object is
+ * {@link String }
+ */
+ public void setValue(String value)
+ {
+ this.value = value;
+ }
}
Modified: projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/XmlAttributeIntro.java
===================================================================
--- projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/XmlAttributeIntro.java 2007-09-21 08:38:24 UTC (rev 4603)
+++ projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/XmlAttributeIntro.java 2007-09-21 08:39:58 UTC (rev 4604)
@@ -17,9 +17,9 @@
/**
* <p>Java class for XmlAttribute complex type.
- *
+ * <p/>
* <p>The following schema fragment specifies the expected content contained within this class.
- *
+ * <p/>
* <pre>
* <complexType name="XmlAttribute">
* <complexContent>
@@ -31,104 +31,106 @@
* </complexContent>
* </complexType>
* </pre>
- *
- *
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "XmlAttribute")
-public class XmlAttributeIntro {
+public class XmlAttributeIntro
+{
- @XmlAttribute
- @XmlSchemaType(name = "anySimpleType")
- protected String name;
- @XmlAttribute
- protected Boolean required;
- @XmlAttribute
- @XmlSchemaType(name = "anySimpleType")
- protected String namespace;
+ @XmlAttribute
+ @XmlSchemaType(name = "anySimpleType")
+ protected String name;
+ @XmlAttribute
+ protected Boolean required;
+ @XmlAttribute
+ @XmlSchemaType(name = "anySimpleType")
+ protected String namespace;
- /**
- * Gets the value of the name property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getName() {
- if (name == null) {
- return "##default";
- } else {
- return name;
- }
- }
+ /**
+ * Gets the value of the name property.
+ *
+ * @return possible object is
+ * {@link String }
+ */
+ public String getName()
+ {
+ if (name == null)
+ {
+ return "##default";
+ }
+ else
+ {
+ return name;
+ }
+ }
- /**
- * Sets the value of the name property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setName(String value) {
- this.name = value;
- }
+ /**
+ * Sets the value of the name property.
+ *
+ * @param value allowed object is
+ * {@link String }
+ */
+ public void setName(String value)
+ {
+ this.name = value;
+ }
- /**
- * Gets the value of the required property.
- *
- * @return
- * possible object is
- * {@link Boolean }
- *
- */
- public boolean isRequired() {
- if (required == null) {
- return false;
- } else {
- return required;
- }
- }
+ /**
+ * Gets the value of the required property.
+ *
+ * @return possible object is
+ * {@link Boolean }
+ */
+ public boolean isRequired()
+ {
+ if (required == null)
+ {
+ return false;
+ }
+ else
+ {
+ return required;
+ }
+ }
- /**
- * Sets the value of the required property.
- *
- * @param value
- * allowed object is
- * {@link Boolean }
- *
- */
- public void setRequired(Boolean value) {
- this.required = value;
- }
+ /**
+ * Sets the value of the required property.
+ *
+ * @param value allowed object is
+ * {@link Boolean }
+ */
+ public void setRequired(Boolean value)
+ {
+ this.required = value;
+ }
- /**
- * Gets the value of the namespace property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getNamespace() {
- if (namespace == null) {
- return "##default";
- } else {
- return namespace;
- }
- }
+ /**
+ * Gets the value of the namespace property.
+ *
+ * @return possible object is
+ * {@link String }
+ */
+ public String getNamespace()
+ {
+ if (namespace == null)
+ {
+ return "##default";
+ }
+ else
+ {
+ return namespace;
+ }
+ }
- /**
- * Sets the value of the namespace property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setNamespace(String value) {
- this.namespace = value;
- }
+ /**
+ * Sets the value of the namespace property.
+ *
+ * @param value allowed object is
+ * {@link String }
+ */
+ public void setNamespace(String value)
+ {
+ this.namespace = value;
+ }
}
Modified: projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/XmlElementIntro.java
===================================================================
--- projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/XmlElementIntro.java 2007-09-21 08:38:24 UTC (rev 4603)
+++ projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/XmlElementIntro.java 2007-09-21 08:39:58 UTC (rev 4604)
@@ -17,9 +17,9 @@
/**
* <p>Java class for XmlElement complex type.
- *
+ * <p/>
* <p>The following schema fragment specifies the expected content contained within this class.
- *
+ * <p/>
* <pre>
* <complexType name="XmlElement">
* <complexContent>
@@ -34,188 +34,187 @@
* </complexContent>
* </complexType>
* </pre>
- *
- *
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "XmlElement")
-public class XmlElementIntro {
+public class XmlElementIntro
+{
- @XmlAttribute
- @XmlSchemaType(name = "anySimpleType")
- protected String name;
- @XmlAttribute
- protected Boolean nillable;
- @XmlAttribute
- protected Boolean required;
- @XmlAttribute
- @XmlSchemaType(name = "anySimpleType")
- protected String namespace;
- @XmlAttribute
- @XmlSchemaType(name = "anySimpleType")
- protected String defaultValue;
- @XmlAttribute
- @XmlSchemaType(name = "anySimpleType")
- protected String type;
+ @XmlAttribute
+ @XmlSchemaType(name = "anySimpleType")
+ protected String name;
+ @XmlAttribute
+ protected Boolean nillable;
+ @XmlAttribute
+ protected Boolean required;
+ @XmlAttribute
+ @XmlSchemaType(name = "anySimpleType")
+ protected String namespace;
+ @XmlAttribute
+ @XmlSchemaType(name = "anySimpleType")
+ protected String defaultValue;
+ @XmlAttribute
+ @XmlSchemaType(name = "anySimpleType")
+ protected String type;
- /**
- * Gets the value of the name property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getName() {
- if (name == null) {
- return "##default";
- } else {
- return name;
- }
- }
+ /**
+ * Gets the value of the name property.
+ *
+ * @return possible object is
+ * {@link String }
+ */
+ public String getName()
+ {
+ if (name == null)
+ {
+ return "##default";
+ }
+ else
+ {
+ return name;
+ }
+ }
- /**
- * Sets the value of the name property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setName(String value) {
- this.name = value;
- }
+ /**
+ * Sets the value of the name property.
+ *
+ * @param value allowed object is
+ * {@link String }
+ */
+ public void setName(String value)
+ {
+ this.name = value;
+ }
- /**
- * Gets the value of the nillable property.
- *
- * @return
- * possible object is
- * {@link Boolean }
- *
- */
- public boolean isNillable() {
- if (nillable == null) {
- return false;
- } else {
- return nillable;
- }
- }
+ /**
+ * Gets the value of the nillable property.
+ *
+ * @return possible object is
+ * {@link Boolean }
+ */
+ public boolean isNillable()
+ {
+ if (nillable == null)
+ {
+ return false;
+ }
+ else
+ {
+ return nillable;
+ }
+ }
- /**
- * Sets the value of the nillable property.
- *
- * @param value
- * allowed object is
- * {@link Boolean }
- *
- */
- public void setNillable(Boolean value) {
- this.nillable = value;
- }
+ /**
+ * Sets the value of the nillable property.
+ *
+ * @param value allowed object is
+ * {@link Boolean }
+ */
+ public void setNillable(Boolean value)
+ {
+ this.nillable = value;
+ }
- /**
- * Gets the value of the required property.
- *
- * @return
- * possible object is
- * {@link Boolean }
- *
- */
- public boolean isRequired() {
- if (required == null) {
- return false;
- } else {
- return required;
- }
- }
+ /**
+ * Gets the value of the required property.
+ *
+ * @return possible object is
+ * {@link Boolean }
+ */
+ public boolean isRequired()
+ {
+ if (required == null)
+ {
+ return false;
+ }
+ else
+ {
+ return required;
+ }
+ }
- /**
- * Sets the value of the required property.
- *
- * @param value
- * allowed object is
- * {@link Boolean }
- *
- */
- public void setRequired(Boolean value) {
- this.required = value;
- }
+ /**
+ * Sets the value of the required property.
+ *
+ * @param value allowed object is
+ * {@link Boolean }
+ */
+ public void setRequired(Boolean value)
+ {
+ this.required = value;
+ }
- /**
- * Gets the value of the namespace property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getNamespace() {
- if (namespace == null) {
- return "##default";
- } else {
- return namespace;
- }
- }
+ /**
+ * Gets the value of the namespace property.
+ *
+ * @return possible object is
+ * {@link String }
+ */
+ public String getNamespace()
+ {
+ if (namespace == null)
+ {
+ return "##default";
+ }
+ else
+ {
+ return namespace;
+ }
+ }
- /**
- * Sets the value of the namespace property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setNamespace(String value) {
- this.namespace = value;
- }
+ /**
+ * Sets the value of the namespace property.
+ *
+ * @param value allowed object is
+ * {@link String }
+ */
+ public void setNamespace(String value)
+ {
+ this.namespace = value;
+ }
- /**
- * Gets the value of the defaultValue property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getDefaultValue() {
- return defaultValue;
- }
+ /**
+ * Gets the value of the defaultValue property.
+ *
+ * @return possible object is
+ * {@link String }
+ */
+ public String getDefaultValue()
+ {
+ return defaultValue;
+ }
- /**
- * Sets the value of the defaultValue property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setDefaultValue(String value) {
- this.defaultValue = value;
- }
+ /**
+ * Sets the value of the defaultValue property.
+ *
+ * @param value allowed object is
+ * {@link String }
+ */
+ public void setDefaultValue(String value)
+ {
+ this.defaultValue = value;
+ }
- /**
- * Gets the value of the type property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getType() {
- return type;
- }
+ /**
+ * Gets the value of the type property.
+ *
+ * @return possible object is
+ * {@link String }
+ */
+ public String getType()
+ {
+ return type;
+ }
- /**
- * Sets the value of the type property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setType(String value) {
- this.type = value;
- }
+ /**
+ * Sets the value of the type property.
+ *
+ * @param value allowed object is
+ * {@link String }
+ */
+ public void setType(String value)
+ {
+ this.type = value;
+ }
}
Modified: projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/XmlRootElementIntro.java
===================================================================
--- projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/XmlRootElementIntro.java 2007-09-21 08:38:24 UTC (rev 4603)
+++ projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/XmlRootElementIntro.java 2007-09-21 08:39:58 UTC (rev 4604)
@@ -17,9 +17,9 @@
/**
* <p>Java class for XmlRootElement complex type.
- *
+ * <p/>
* <p>The following schema fragment specifies the expected content contained within this class.
- *
+ * <p/>
* <pre>
* <complexType name="XmlRootElement">
* <complexContent>
@@ -30,74 +30,75 @@
* </complexContent>
* </complexType>
* </pre>
- *
- *
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "XmlRootElement")
-public class XmlRootElementIntro {
+public class XmlRootElementIntro
+{
- @XmlAttribute
- @XmlSchemaType(name = "anySimpleType")
- protected String namespace;
- @XmlAttribute
- @XmlSchemaType(name = "anySimpleType")
- protected String name;
+ @XmlAttribute
+ @XmlSchemaType(name = "anySimpleType")
+ protected String namespace;
+ @XmlAttribute
+ @XmlSchemaType(name = "anySimpleType")
+ protected String name;
- /**
- * Gets the value of the namespace property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getNamespace() {
- if (namespace == null) {
- return "##default";
- } else {
- return namespace;
- }
- }
+ /**
+ * Gets the value of the namespace property.
+ *
+ * @return possible object is
+ * {@link String }
+ */
+ public String getNamespace()
+ {
+ if (namespace == null)
+ {
+ return "##default";
+ }
+ else
+ {
+ return namespace;
+ }
+ }
- /**
- * Sets the value of the namespace property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setNamespace(String value) {
- this.namespace = value;
- }
+ /**
+ * Sets the value of the namespace property.
+ *
+ * @param value allowed object is
+ * {@link String }
+ */
+ public void setNamespace(String value)
+ {
+ this.namespace = value;
+ }
- /**
- * Gets the value of the name property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getName() {
- if (name == null) {
- return "##default";
- } else {
- return name;
- }
- }
+ /**
+ * Gets the value of the name property.
+ *
+ * @return possible object is
+ * {@link String }
+ */
+ public String getName()
+ {
+ if (name == null)
+ {
+ return "##default";
+ }
+ else
+ {
+ return name;
+ }
+ }
- /**
- * Sets the value of the name property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setName(String value) {
- this.name = value;
- }
+ /**
+ * Sets the value of the name property.
+ *
+ * @param value allowed object is
+ * {@link String }
+ */
+ public void setName(String value)
+ {
+ this.name = value;
+ }
}
Modified: projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/XmlTypeIntro.java
===================================================================
--- projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/XmlTypeIntro.java 2007-09-21 08:38:24 UTC (rev 4603)
+++ projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/XmlTypeIntro.java 2007-09-21 08:39:58 UTC (rev 4604)
@@ -17,9 +17,9 @@
/**
* <p>Java class for XmlType complex type.
- *
+ * <p/>
* <p>The following schema fragment specifies the expected content contained within this class.
- *
+ * <p/>
* <pre>
* <complexType name="XmlType">
* <complexContent>
@@ -33,163 +33,164 @@
* </complexContent>
* </complexType>
* </pre>
- *
- *
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "XmlType")
-public class XmlTypeIntro {
+public class XmlTypeIntro
+{
- @XmlAttribute
- @XmlSchemaType(name = "anySimpleType")
- protected String name;
- @XmlAttribute
- @XmlSchemaType(name = "anySimpleType")
- protected String propOrder;
- @XmlAttribute
- @XmlSchemaType(name = "anySimpleType")
- protected String namespace;
- @XmlAttribute
- @XmlSchemaType(name = "anySimpleType")
- protected String factoryClass;
- @XmlAttribute
- @XmlSchemaType(name = "anySimpleType")
- protected String factoryMethod;
+ @XmlAttribute
+ @XmlSchemaType(name = "anySimpleType")
+ protected String name;
+ @XmlAttribute
+ @XmlSchemaType(name = "anySimpleType")
+ protected String propOrder;
+ @XmlAttribute
+ @XmlSchemaType(name = "anySimpleType")
+ protected String namespace;
+ @XmlAttribute
+ @XmlSchemaType(name = "anySimpleType")
+ protected String factoryClass;
+ @XmlAttribute
+ @XmlSchemaType(name = "anySimpleType")
+ protected String factoryMethod;
- /**
- * Gets the value of the name property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getName() {
- if (name == null) {
- return "##default";
- } else {
- return name;
- }
- }
+ /**
+ * Gets the value of the name property.
+ *
+ * @return possible object is
+ * {@link String }
+ */
+ public String getName()
+ {
+ if (name == null)
+ {
+ return "##default";
+ }
+ else
+ {
+ return name;
+ }
+ }
- /**
- * Sets the value of the name property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setName(String value) {
- this.name = value;
- }
+ /**
+ * Sets the value of the name property.
+ *
+ * @param value allowed object is
+ * {@link String }
+ */
+ public void setName(String value)
+ {
+ this.name = value;
+ }
- /**
- * Gets the value of the propOrder property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getPropOrder() {
- if (propOrder == null) {
- return "";
- } else {
- return propOrder;
- }
- }
+ /**
+ * Gets the value of the propOrder property.
+ *
+ * @return possible object is
+ * {@link String }
+ */
+ public String getPropOrder()
+ {
+ if (propOrder == null)
+ {
+ return "";
+ }
+ else
+ {
+ return propOrder;
+ }
+ }
- /**
- * Sets the value of the propOrder property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setPropOrder(String value) {
- this.propOrder = value;
- }
+ /**
+ * Sets the value of the propOrder property.
+ *
+ * @param value allowed object is
+ * {@link String }
+ */
+ public void setPropOrder(String value)
+ {
+ this.propOrder = value;
+ }
- /**
- * Gets the value of the namespace property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getNamespace() {
- if (namespace == null) {
- return "##default";
- } else {
- return namespace;
- }
- }
+ /**
+ * Gets the value of the namespace property.
+ *
+ * @return possible object is
+ * {@link String }
+ */
+ public String getNamespace()
+ {
+ if (namespace == null)
+ {
+ return "##default";
+ }
+ else
+ {
+ return namespace;
+ }
+ }
- /**
- * Sets the value of the namespace property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setNamespace(String value) {
- this.namespace = value;
- }
+ /**
+ * Sets the value of the namespace property.
+ *
+ * @param value allowed object is
+ * {@link String }
+ */
+ public void setNamespace(String value)
+ {
+ this.namespace = value;
+ }
- /**
- * Gets the value of the factoryClass property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getFactoryClass() {
- return factoryClass;
- }
+ /**
+ * Gets the value of the factoryClass property.
+ *
+ * @return possible object is
+ * {@link String }
+ */
+ public String getFactoryClass()
+ {
+ return factoryClass;
+ }
- /**
- * Sets the value of the factoryClass property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setFactoryClass(String value) {
- this.factoryClass = value;
- }
+ /**
+ * Sets the value of the factoryClass property.
+ *
+ * @param value allowed object is
+ * {@link String }
+ */
+ public void setFactoryClass(String value)
+ {
+ this.factoryClass = value;
+ }
- /**
- * Gets the value of the factoryMethod property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getFactoryMethod() {
- if (factoryMethod == null) {
- return "";
- } else {
- return factoryMethod;
- }
- }
+ /**
+ * Gets the value of the factoryMethod property.
+ *
+ * @return possible object is
+ * {@link String }
+ */
+ public String getFactoryMethod()
+ {
+ if (factoryMethod == null)
+ {
+ return "";
+ }
+ else
+ {
+ return factoryMethod;
+ }
+ }
- /**
- * Sets the value of the factoryMethod property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setFactoryMethod(String value) {
- this.factoryMethod = value;
- }
+ /**
+ * Sets the value of the factoryMethod property.
+ *
+ * @param value allowed object is
+ * {@link String }
+ */
+ public void setFactoryMethod(String value)
+ {
+ this.factoryMethod = value;
+ }
}
Modified: projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/package-info.java
===================================================================
--- projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/package-info.java 2007-09-21 08:38:24 UTC (rev 4603)
+++ projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/configmodel/package-info.java 2007-09-21 08:39:58 UTC (rev 4604)
@@ -5,5 +5,4 @@
// Generated on: 2007.08.21 at 10:20:40 PM GMT
//
-(a)javax.xml.bind.annotation.XmlSchema(namespace = "http://www.jboss.org/xsd/jaxb/intros", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package org.jboss.jaxb.intros.configmodel;
+(a)javax.xml.bind.annotation.XmlSchema(namespace = "http://www.jboss.org/xsd/jaxb/intros", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.jboss.jaxb.intros.configmodel;
Modified: projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/ClassValue.java
===================================================================
--- projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/ClassValue.java 2007-09-21 08:38:24 UTC (rev 4603)
+++ projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/ClassValue.java 2007-09-21 08:39:58 UTC (rev 4604)
@@ -29,9 +29,10 @@
*
* @author <a href="mailto:tom.fennelly@jboss.com">tom.fennelly(a)jboss.com</a>
*/
-public interface ClassValue {
+public interface ClassValue
+{
- Class getClassValue( Annotation a, String name );
+ Class getClassValue(Annotation a, String name);
- Class[] getClassArrayValue( Annotation a, String name );
+ Class[] getClassArrayValue(Annotation a, String name);
}
Modified: projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/XmlAccessorTypeHandler.java
===================================================================
--- projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/XmlAccessorTypeHandler.java 2007-09-21 08:38:24 UTC (rev 4603)
+++ projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/XmlAccessorTypeHandler.java 2007-09-21 08:39:58 UTC (rev 4604)
@@ -34,41 +34,46 @@
/**
* @author <a href="mailto:chris@swaton.org">chris(a)swaton.org</a>
*/
-public class XmlAccessorTypeHandler implements InvocationHandler {
+public class XmlAccessorTypeHandler implements InvocationHandler
+{
- private static final Log logger = LogFactory.getLog(XmlAccessorTypeHandler.class);
- private XmlAccessorTypeIntro xmlAccessorTypeIntro;
+ private static final Log logger = LogFactory.getLog(XmlAccessorTypeHandler.class);
+ private XmlAccessorTypeIntro xmlAccessorTypeIntro;
- private XmlAccessorTypeHandler(XmlAccessorTypeIntro xmlAccessorTypeIntro) {
- this.xmlAccessorTypeIntro = xmlAccessorTypeIntro;
- }
+ private XmlAccessorTypeHandler(XmlAccessorTypeIntro xmlAccessorTypeIntro)
+ {
+ this.xmlAccessorTypeIntro = xmlAccessorTypeIntro;
+ }
- public static Annotation createProxy(XmlAccessorTypeIntro xmlAccessorTypeIntro) {
- return (Annotation) Proxy.newProxyInstance(XmlAccessorType.class.getClassLoader(),
- new Class[] { XmlAccessorType.class, ClassValue.class },
- new XmlAccessorTypeHandler(xmlAccessorTypeIntro));
- }
+ public static Annotation createProxy(XmlAccessorTypeIntro xmlAccessorTypeIntro)
+ {
+ return (Annotation)Proxy.newProxyInstance(XmlAccessorType.class.getClassLoader(),
+ new Class[]{XmlAccessorType.class, ClassValue.class},
+ new XmlAccessorTypeHandler(xmlAccessorTypeIntro));
+ }
- public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
- /*
- <xsd:complexType>
- <xsd:attribute name="value" use="optional" default="NONE">
- <xsd:simpleType>
- <xsd:restriction base="xsd:NMTOKEN">
- <xsd:enumeration value="PROPERTY"/>
- <xsd:enumeration value="FIELD"/>
- <xsd:enumeration value="PUBLIC_MEMBER"/>
- <xsd:enumeration value="NONE"/>
- </xsd:restriction>
- </xsd:simpleType>
- </xsd:attribute>
- </xsd:complexType>
- */
+ public Object invoke(Object proxy, Method method, Object[] args) throws Throwable
+ {
+ /*
+ <xsd:complexType>
+ <xsd:attribute name="value" use="optional" default="NONE">
+ <xsd:simpleType>
+ <xsd:restriction base="xsd:NMTOKEN">
+ <xsd:enumeration value="PROPERTY"/>
+ <xsd:enumeration value="FIELD"/>
+ <xsd:enumeration value="PUBLIC_MEMBER"/>
+ <xsd:enumeration value="NONE"/>
+ </xsd:restriction>
+ </xsd:simpleType>
+ </xsd:attribute>
+ </xsd:complexType>
+ */
- String methodName = method.getName();
- if(methodName.equals("value")) {
- return XmlAccessType.valueOf(xmlAccessorTypeIntro.getValue());
- }
- return null;
- }
+ String methodName = method.getName();
+ if (methodName.equals("value"))
+ {
+ return XmlAccessType.valueOf(xmlAccessorTypeIntro.getValue());
+ }
+ return null;
+ }
}
Modified: projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/XmlAttributeHandler.java
===================================================================
--- projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/XmlAttributeHandler.java 2007-09-21 08:38:24 UTC (rev 4603)
+++ projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/XmlAttributeHandler.java 2007-09-21 08:39:58 UTC (rev 4604)
@@ -30,41 +30,52 @@
/**
* @author <a href="mailto:tom.fennelly@jboss.com">tom.fennelly(a)jboss.com</a>
*/
-public class XmlAttributeHandler implements InvocationHandler {
+public class XmlAttributeHandler implements InvocationHandler
+{
- private XmlAttributeIntro xmlAttributeIntro;
+ private XmlAttributeIntro xmlAttributeIntro;
- public XmlAttributeHandler(XmlAttributeIntro xmlAttributeIntro) {
- this.xmlAttributeIntro = xmlAttributeIntro;
- }
+ public XmlAttributeHandler(XmlAttributeIntro xmlAttributeIntro)
+ {
+ this.xmlAttributeIntro = xmlAttributeIntro;
+ }
- public static Annotation createProxy(XmlAttributeIntro xmlAttributeIntro) {
- return (Annotation) Proxy.newProxyInstance(XmlAttribute.class.getClassLoader(),
- new Class[] { XmlAttribute.class },
- new XmlAttributeHandler(xmlAttributeIntro));
- }
+ public static Annotation createProxy(XmlAttributeIntro xmlAttributeIntro)
+ {
+ return (Annotation)Proxy.newProxyInstance(XmlAttribute.class.getClassLoader(),
+ new Class[]{XmlAttribute.class},
+ new XmlAttributeHandler(xmlAttributeIntro));
+ }
- public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
- /*
- <xsd:complexType>
- <xsd:attribute name="name" use="optional" default="##default"/>
- <xsd:attribute name="required" type="xsd:boolean" use="optional" default="false"/>
- <xsd:attribute name="namespace" use="optional" default="##default"/>
- </xsd:complexType>
- */
+ public Object invoke(Object proxy, Method method, Object[] args) throws Throwable
+ {
+ /*
+ <xsd:complexType>
+ <xsd:attribute name="name" use="optional" default="##default"/>
+ <xsd:attribute name="required" type="xsd:boolean" use="optional" default="false"/>
+ <xsd:attribute name="namespace" use="optional" default="##default"/>
+ </xsd:complexType>
+ */
- String methodName = method.getName();
+ String methodName = method.getName();
- if(methodName.equals("namespace")) {
- return xmlAttributeIntro.getNamespace();
- } else if(methodName.equals("name")) {
- return xmlAttributeIntro.getName();
- } else if(methodName.equals("required")) {
- return xmlAttributeIntro.isRequired();
- } else if(methodName.equals("annotationType")) {
- return XmlAttribute.class;
- }
+ if (methodName.equals("namespace"))
+ {
+ return xmlAttributeIntro.getNamespace();
+ }
+ else if (methodName.equals("name"))
+ {
+ return xmlAttributeIntro.getName();
+ }
+ else if (methodName.equals("required"))
+ {
+ return xmlAttributeIntro.isRequired();
+ }
+ else if (methodName.equals("annotationType"))
+ {
+ return XmlAttribute.class;
+ }
- return null;
- }
+ return null;
+ }
}
Modified: projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/XmlElementHandler.java
===================================================================
--- projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/XmlElementHandler.java 2007-09-21 08:38:24 UTC (rev 4603)
+++ projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/XmlElementHandler.java 2007-09-21 08:39:58 UTC (rev 4604)
@@ -31,61 +31,83 @@
/**
* @author <a href="mailto:tom.fennelly@jboss.com">tom.fennelly(a)jboss.com</a>
*/
-public class XmlElementHandler implements InvocationHandler {
+public class XmlElementHandler implements InvocationHandler
+{
- private XmlElementIntro xmlElementIntro;
+ private XmlElementIntro xmlElementIntro;
- private XmlElementHandler(XmlElementIntro xmlElementIntro) {
- this.xmlElementIntro = xmlElementIntro;
- }
+ private XmlElementHandler(XmlElementIntro xmlElementIntro)
+ {
+ this.xmlElementIntro = xmlElementIntro;
+ }
- public static Annotation createProxy(XmlElementIntro xmlElementIntro) {
- return (Annotation) Proxy.newProxyInstance(XmlElement.class.getClassLoader(),
- new Class[] { XmlElement.class, ClassValue.class },
- new XmlElementHandler(xmlElementIntro));
- }
+ public static Annotation createProxy(XmlElementIntro xmlElementIntro)
+ {
+ return (Annotation)Proxy.newProxyInstance(XmlElement.class.getClassLoader(),
+ new Class[]{XmlElement.class, ClassValue.class},
+ new XmlElementHandler(xmlElementIntro));
+ }
- public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
- /*
- <xsd:complexType>
- <xsd:attribute name="name" use="optional" default="##default"/>
- <xsd:attribute name="nillable" type="xsd:boolean" use="optional" default="false"/>
- <xsd:attribute name="required" type="xsd:boolean" use="optional" default="false"/>
- <xsd:attribute name="namespace" use="optional" default="##default"/>
- <xsd:attribute name="defaultValue" use="optional"/>
- <xsd:attribute name="type" use="optional"/>
- </xsd:complexType>
- */
- String methodName = method.getName();
+ public Object invoke(Object proxy, Method method, Object[] args) throws Throwable
+ {
+ /*
+ <xsd:complexType>
+ <xsd:attribute name="name" use="optional" default="##default"/>
+ <xsd:attribute name="nillable" type="xsd:boolean" use="optional" default="false"/>
+ <xsd:attribute name="required" type="xsd:boolean" use="optional" default="false"/>
+ <xsd:attribute name="namespace" use="optional" default="##default"/>
+ <xsd:attribute name="defaultValue" use="optional"/>
+ <xsd:attribute name="type" use="optional"/>
+ </xsd:complexType>
+ */
+ String methodName = method.getName();
- if(methodName.equals("getClassValue")) {
- methodName = (String)args[1];
- }
+ if (methodName.equals("getClassValue"))
+ {
+ methodName = (String)args[1];
+ }
- if(methodName.equals("namespace")) {
- return xmlElementIntro.getNamespace();
- } else if(methodName.equals("name")) {
- return xmlElementIntro.getName();
- } else if(methodName.equals("nillable")) {
- return xmlElementIntro.isNillable();
- } else if(methodName.equals("required")) {
- return xmlElementIntro.isRequired();
- } else if(methodName.equals("defaultValue")) {
- String defaultVal = xmlElementIntro.getDefaultValue();
- return (defaultVal != null?defaultVal:"\u0000");
- } else if(methodName.equals("type")) {
- if(xmlElementIntro.getType() != null) {
- try {
- return Class.forName(xmlElementIntro.getType());
- } catch(ClassNotFoundException e) {
- throw new ConfigurationException("Bad 'XmlElement.type' config value '" + xmlElementIntro.getType() + "' in JAXB Annotation Introduction config. Class not found.");
- }
+ if (methodName.equals("namespace"))
+ {
+ return xmlElementIntro.getNamespace();
+ }
+ else if (methodName.equals("name"))
+ {
+ return xmlElementIntro.getName();
+ }
+ else if (methodName.equals("nillable"))
+ {
+ return xmlElementIntro.isNillable();
+ }
+ else if (methodName.equals("required"))
+ {
+ return xmlElementIntro.isRequired();
+ }
+ else if (methodName.equals("defaultValue"))
+ {
+ String defaultVal = xmlElementIntro.getDefaultValue();
+ return (defaultVal != null ? defaultVal : "\u0000");
+ }
+ else if (methodName.equals("type"))
+ {
+ if (xmlElementIntro.getType() != null)
+ {
+ try
+ {
+ return Class.forName(xmlElementIntro.getType());
}
- return XmlElement.DEFAULT.class;
- } else if(methodName.equals("annotationType")) {
- return XmlElement.class;
- }
+ catch (ClassNotFoundException e)
+ {
+ throw new ConfigurationException("Bad 'XmlElement.type' config value '" + xmlElementIntro.getType() + "' in JAXB Annotation Introduction config. Class not found.");
+ }
+ }
+ return XmlElement.DEFAULT.class;
+ }
+ else if (methodName.equals("annotationType"))
+ {
+ return XmlElement.class;
+ }
- return null;
- }
+ return null;
+ }
}
Modified: projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/XmlRootElementHandler.java
===================================================================
--- projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/XmlRootElementHandler.java 2007-09-21 08:38:24 UTC (rev 4603)
+++ projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/XmlRootElementHandler.java 2007-09-21 08:39:58 UTC (rev 4604)
@@ -33,35 +33,42 @@
/**
* @author <a href="mailto:chris@swaton.org">chris(a)swaton.org</a>
*/
-public class XmlRootElementHandler implements InvocationHandler {
+public class XmlRootElementHandler implements InvocationHandler
+{
- private static final Log logger = LogFactory.getLog(XmlRootElementHandler.class);
- private XmlRootElementIntro xmlRootElementIntro;
+ private static final Log logger = LogFactory.getLog(XmlRootElementHandler.class);
+ private XmlRootElementIntro xmlRootElementIntro;
- private XmlRootElementHandler(XmlRootElementIntro xmlRootElementIntro) {
- this.xmlRootElementIntro = xmlRootElementIntro;
- }
+ private XmlRootElementHandler(XmlRootElementIntro xmlRootElementIntro)
+ {
+ this.xmlRootElementIntro = xmlRootElementIntro;
+ }
- public static Annotation createProxy(XmlRootElementIntro xmlRootElementIntro) {
- return (Annotation) Proxy.newProxyInstance(XmlRootElement.class.getClassLoader(),
- new Class[] { XmlRootElement.class, ClassValue.class },
- new XmlRootElementHandler(xmlRootElementIntro));
- }
+ public static Annotation createProxy(XmlRootElementIntro xmlRootElementIntro)
+ {
+ return (Annotation)Proxy.newProxyInstance(XmlRootElement.class.getClassLoader(),
+ new Class[]{XmlRootElement.class, ClassValue.class},
+ new XmlRootElementHandler(xmlRootElementIntro));
+ }
- public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
- /*
- <xsd:complexType>
- <xsd:attribute name="namespace" use="optional" default="##default"/>
- <xsd:attribute name="name" use="optional" default="##default"/>
- </xsd:complexType>
- */
+ public Object invoke(Object proxy, Method method, Object[] args) throws Throwable
+ {
+ /*
+ <xsd:complexType>
+ <xsd:attribute name="namespace" use="optional" default="##default"/>
+ <xsd:attribute name="name" use="optional" default="##default"/>
+ </xsd:complexType>
+ */
- String methodName = method.getName();
- if(methodName.equals("namespace")) {
- return xmlRootElementIntro.getNamespace();
- } else if(methodName.equals("name")) {
- return xmlRootElementIntro.getName();
- }
- return null;
- }
+ String methodName = method.getName();
+ if (methodName.equals("namespace"))
+ {
+ return xmlRootElementIntro.getNamespace();
+ }
+ else if (methodName.equals("name"))
+ {
+ return xmlRootElementIntro.getName();
+ }
+ return null;
+ }
}
Modified: projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/XmlTypeHandler.java
===================================================================
--- projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/XmlTypeHandler.java 2007-09-21 08:38:24 UTC (rev 4603)
+++ projects/jaxbintros/src/main/java/org/jboss/jaxb/intros/handlers/XmlTypeHandler.java 2007-09-21 08:39:58 UTC (rev 4604)
@@ -33,60 +33,81 @@
/**
* @author <a href="mailto:tom.fennelly@jboss.com">tom.fennelly(a)jboss.com</a>
*/
-public class XmlTypeHandler implements InvocationHandler {
+public class XmlTypeHandler implements InvocationHandler
+{
- private static final Log logger = LogFactory.getLog(XmlTypeHandler.class);
- private XmlTypeIntro xmlTypeIntro;
+ private static final Log logger = LogFactory.getLog(XmlTypeHandler.class);
+ private XmlTypeIntro xmlTypeIntro;
- private XmlTypeHandler(XmlTypeIntro xmlTypeIntro) {
- this.xmlTypeIntro = xmlTypeIntro;
- }
+ private XmlTypeHandler(XmlTypeIntro xmlTypeIntro)
+ {
+ this.xmlTypeIntro = xmlTypeIntro;
+ }
- public static Annotation createProxy(XmlTypeIntro xmlTypeIntro) {
- return (Annotation) Proxy.newProxyInstance(XmlType.class.getClassLoader(),
- new Class[] { XmlType.class, ClassValue.class },
- new XmlTypeHandler(xmlTypeIntro));
- }
+ public static Annotation createProxy(XmlTypeIntro xmlTypeIntro)
+ {
+ return (Annotation)Proxy.newProxyInstance(XmlType.class.getClassLoader(),
+ new Class[]{XmlType.class, ClassValue.class},
+ new XmlTypeHandler(xmlTypeIntro));
+ }
- public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
- /*
- <xsd:complexType>
- <xsd:attribute name="name" use="optional" default="##default"/>
- <xsd:attribute name="propOrder" use="optional" default=""/>
- <xsd:attribute name="namespace" use="optional" default="##default"/>
- <xsd:attribute name="factoryClass" use="optional"/>
- <xsd:attribute name="factoryMethod" use="optional" default=""/>
- </xsd:complexType>
- */
- String methodName = method.getName();
+ public Object invoke(Object proxy, Method method, Object[] args) throws Throwable
+ {
+ /*
+ <xsd:complexType>
+ <xsd:attribute name="name" use="optional" default="##default"/>
+ <xsd:attribute name="propOrder" use="optional" default=""/>
+ <xsd:attribute name="namespace" use="optional" default="##default"/>
+ <xsd:attribute name="factoryClass" use="optional"/>
+ <xsd:attribute name="factoryMethod" use="optional" default=""/>
+ </xsd:complexType>
+ */
+ String methodName = method.getName();
- if(methodName.equals("getClassValue")) {
- methodName = (String)args[1];
- }
+ if (methodName.equals("getClassValue"))
+ {
+ methodName = (String)args[1];
+ }
- if(methodName.equals("namespace")) {
- return xmlTypeIntro.getNamespace();
- } else if(methodName.equals("name")) {
- return xmlTypeIntro.getName();
- } else if(methodName.equals("propOrder")) {
- try {
- return xmlTypeIntro.getPropOrder().split(",");
- } catch(Exception e) {
- logger.warn("Bad 'XmlType.propOrder' config value '" + xmlTypeIntro.getPropOrder() + "' in JAXB Annotation Introduction config. Must be a CSV String.");
+ if (methodName.equals("namespace"))
+ {
+ return xmlTypeIntro.getNamespace();
+ }
+ else if (methodName.equals("name"))
+ {
+ return xmlTypeIntro.getName();
+ }
+ else if (methodName.equals("propOrder"))
+ {
+ try
+ {
+ return xmlTypeIntro.getPropOrder().split(",");
+ }
+ catch (Exception e)
+ {
+ logger.warn("Bad 'XmlType.propOrder' config value '" + xmlTypeIntro.getPropOrder() + "' in JAXB Annotation Introduction config. Must be a CSV String.");
+ }
+ }
+ else if (methodName.equals("factoryClass"))
+ {
+ if (xmlTypeIntro.getFactoryClass() != null)
+ {
+ try
+ {
+ return Class.forName(xmlTypeIntro.getFactoryClass());
}
- } else if(methodName.equals("factoryClass")) {
- if(xmlTypeIntro.getFactoryClass() != null) {
- try {
- return Class.forName(xmlTypeIntro.getFactoryClass());
- } catch(ClassNotFoundException e) {
- throw new ConfigurationException("Bad 'XmlType.factoryClass' config value '" + xmlTypeIntro.getFactoryClass() + "' in JAXB Annotation Introduction config. Class not found.");
- }
+ catch (ClassNotFoundException e)
+ {
+ throw new ConfigurationException("Bad 'XmlType.factoryClass' config value '" + xmlTypeIntro.getFactoryClass() + "' in JAXB Annotation Introduction config. Class not found.");
}
- return XmlType.DEFAULT.class;
- } else if(methodName.equals("factoryMethod")) {
- return xmlTypeIntro.getFactoryMethod();
- }
+ }
+ return XmlType.DEFAULT.class;
+ }
+ else if (methodName.equals("factoryMethod"))
+ {
+ return xmlTypeIntro.getFactoryMethod();
+ }
- return null;
- }
+ return null;
+ }
}
16 years, 7 months
- 1
- 0
JBossWS SVN: r4603 - in projects/jaxbintros: ant-import and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-09-21 04:38:24 -0400 (Fri, 21 Sep 2007)
New Revision: 4603
Modified:
projects/jaxbintros/ant-import/build-release.xml
projects/jaxbintros/ant.properties
Log:
Fix release targets
Modified: projects/jaxbintros/ant-import/build-release.xml
===================================================================
--- projects/jaxbintros/ant-import/build-release.xml 2007-09-21 08:34:41 UTC (rev 4602)
+++ projects/jaxbintros/ant-import/build-release.xml 2007-09-21 08:38:24 UTC (rev 4603)
@@ -21,15 +21,14 @@
<property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/>
<mkdir dir="${jboss.repository.dir}/jbossws-jboss42/${repository.id}/lib"/>
<copy todir="${jboss.repository.dir}/jbossws-jboss42/${repository.id}/lib" overwrite="true">
- <fileset dir="${jbws42.dir}/output/lib">
- <include name="jbossws-jboss42.jar"/>
- <include name="jbossws-jboss42-src.zip"/>
- <include name="jbossws-jboss42-resources.zip"/>
+ <fileset dir="${jaxbintro.dir}/output/lib">
+ <include name="jboss-jaxb-intro.jar"/>
+ <include name="jboss-jaxb-intro-src.zip"/>
</fileset>
</copy>
- <copy tofile="${jboss.repository.dir}/jbossws-jboss42/${repository.id}/component-info.xml" file="${jbws42.etc.dir}/component-info.xml" filtering="true" overwrite="true">
+ <copy tofile="${jboss.repository.dir}/jaxbintros/${repository.id}/component-info.xml" file="${jaxbintro.etc.dir}/component-info.xml" filtering="true" overwrite="true">
<filterset>
- <filtersfile file="${jbws42.dir}/version.properties"/>
+ <filtersfile file="${jaxbintro.dir}/version.properties"/>
</filterset>
</copy>
Modified: projects/jaxbintros/ant.properties
===================================================================
--- projects/jaxbintros/ant.properties 2007-09-21 08:34:41 UTC (rev 4602)
+++ projects/jaxbintros/ant.properties 2007-09-21 08:38:24 UTC (rev 4603)
@@ -8,7 +8,7 @@
jboss.repository=http://repository.jboss.org
# JBossWS Release
-jboss.local.repository=/home/tdiesler/svn/jboss.local.repository
+jboss.local.repository=/home/hbraun/dev/prj/jboss.local.repository
# Force thirdparty HTTP get
#force.thirdparty.get=true
16 years, 7 months
- 1
- 0