Author: asankha
Date: Thu Jul 27 00:38:06 2006
New Revision: 425990
URL: http://svn.apache.org/viewvc?rev=425990&view=rev
Log:
Remove schema creation code from the code base as it is no longer pursued
Removed:
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/Util.java
Modified:
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/ClassMediatorFactory.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/Constants.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/DropMediatorFactory.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/FaultMediatorFactory.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/FilterMediatorFactory.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/HeaderMediatorFactory.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/InMediatorFactory.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/LogMediatorFactory.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/MediatorFactory.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/MediatorFactoryFinder.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/OutMediatorFactory.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/PropertyMediatorFactory.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/SendMediatorFactory.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/SequenceMediatorFactory.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/SwitchMediatorFactory.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/SynapseMediatorFactory.java
incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/javascript/JavaScriptMediatorFactory.java
incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/JsonMediatorFactory.java
incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/spring/SpringMediatorFactory.java
incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/transform/XSLTMediatorFactory.java
incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/validate/ValidateMediatorFactory.java
Modified:
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/ClassMediatorFactory.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/ClassMediatorFactory.java?rev=425990&r1=425989&r2=425990&view=diff
==============================================================================
---
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/ClassMediatorFactory.java
(original)
+++
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/ClassMediatorFactory.java
Thu Jul 27 00:38:06 2006
@@ -47,19 +47,6 @@
private static final QName CLASS_Q = new
QName(Constants.SYNAPSE_NAMESPACE, "class");
- private static final String STR_SCHEMA =
- Constants.SCHEMA_PROLOG +
- "\t<xs:element name=\"class\" type=\"class_type\"/>\n" +
- "\t<xs:complexType name=\"class_type\">\n" +
- "\t\t<xs:sequence minOccurs=\"0\" maxOccurs=\"unbounded\">\n" +
- "\t\t\t<xs:element name=\"property\"
type=\"synapse:property_type\"/>\n" +
- "\t\t</xs:sequence>\n" +
- "\t\t<xs:attribute name=\"name\"/>\n" +
- "\t</xs:complexType>" +
- Constants.SCHEMA_EPILOG;
-
- private static final XmlSchema SCHEMA = Util.getSchema(STR_SCHEMA,
CLASS_Q);
-
public Mediator createMediator(OMElement elem) {
ClassMediator classMediator = new ClassMediator();
@@ -88,9 +75,5 @@
public QName getTagQName() {
return CLASS_Q;
- }
-
- public XmlSchema getTagSchema() {
- return SCHEMA;
}
}
Modified:
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/Constants.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/Constants.java?rev=425990&r1=425989&r2=425990&view=diff
==============================================================================
---
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/Constants.java
(original)
+++
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/Constants.java
Thu Jul 27 00:38:06 2006
@@ -34,12 +34,4 @@
public static final String NULL_NAMESPACE = "";
public static final String OUTFLOW_SECURITY = "OutflowSecurity";
public static final String INFLOW_SECURITY = "InflowSecurity";
-
- public static final String SCHEMA_PROLOG =
- "<xs:schema xmlns:xs=\"http://www.w3.org/2001/XMLSchema\"; " +
- "elementFormDefault=\"qualified\"
attributeFormDefault=\"unqualified\" " +
- "xmlns:synapse=\"http://ws.apache.org/ns/synapse\"; " +
- "targetNamespace=\"http://ws.apache.org/ns/synapse\";>\n";
-
- public static final String SCHEMA_EPILOG = "</xs:schema>\n";
}
Modified:
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/DropMediatorFactory.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/DropMediatorFactory.java?rev=425990&r1=425989&r2=425990&view=diff
==============================================================================
---
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/DropMediatorFactory.java
(original)
+++
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/DropMediatorFactory.java
Thu Jul 27 00:38:06 2006
@@ -38,23 +38,11 @@
private static final QName DROP_Q = new QName(Constants.SYNAPSE_NAMESPACE,
"drop");
- private static final String STR_SCHEMA =
- Constants.SCHEMA_PROLOG +
- "\t<xs:element name=\"drop\" type=\"drop_type\"/>\n" +
- "\t<xs:complexType name=\"drop_type\"/>" +
- Constants.SCHEMA_EPILOG;
-
- private static final XmlSchema SCHEMA = Util.getSchema(STR_SCHEMA, DROP_Q);
-
public Mediator createMediator(OMElement el) {
return new DropMediator();
}
public QName getTagQName() {
return DROP_Q;
- }
-
- public XmlSchema getTagSchema() {
- return SCHEMA;
}
}
Modified:
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/FaultMediatorFactory.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/FaultMediatorFactory.java?rev=425990&r1=425989&r2=425990&view=diff
==============================================================================
---
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/FaultMediatorFactory.java
(original)
+++
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/FaultMediatorFactory.java
Thu Jul 27 00:38:06 2006
@@ -65,34 +65,6 @@
private static final Log log =
LogFactory.getLog(FaultMediatorFactory.class);
- private static final String STR_SCHEMA =
- Constants.SCHEMA_PROLOG +
- "\t<xs:element name=\"makefault\" type=\"makefault_type\"/>\n" +
- "\t<xs:complexType name=\"makefault_type\">\n" +
- "\t\t<xs:sequence>\n" +
- "\t\t\t<xs:element name=\"code\">\n" +
- "\t\t\t\t<xs:complexType>\n" +
- "\t\t\t\t\t<xs:attribute name=\"value\" type=\"xs:string\"/>\n" +
- "\t\t\t\t\t<xs:attribute name=\"expression\" type=\"xs:string\"/>\n" +
- "\t\t\t\t</xs:complexType>\n" +
- "\t\t\t</xs:element>\n" +
- "\t\t\t<xs:element name=\"reason\">\n" +
- "\t\t\t\t<xs:complexType>\n" +
- "\t\t\t\t\t<xs:attribute name=\"value\" type=\"xs:string\"/>\n" +
- "\t\t\t\t\t<xs:attribute name=\"expression\" type=\"xs:string\"/>\n" +
- "\t\t\t\t</xs:complexType>\n" +
- "\t\t\t</xs:element>\n" +
- "\t\t\t<xs:element name=\"node\" minOccurs=\"0\"/>\n" +
- "\t\t\t<xs:element name=\"role\" minOccurs=\"0\"/>\n" +
- "\t\t\t<xs:element name=\"detail\" type=\"xs:anyType\"
minOccurs=\"0\"/>\n" +
- "\t\t</xs:sequence>\n" +
- "\t\t<xs:attribute name=\"version\" type=\"xs:string\"/>\n" +
- "\t</xs:complexType>" +
- Constants.SCHEMA_EPILOG;
-
- private static final XmlSchema SCHEMA =
- org.apache.synapse.config.xml.Util.getSchema(STR_SCHEMA, FAULT_Q);
-
public Mediator createMediator(OMElement elem) {
FaultMediator faultMediator = new FaultMediator();
@@ -209,9 +181,5 @@
public QName getTagQName() {
return FAULT_Q;
- }
-
- public XmlSchema getTagSchema() {
- return SCHEMA;
}
}
Modified:
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/FilterMediatorFactory.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/FilterMediatorFactory.java?rev=425990&r1=425989&r2=425990&view=diff
==============================================================================
---
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/FilterMediatorFactory.java
(original)
+++
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/FilterMediatorFactory.java
Thu Jul 27 00:38:06 2006
@@ -48,23 +48,6 @@
private static final QName FILTER_Q = new
QName(Constants.SYNAPSE_NAMESPACE, "filter");
- private static final String STR_SCHEMA =
- Constants.SCHEMA_PROLOG +
- "\t<xs:element name=\"filter\" type=\"filter_type\"/>\n" +
- "\t<xs:complexType name=\"filter_type\">\n" +
- "\t\t<xs:complexContent>\n" +
- "\t\t\t<xs:extension base=\"synapse:mediator_type\">\n" +
- "\t\t\t\t<xs:attribute name=\"source\"/>\n" +
- "\t\t\t\t<xs:attribute name=\"regex\"/>\n" +
- "\t\t\t\t<xs:attribute name=\"xpath\"/>\n" +
- "\t\t\t</xs:extension>\n" +
- "\t\t</xs:complexContent>\n" +
- "\t</xs:complexType>" +
- Constants.SCHEMA_EPILOG;
-
- private static final XmlSchema SCHEMA =
- org.apache.synapse.config.xml.Util.getSchema(STR_SCHEMA, FILTER_Q);
-
public Mediator createMediator(OMElement elem) {
FilterMediator filter = new FilterMediator();
super.addChildren(elem, filter);
@@ -127,9 +110,5 @@
public QName getTagQName() {
return FILTER_Q;
- }
-
- public XmlSchema getTagSchema() {
- return SCHEMA;
}
}
Modified:
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/HeaderMediatorFactory.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/HeaderMediatorFactory.java?rev=425990&r1=425989&r2=425990&view=diff
==============================================================================
---
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/HeaderMediatorFactory.java
(original)
+++
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/HeaderMediatorFactory.java
Thu Jul 27 00:38:06 2006
@@ -49,15 +49,6 @@
private static final QName HEADER_Q = new
QName(Constants.SYNAPSE_NAMESPACE, "header");
- private static final String STR_SCHEMA =
- Constants.SCHEMA_PROLOG +
- "\t<xs:element name=\"header\" type=\"header_type\"/>\n" +
- "\t<xs:complexType name=\"header_type\"/>\n" +
- Constants.SCHEMA_EPILOG;
-
- private static final XmlSchema SCHEMA =
- org.apache.synapse.config.xml.Util.getSchema(STR_SCHEMA, HEADER_Q);
-
public Mediator createMediator(OMElement elem) {
HeaderMediator headerMediator = new HeaderMediator();
@@ -111,9 +102,5 @@
public QName getTagQName() {
return HEADER_Q;
- }
-
- public XmlSchema getTagSchema() {
- return SCHEMA;
}
}
Modified:
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/InMediatorFactory.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/InMediatorFactory.java?rev=425990&r1=425989&r2=425990&view=diff
==============================================================================
---
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/InMediatorFactory.java
(original)
+++
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/InMediatorFactory.java
Thu Jul 27 00:38:06 2006
@@ -35,19 +35,6 @@
private static final QName IN_Q = new QName(Constants.SYNAPSE_NAMESPACE,
"in");
- private static final String STR_SCHEMA =
- Constants.SCHEMA_PROLOG +
- "\t<xs:element name=\"in\" type=\"in_type\"/>\n" +
- "\t<xs:complexType name=\"in_type\">\n" +
- "\t\t<xs:complexContent>\n" +
- "\t\t\t<xs:extension base=\"synapse:mediator_type\"/>\n" +
- "\t\t</xs:complexContent>\n" +
- "\t</xs:complexType>" +
- Constants.SCHEMA_EPILOG;
-
- private static final XmlSchema SCHEMA =
- org.apache.synapse.config.xml.Util.getSchema(STR_SCHEMA, IN_Q);
-
public Mediator createMediator(OMElement elem) {
InMediator filter = new InMediator();
super.addChildren(elem, filter);
@@ -56,9 +43,5 @@
public QName getTagQName() {
return IN_Q;
- }
-
- public XmlSchema getTagSchema() {
- return SCHEMA;
}
}
Modified:
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/LogMediatorFactory.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/LogMediatorFactory.java?rev=425990&r1=425989&r2=425990&view=diff
==============================================================================
---
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/LogMediatorFactory.java
(original)
+++
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/LogMediatorFactory.java
Thu Jul 27 00:38:06 2006
@@ -52,21 +52,6 @@
private static final String FULL = "full";
private static final String CUSTOM = "custom";
- private static final String STR_SCHEMA =
- Constants.SCHEMA_PROLOG +
- "\t<xs:element name=\"log\" type=\"log_type\"/>\n" +
- "\t<xs:complexType name=\"log_type\">\n" +
- "\t\t<xs:sequence minOccurs=\"0\" maxOccurs=\"unbounded\">\n" +
- "\t\t\t<xs:element name=\"property\"
type=\"synapse:property_type\"/>\n" +
- "\t\t</xs:sequence>\n" +
- "\t\t<xs:attribute name=\"level\"/>\n" +
- "\t\t<xs:attribute name=\"seperator\"/>\n" +
- "\t</xs:complexType>" +
- Constants.SCHEMA_EPILOG;
-
- private static final XmlSchema SCHEMA =
- org.apache.synapse.config.xml.Util.getSchema(STR_SCHEMA, LOG_Q);
-
public QName getTagQName() {
return LOG_Q;
}
@@ -99,9 +84,5 @@
logMediator.addAllProperties(MediatorPropertyFactory.getMediatorProperties(elem));
return logMediator;
- }
-
- public XmlSchema getTagSchema() {
- return SCHEMA;
}
}
Modified:
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/MediatorFactory.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/MediatorFactory.java?rev=425990&r1=425989&r2=425990&view=diff
==============================================================================
---
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/MediatorFactory.java
(original)
+++
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/MediatorFactory.java
Thu Jul 27 00:38:06 2006
@@ -39,17 +39,4 @@
* @return QName of the mediator element
*/
public QName getTagQName();
-
- /**
- * The name of the type in the schema returned by getTagSchema() which
- * defines this element
- * @return the QName for the type
- */
- public QName getTagSchemaType();
-
- /**
- * The schema for the mediator's XML configuration
- * @return the schema of the mediator
- */
- public XmlSchema getTagSchema();
}
Modified:
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/MediatorFactoryFinder.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/MediatorFactoryFinder.java?rev=425990&r1=425989&r2=425990&view=diff
==============================================================================
---
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/MediatorFactoryFinder.java
(original)
+++
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/MediatorFactoryFinder.java
Thu Jul 27 00:38:06 2006
@@ -69,21 +69,6 @@
TryMediatorFactory.class
};
- private static final String STR_SCHEMA =
- Constants.SCHEMA_PROLOG +
- "\t<xs:complexType name=\"mediator_type\">\n" +
- "\t\t<xs:sequence maxOccurs=\"unbounded\">\n" +
- "\t\t\t<xs:choice>\n" +
- "\t\t\t</xs:choice>\n" +
- "\t\t</xs:sequence>\n" +
- "\t</xs:complexType>\n" +
- "\t<xs:complexType name=\"property_type\">\n" +
- "\t\t<xs:attribute name=\"name\" type=\"xs:string\"
use=\"required\"/>\n" +
- "\t\t<xs:attribute name=\"value\" type=\"xs:string\"/>\n" +
- "\t\t<xs:attribute name=\"expression\" type=\"xs:string\"/>\n" +
- "\t</xs:complexType>" +
- Constants.SCHEMA_EPILOG;
-
private static MediatorFactoryFinder instance = null;
/**
@@ -102,12 +87,6 @@
*/
private XmlSchema mediators = null;
- /**
- * Load schemas only if Xalan (a dependency for XmlSchema) is available
- * i.e. if someone wants to access schema's this is a runtime requirement
- */
- private boolean loadSchemas = false;
-
public static synchronized MediatorFactoryFinder getInstance() {
if (instance == null) {
instance = new MediatorFactoryFinder();
@@ -125,23 +104,6 @@
private MediatorFactoryFinder() {
- try {
- TransformerFactory.newInstance();
- loadSchemas = true;
-
- schema = new XmlSchema(Constants.SYNAPSE_NAMESPACE, null);
- try {
- mediators = new XmlSchemaCollection().read(new StreamSource(
- new StringReader(STR_SCHEMA)), null);
- } catch (XmlSchemaException e) {
- handleException("Error defining mediator_types " +
- "elemement for the configuration language schema", e);
- }
-
- } catch(TransformerFactoryConfigurationError e) {
- log.warn("Xalan unavailable. Mediator schemas will not be
available");
- }
-
factoryMap = new HashMap();
for (int i = 0; i < mediatorFactories.length; i++) {
@@ -149,25 +111,12 @@
try {
MediatorFactory fac = (MediatorFactory) c.newInstance();
factoryMap.put(fac.getTagQName(), c);
- if (loadSchemas) {
- mergeSchema(fac.getTagSchema());
- addMediatorType(mediators, fac);
- }
} catch (Exception e) {
throw new SynapseException("Error instantiating
" + c.getName(), e);
}
}
// now iterate through the available pluggable mediator factories
registerExtensions(mediators);
-
- // add registers mediators as extensions
- /*if (loadSchemas) {
- mergeSchema(mediators);
- if (log.isDebugEnabled()) {
- System.out.println("Mediator Schema : ");
- schema.write(System.out);
- }
- }*/
}
private void handleException(String msg, Exception e) {
@@ -176,21 +125,6 @@
}
/**
- * Merge given schema into our master schema
- * @param child the sub schema / fragment to be merged
- */
- private void mergeSchema(XmlSchema child) {
- if (child != null) {
- XmlSchemaObjectTable schemaTypes = child.getSchemaTypes();
- Iterator iter = schemaTypes.getNames();
- while (iter.hasNext()) {
- QName name = (QName) iter.next();
- schema.getItems().add(schemaTypes.getItem(name));
- }
- }
- }
-
- /**
* Register pluggable mediator factories from the classpath
*
* This looks for JAR files containing a META-INF/services that adheres to
the following
@@ -206,34 +140,11 @@
MediatorFactory mf = (MediatorFactory) it.next();
QName tag = mf.getTagQName();
factoryMap.put(tag, mf.getClass());
- mergeSchema(mf.getTagSchema());
- addMediatorType(mediators, mf);
-
log.debug("Added MediatorFactory " + mf.getClass() + " to handle "
+ tag);
}
}
/**
- * Include the mediator type element into the available "mediator_types"
- * @param mediators the parent schema which holds the "mediator_types"
- * @param mf the mediator factory which will provide the QName of the type
- */
- private void addMediatorType(XmlSchema mediators, MediatorFactory mf) {
-
- XmlSchemaComplexType cmplx =
- (XmlSchemaComplexType) mediators.getItems().getItem(0);
- XmlSchemaSequence seq = (XmlSchemaSequence) cmplx.getParticle();
- XmlSchemaChoice choice = (XmlSchemaChoice) seq.getItems().getItem(0);
-
- XmlSchemaElement ele = new XmlSchemaElement();
- ele.setName(mf.getTagQName().getLocalPart());
- if (mf.getTagSchemaType() != null && mf.getTagSchema() != null) {
- ele.setSchemaTypeName(mf.getTagSchemaType());
- choice.getItems().add(ele);
- }
- }
-
- /**
* This method returns a Processor given an OMElement. This will be used
* recursively by the elements which contain processor elements
themselves
* (e.g. rules)
@@ -273,16 +184,5 @@
*/
public Map getFactoryMap() {
return factoryMap;
- }
-
- /**
- * Returns the XML schema for the known mediators if available - or null
- * @return the XmlSchema for the mediator configuration, if avialable. This
- * will load only if the mediator factory has properly met the requirements
- * for this feature, and if Xalan is available to the runtime (this is a
- * requiement for the XmlSchema package used underneath)
- */
- public XmlSchema getSchema() {
- return schema;
}
}
Modified:
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/OutMediatorFactory.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/OutMediatorFactory.java?rev=425990&r1=425989&r2=425990&view=diff
==============================================================================
---
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/OutMediatorFactory.java
(original)
+++
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/OutMediatorFactory.java
Thu Jul 27 00:38:06 2006
@@ -35,19 +35,6 @@
private static final QName OUT_Q = new QName(Constants.SYNAPSE_NAMESPACE,
"out");
- private static final String STR_SCHEMA =
- Constants.SCHEMA_PROLOG +
- "\t<xs:element name=\"out\" type=\"out_type\"/>\n" +
- "\t<xs:complexType name=\"out_type\">\n" +
- "\t\t<xs:complexContent>\n" +
- "\t\t\t<xs:extension base=\"synapse:mediator_type\"/>\n" +
- "\t\t</xs:complexContent>\n" +
- "\t</xs:complexType>" +
- Constants.SCHEMA_EPILOG;
-
- private static final XmlSchema SCHEMA =
- org.apache.synapse.config.xml.Util.getSchema(STR_SCHEMA, OUT_Q);
-
public Mediator createMediator(OMElement elem) {
OutMediator filter = new OutMediator();
super.addChildren(elem, filter);
@@ -56,9 +43,5 @@
public QName getTagQName() {
return OUT_Q;
- }
-
- public XmlSchema getTagSchema() {
- return SCHEMA;
}
}
Modified:
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/PropertyMediatorFactory.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/PropertyMediatorFactory.java?rev=425990&r1=425989&r2=425990&view=diff
==============================================================================
---
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/PropertyMediatorFactory.java
(original)
+++
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/PropertyMediatorFactory.java
Thu Jul 27 00:38:06 2006
@@ -42,19 +42,6 @@
private static final QName PROP_Q = new
QName(Constants.SYNAPSE_NAMESPACE, "set-property");
- private static final String STR_SCHEMA =
- Constants.SCHEMA_PROLOG +
- "\t<xs:element name=\"set-property\" type=\"set-property_type\"/>\n" +
- "\t<xs:complexType name=\"set-property_type\">\n" +
- "\t\t<xs:attribute name=\"name\"/>\n" +
- "\t\t<xs:attribute name=\"value\"/>\n" +
- "\t\t<xs:attribute name=\"expression\"/>\n" +
- "\t</xs:complexType>" +
- Constants.SCHEMA_EPILOG;
-
- private static final XmlSchema SCHEMA =
- org.apache.synapse.config.xml.Util.getSchema(STR_SCHEMA, PROP_Q);
-
public Mediator createMediator(OMElement elem) {
PropertyMediator propMediator = new PropertyMediator();
@@ -93,9 +80,5 @@
public QName getTagQName() {
return PROP_Q;
- }
-
- public XmlSchema getTagSchema() {
- return SCHEMA;
}
}
Modified:
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/SendMediatorFactory.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/SendMediatorFactory.java?rev=425990&r1=425989&r2=425990&view=diff
==============================================================================
---
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/SendMediatorFactory.java
(original)
+++
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/SendMediatorFactory.java
Thu Jul 27 00:38:06 2006
@@ -86,15 +86,6 @@
private static final QName ATT_REF_Q = new QName(Constants.NULL_NAMESPACE,
"ref");
private static final QName ATT_ADDRESS_Q = new
QName(Constants.NULL_NAMESPACE, "address");
- private static final String STR_SCHEMA =
- Constants.SCHEMA_PROLOG +
- "\t<xs:element name=\"send\" type=\"send_type\"/>\n" +
- "\t<xs:complexType name=\"send_type\"/>" +
- Constants.SCHEMA_EPILOG;
-
- private static final XmlSchema SCHEMA =
- org.apache.synapse.config.xml.Util.getSchema(STR_SCHEMA, SEND_Q);
-
public Mediator createMediator(OMElement elem) {
SendMediator sm = new SendMediator();
@@ -132,9 +123,5 @@
public QName getTagQName() {
return SEND_Q;
- }
-
- public XmlSchema getTagSchema() {
- return SCHEMA;
}
}
Modified:
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/SequenceMediatorFactory.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/SequenceMediatorFactory.java?rev=425990&r1=425989&r2=425990&view=diff
==============================================================================
---
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/SequenceMediatorFactory.java
(original)
+++
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/SequenceMediatorFactory.java
Thu Jul 27 00:38:06 2006
@@ -47,19 +47,6 @@
private static final QName SEQUENCE_Q = new
QName(Constants.SYNAPSE_NAMESPACE, "sequence");
- private static final String STR_SCHEMA =
- Constants.SCHEMA_PROLOG +
- "\t<xs:element name=\"sequence\" type=\"sequence_type\"/>\n" +
- "\t<xs:complexType name=\"sequence_type\">\n" +
- "\t\t<xs:complexContent>\n" +
- "\t\t\t<xs:extension base=\"synapse:mediator_type\"/>\n" +
- "\t\t</xs:complexContent>\n" +
- "\t</xs:complexType>" +
- Constants.SCHEMA_EPILOG;
-
- private static final XmlSchema SCHEMA =
- org.apache.synapse.config.xml.Util.getSchema(STR_SCHEMA, SEQUENCE_Q);
-
public QName getTagQName() {
return SEQUENCE_Q;
}
@@ -92,9 +79,5 @@
}
return seqMediator;
- }
-
- public XmlSchema getTagSchema() {
- return SCHEMA;
}
}
Modified:
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/SwitchMediatorFactory.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/SwitchMediatorFactory.java?rev=425990&r1=425989&r2=425990&view=diff
==============================================================================
---
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/SwitchMediatorFactory.java
(original)
+++
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/SwitchMediatorFactory.java
Thu Jul 27 00:38:06 2006
@@ -55,29 +55,6 @@
private static final QName CASE_Q = new
QName(Constants.SYNAPSE_NAMESPACE, "case");
private static final QName DEFAULT_Q = new
QName(Constants.SYNAPSE_NAMESPACE, "default");
- private static final String STR_SCHEMA =
- Constants.SCHEMA_PROLOG +
- "\t<xs:element name=\"switch\" type=\"synapse:switch_type\"/>\n" +
- "\t<xs:complexType name=\"switch_type\">\n" +
- "\t\t<xs:sequence>\n" +
- "\t\t\t<xs:sequence maxOccurs=\"unbounded\">\n" +
- "\t\t\t\t<xs:element name=\"case\"
type=\"synapse:switch_case_type\"/>\n" +
- "\t\t\t</xs:sequence>\n" +
- "\t\t\t<xs:element name=\"default\" type=\"synapse:mediator_type\"
minOccurs=\"0\"/>\n" +
- "\t\t</xs:sequence>\n" +
- "\t\t<xs:attribute name=\"source\"/>\n" +
- "\t</xs:complexType>" +
- "\t<xs:complexType name=\"switch_case_type\">\n" +
- "\t\t<xs:complexContent>\n" +
- "\t\t\t<xs:extension base=\"synapse:mediator_type\">\n" +
- "\t\t\t\t<xs:attribute name=\"regex\" type=\"xs:string\"/>\n" +
- "\t\t\t</xs:extension>\n" +
- "\t\t</xs:complexContent>\n" +
- "\t</xs:complexType>" +
- Constants.SCHEMA_EPILOG;
-
- private static final XmlSchema SCHEMA = Util.getSchema(STR_SCHEMA,
SWITCH_Q);
-
public Mediator createMediator(OMElement elem) {
SwitchMediator switchMediator = new SwitchMediator();
@@ -118,9 +95,5 @@
public QName getTagQName() {
return SWITCH_Q;
- }
-
- public XmlSchema getTagSchema() {
- return SCHEMA;
}
}
Modified:
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/SynapseMediatorFactory.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/SynapseMediatorFactory.java?rev=425990&r1=425989&r2=425990&view=diff
==============================================================================
---
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/SynapseMediatorFactory.java
(original)
+++
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/config/xml/SynapseMediatorFactory.java
Thu Jul 27 00:38:06 2006
@@ -37,25 +37,8 @@
private final static QName RULES_Q = new
QName(Constants.SYNAPSE_NAMESPACE, "rules");
- private static final String STR_SCHEMA =
- Constants.SCHEMA_PROLOG +
- "\t<xs:element name=\"rules\" type=\"rules_type\"/>\n" +
- "\t<xs:complexType name=\"rules_type\">\n" +
- "\t\t<xs:complexContent>\n" +
- "\t\t\t<xs:extension base=\"synapse:mediator_type\"/>\n" +
- "\t\t</xs:complexContent>\n" +
- "\t</xs:complexType>" +
- Constants.SCHEMA_EPILOG;
-
- private static final XmlSchema SCHEMA =
- org.apache.synapse.config.xml.Util.getSchema(STR_SCHEMA, RULES_Q);
-
public QName getTagQName() {
return RULES_Q;
- }
-
- public XmlSchema getTagSchema() {
- return SCHEMA;
}
public Mediator createMediator(OMElement elem) {
Modified:
incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/javascript/JavaScriptMediatorFactory.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/javascript/JavaScriptMediatorFactory.java?rev=425990&r1=425989&r2=425990&view=diff
==============================================================================
---
incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/javascript/JavaScriptMediatorFactory.java
(original)
+++
incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/javascript/JavaScriptMediatorFactory.java
Thu Jul 27 00:38:06 2006
@@ -22,7 +22,6 @@
import org.apache.synapse.Constants;
import org.apache.synapse.api.Mediator;
import org.apache.synapse.config.xml.MediatorFactory;
-import org.apache.synapse.config.xml.Util;
import org.apache.ws.commons.schema.XmlSchema;
/**
@@ -38,18 +37,6 @@
private static final QName TAG_NAME = new
QName(Constants.SYNAPSE_NAMESPACE + "/js", "javascript");
- private static final String STR_SCHEMA =
- org.apache.synapse.config.xml.Constants.SCHEMA_PROLOG +
- "\t<xs:element name=\"javascript\"
type=\"synapse:javascript_type\"/>\n" +
- "\t<xs:complexType name=\"javascript_type\">\n" +
- "\t\t<xs:complexContent>\n" +
- "\t\t\t<xs:extension base=\"xs:anyType\"/>\n" +
- "\t\t</xs:complexContent>\n" +
- "\t</xs:complexType>" +
- org.apache.synapse.config.xml.Constants.SCHEMA_EPILOG;
-
- private static final XmlSchema SCHEMA = Util.getSchema(STR_SCHEMA,
TAG_NAME);
-
/**
* Create a JavaScript mediator
*
@@ -76,9 +63,4 @@
return new QName(Constants.SYNAPSE_NAMESPACE,
getTagQName().getLocalPart() + "_type", "js");
}
-
- public XmlSchema getTagSchema() {
- return SCHEMA;
- }
-
}
Modified:
incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/JsonMediatorFactory.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/JsonMediatorFactory.java?rev=425990&r1=425989&r2=425990&view=diff
==============================================================================
---
incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/JsonMediatorFactory.java
(original)
+++
incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/json/JsonMediatorFactory.java
Thu Jul 27 00:38:06 2006
@@ -21,7 +21,6 @@
import org.apache.synapse.SynapseException;
import org.apache.synapse.config.xml.Constants;
import org.apache.synapse.config.xml.MediatorFactory;
-import org.apache.synapse.config.xml.Util;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMAttribute;
import org.apache.commons.logging.Log;
@@ -44,16 +43,6 @@
private static final QName TAG_NAME = new
QName(Constants.SYNAPSE_NAMESPACE+"/json", "json");
- private static final String STR_SCHEMA =
- org.apache.synapse.config.xml.Constants.SCHEMA_PROLOG +
- "\t<xs:element name=\"json\" type=\"synapse:json_type\"/>\n" +
- "\t<xs:complexType name=\"json_type\">\n" +
- "\t\t<xs:attribute name=\"direction\" type=\"xs:string\"/>" +
- "\t</xs:complexType>" +
- org.apache.synapse.config.xml.Constants.SCHEMA_EPILOG;
-
- private static final XmlSchema SCHEMA = Util.getSchema(STR_SCHEMA,
TAG_NAME);
-
public Mediator createMediator(OMElement elem) {
JsonMediator jsonMediator = new JsonMediator();
OMAttribute direction = elem.getAttribute(new QName("direction"));
@@ -72,10 +61,6 @@
public QName getTagSchemaType() {
return new QName(Constants.SYNAPSE_NAMESPACE,
getTagQName().getLocalPart() + "_type", "json");
- }
-
- public XmlSchema getTagSchema() {
- return SCHEMA;
}
private void handleException(String msg) {
Modified:
incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/spring/SpringMediatorFactory.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/spring/SpringMediatorFactory.java?rev=425990&r1=425989&r2=425990&view=diff
==============================================================================
---
incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/spring/SpringMediatorFactory.java
(original)
+++
incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/spring/SpringMediatorFactory.java
Thu Jul 27 00:38:06 2006
@@ -24,7 +24,6 @@
import org.apache.synapse.mediators.spring.SpringConfigExtension;
import org.apache.synapse.config.xml.Constants;
import org.apache.synapse.config.xml.MediatorFactory;
-import org.apache.synapse.config.xml.Util;
import org.apache.synapse.mediators.spring.SpringMediator;
import org.apache.ws.commons.schema.XmlSchema;
@@ -43,18 +42,6 @@
private static final QName TAG_NAME = new
QName(Constants.SYNAPSE_NAMESPACE + "/spring", "spring");
- private static final String STR_SCHEMA =
- org.apache.synapse.config.xml.Constants.SCHEMA_PROLOG +
- "\t<xs:element name=\"spring\" type=\"synapse:spring_type\"/>\n" +
- "\t<xs:complexType name=\"spring_type\">\n" +
- "\t\t<xs:attribute name=\"bean\" type=\"xs:string\"
use=\"required\"/>\n" +
- "\t\t<xs:attribute name=\"config\" type=\"xs:string\"/>\n" +
- "\t\t<xs:attribute name=\"src\" type=\"xs:string\"/>\n" +
- "\t</xs:complexType>" +
- org.apache.synapse.config.xml.Constants.SCHEMA_EPILOG;
-
- private static final XmlSchema SCHEMA = Util.getSchema(STR_SCHEMA,
TAG_NAME);
-
/**
* Create a Spring mediator instance referring to the bean and
configuration given
* by the OMElement declaration
@@ -102,9 +89,5 @@
public QName getTagSchemaType() {
return new QName(Constants.SYNAPSE_NAMESPACE,
getTagQName().getLocalPart() + "_type", "spring");
- }
-
- public XmlSchema getTagSchema() {
- return SCHEMA;
}
}
Modified:
incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/transform/XSLTMediatorFactory.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/transform/XSLTMediatorFactory.java?rev=425990&r1=425989&r2=425990&view=diff
==============================================================================
---
incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/transform/XSLTMediatorFactory.java
(original)
+++
incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/transform/XSLTMediatorFactory.java
Thu Jul 27 00:38:06 2006
@@ -48,21 +48,6 @@
private static final Log log =
LogFactory.getLog(XSLTMediatorFactory.class);
private static final QName TAG_NAME = new
QName(Constants.SYNAPSE_NAMESPACE, "xslt");
- private static final String STR_SCHEMA =
- Constants.SCHEMA_PROLOG +
- "\t<xs:element name=\"transform\" type=\"transform_type\"/>\n" +
- "\t<xs:complexType name=\"transform_type\">\n" +
- "\t\t<xs:sequence minOccurs=\"0\" maxOccurs=\"unbounded\">\n" +
- "\t\t\t<xs:element name=\"property\"
type=\"synapse:property_type\"/>\n" +
- "\t\t</xs:sequence>\n" +
- "\t\t<xs:attribute name=\"xslt\" type=\"xs:string\"
use=\"required\"/>\n" +
- "\t\t<xs:attribute name=\"source\" type=\"xs:string\"/>\n" +
- "\t</xs:complexType>" +
- Constants.SCHEMA_EPILOG;
-
- private static final XmlSchema SCHEMA =
- org.apache.synapse.config.xml.Util.getSchema(STR_SCHEMA, TAG_NAME);
-
public QName getTagQName() {
return TAG_NAME;
}
@@ -96,10 +81,6 @@
MediatorPropertyFactory.getMediatorProperties(elem));
return transformMediator;
- }
-
- public XmlSchema getTagSchema() {
- return SCHEMA;
}
private void handleException(String msg, Exception e) {
Modified:
incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/validate/ValidateMediatorFactory.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/validate/ValidateMediatorFactory.java?rev=425990&r1=425989&r2=425990&view=diff
==============================================================================
---
incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/validate/ValidateMediatorFactory.java
(original)
+++
incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/validate/ValidateMediatorFactory.java
Thu Jul 27 00:38:06 2006
@@ -56,28 +56,6 @@
private static final QName KEY_Q = new
QName(Constants.NULL_NAMESPACE, "key");
private static final QName SOURCE_Q = new
QName(Constants.NULL_NAMESPACE, "source");
- private static final String STR_SCHEMA =
- Constants.SCHEMA_PROLOG +
- "\t<xs:element name=\"validate\" type=\"validate_type\"/>\n" +
- "\t<xs:complexType name=\"validate_type\">\n" +
- "\t\t<xs:sequence minOccurs=\"0\" maxOccurs=\"unbounded\">\n" +
- "\t\t\t<xs:element name=\"property\"
type=\"synapse:property_type\"/>\n" +
- "\t\t</xs:sequence>\n" +
- "\t\t<xs:element name=\"on-fail\" type=\"on-fail_type\"/>" +
- "\t\t<xs:attribute name=\"url\" type=\"xs:string\"
use=\"required\"/>\n" +
- "\t\t<xs:attribute name=\"source\" type=\"xs:string\"/>\n" +
- "\t</xs:complexType>" +
- "\t<xs:complexType name=\"on-fail_type\">\n" +
- "\t\t<xs:complexContent>\n" +
- "\t\t\t<xs:extension base=\"synapse:mediator_type\"/>\n" +
- "\t\t</xs:complexContent>\n" +
- "\t</xs:complexType>" +
- Constants.SCHEMA_EPILOG;
-
- private static final XmlSchema SCHEMA =
- org.apache.synapse.config.xml.Util.getSchema(STR_SCHEMA, VALIDATE_Q);
-
-
public Mediator createMediator(OMElement elem) {
ValidateMediator validateMediator = new ValidateMediator();
@@ -153,9 +131,5 @@
public QName getTagQName() {
return VALIDATE_Q;
- }
-
- public XmlSchema getTagSchema() {
- return SCHEMA;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
