You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by di...@apache.org on 2005/09/15 21:07:03 UTC
svn commit: r289289 [105/134] - in /webservices/axis2/trunk/java: ./ etc/
modules/addressing/ modules/addressing/src/META-INF/
modules/addressing/src/org/apache/axis2/handlers/addressing/
modules/addressing/test-resources/ modules/addressing/test/org/a...
Propchange: webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/util/Constants.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/axis2/trunk/java/modules/wsdl/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/project.xml?rev=289289&r1=289288&r2=289289&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/project.xml (original)
+++ webservices/axis2/trunk/java/modules/wsdl/project.xml Thu Sep 15 11:52:11 2005
@@ -1,118 +1,118 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-<project>
- <pomVersion>3</pomVersion>
- <extend>../../etc/project.xml</extend>
- <name>Apache Axis 2.0 - WSDL</name>
- <id>axis2-wsdl</id>
- <groupId>axis2</groupId>
- <description>WSDL support for Axis 2.0. This includes WSDL Object Model built based on the proposed WSDL 2.0 Component Model.</description>
- <dependencies>
- <dependency>
- <groupId>axis2</groupId>
- <artifactId>axis2-xml</artifactId>
- <version>${pom.currentVersion}</version>
- </dependency>
- <dependency>
- <groupId>axis2</groupId>
- <artifactId>axis2-common</artifactId>
- <version>${pom.currentVersion}</version>
- </dependency>
- <dependency>
- <groupId>axis</groupId>
- <artifactId>XmlSchema</artifactId>
- <version>SNAPSHOT</version>
- </dependency>
- <!-- external JARs -->
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.3</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.8</version>
- <properties>
- <module>true</module>
- </properties>
- <url>http://dist.codehaus.org/stax/jars/</url>
- </dependency>
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax</artifactId>
- <version>1.1.2-dev</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <version>1.0</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>axis</groupId>
- <artifactId>axis-wsdl4j</artifactId>
- <version>1.2</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>xmlbeans</groupId>
- <artifactId>xbean</artifactId>
- <version>2.0.0-beta1</version>
- <type>jar</type>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- <version>1.6.2</version>
- <type>jar</type>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- </dependencies>
- <!-- add the build properties-->
- <build>
- <resources>
- <resource>
- <directory>src</directory>
- <includes>
- <include>**/*.properties</include>
- <include>**/*.xml</include>
- <include>**/*.xsl</include>
- <include>**/*.xsd</include>
- </includes>
- </resource>
- </resources>
- </build>
- <reports/>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
+<project>
+ <pomVersion>3</pomVersion>
+ <extend>../../etc/project.xml</extend>
+ <name>Apache Axis 2.0 - WSDL</name>
+ <id>axis2-wsdl</id>
+ <groupId>axis2</groupId>
+ <description>WSDL support for Axis 2.0. This includes WSDL Object Model built based on the proposed WSDL 2.0 Component Model.</description>
+ <dependencies>
+ <dependency>
+ <groupId>axis2</groupId>
+ <artifactId>axis2-xml</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>axis2</groupId>
+ <artifactId>axis2-common</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>axis</groupId>
+ <artifactId>XmlSchema</artifactId>
+ <version>SNAPSHOT</version>
+ </dependency>
+ <!-- external JARs -->
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.0.3</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.8</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ <url>http://dist.codehaus.org/stax/jars/</url>
+ </dependency>
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax</artifactId>
+ <version>1.1.2-dev</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>1.0</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>axis</groupId>
+ <artifactId>axis-wsdl4j</artifactId>
+ <version>1.2</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>xmlbeans</groupId>
+ <artifactId>xbean</artifactId>
+ <version>2.0.0-beta1</version>
+ <type>jar</type>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.6.2</version>
+ <type>jar</type>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ </dependencies>
+ <!-- add the build properties-->
+ <build>
+ <resources>
+ <resource>
+ <directory>src</directory>
+ <includes>
+ <include>**/*.properties</include>
+ <include>**/*.xml</include>
+ <include>**/*.xsl</include>
+ <include>**/*.xsd</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+ <reports/>
+</project>
Propchange: webservices/axis2/trunk/java/modules/wsdl/project.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/WSDL2Code.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/WSDL2Code.java?rev=289289&r1=289288&r2=289289&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/WSDL2Code.java (original)
+++ webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/WSDL2Code.java Thu Sep 15 11:52:11 2005
@@ -1,64 +1,64 @@
-package org.apache.axis2.wsdl;
-
-import org.apache.axis2.wsdl.codegen.CodeGenerationEngine;
-import org.apache.axis2.wsdl.codegen.CommandLineOptionConstants;
-import org.apache.axis2.wsdl.codegen.CommandLineOptionParser;
-
-/**
- * Copyright 2004,2005 The Apache Software Foundation.
- * <p/>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-public class WSDL2Code {
-
-
- public static void main(String[] args) throws Exception {
- CommandLineOptionParser commandLineOptionParser = new CommandLineOptionParser(
- args);
- validateCommandLineOptions(commandLineOptionParser);
- new CodeGenerationEngine(commandLineOptionParser).generate();
-
- }
-
- private static void printUsage() {
- System.out.println(
- "Usage WSDL2Code -uri <Location of WSDL> :WSDL file location ");
- System.out.println("-o <output Location> : output file location ");
- System.out.println(
- "-a : Generate async style code only. Default if off");
- System.out.println(
- "-s : Generate sync style code only. Default if off. takes precedence over -a");
- System.out.println("-p <package name> : set custom package name");
- System.out.println(
- "-l <language> : valid languages are java and csharp. Default is java");
- System.out.println("-t : Generate TestCase to test the generated code");
- System.out.println(
- "-ss : Generate server side code (i.e. skeletons).Default is off");
- System.out.println(
- "-sd : Generate service descriptor (i.e. axis2.xml).Default is off.Valid with -ss ");
- System.exit(0);
- }
-
-
- private static void validateCommandLineOptions(
- CommandLineOptionParser parser) {
- if (parser.getInvalidOptions().size() > 0)
- printUsage();
- if (null ==
- parser.getAllOptions().get(
- CommandLineOptionConstants.WSDL_LOCATION_URI_OPTION))
- printUsage();
- }
-
-
-}
+package org.apache.axis2.wsdl;
+
+import org.apache.axis2.wsdl.codegen.CodeGenerationEngine;
+import org.apache.axis2.wsdl.codegen.CommandLineOptionConstants;
+import org.apache.axis2.wsdl.codegen.CommandLineOptionParser;
+
+/**
+ * Copyright 2004,2005 The Apache Software Foundation.
+ * <p/>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+public class WSDL2Code {
+
+
+ public static void main(String[] args) throws Exception {
+ CommandLineOptionParser commandLineOptionParser = new CommandLineOptionParser(
+ args);
+ validateCommandLineOptions(commandLineOptionParser);
+ new CodeGenerationEngine(commandLineOptionParser).generate();
+
+ }
+
+ private static void printUsage() {
+ System.out.println(
+ "Usage WSDL2Code -uri <Location of WSDL> :WSDL file location ");
+ System.out.println("-o <output Location> : output file location ");
+ System.out.println(
+ "-a : Generate async style code only. Default if off");
+ System.out.println(
+ "-s : Generate sync style code only. Default if off. takes precedence over -a");
+ System.out.println("-p <package name> : set custom package name");
+ System.out.println(
+ "-l <language> : valid languages are java and csharp. Default is java");
+ System.out.println("-t : Generate TestCase to test the generated code");
+ System.out.println(
+ "-ss : Generate server side code (i.e. skeletons).Default is off");
+ System.out.println(
+ "-sd : Generate service descriptor (i.e. axis2.xml).Default is off.Valid with -ss ");
+ System.exit(0);
+ }
+
+
+ private static void validateCommandLineOptions(
+ CommandLineOptionParser parser) {
+ if (parser.getInvalidOptions().size() > 0)
+ printUsage();
+ if (null ==
+ parser.getAllOptions().get(
+ CommandLineOptionConstants.WSDL_LOCATION_URI_OPTION))
+ printUsage();
+ }
+
+
+}
Propchange: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/WSDL2Code.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/WSDL2Java.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/WSDL2Java.java?rev=289289&r1=289288&r2=289289&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/WSDL2Java.java (original)
+++ webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/WSDL2Java.java Thu Sep 15 11:52:11 2005
@@ -1,25 +1,25 @@
-package org.apache.axis2.wsdl;
-
-/*
- * Copyright 2004,2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- *
- */
-
-public class WSDL2Java {
- public static void main(String[] args) throws Exception {
- WSDL2Code.main(args);
- }
-}
+package org.apache.axis2.wsdl;
+
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ *
+ */
+
+public class WSDL2Java {
+ public static void main(String[] args) throws Exception {
+ WSDL2Code.main(args);
+ }
+}
Propchange: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/WSDL2Java.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/WSDLVersionWrapper.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/WSDLVersionWrapper.java?rev=289289&r1=289288&r2=289289&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/WSDLVersionWrapper.java (original)
+++ webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/WSDLVersionWrapper.java Thu Sep 15 11:52:11 2005
@@ -1,60 +1,60 @@
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.axis2.wsdl;
-
-import org.apache.wsdl.WSDLDescription;
-
-import javax.wsdl.Definition;
-
-/**
- * @author chathura@opensource.lk
- */
-public class WSDLVersionWrapper {
-
- private Definition definition;
-
- private WSDLDescription description;
-
-
- /**
- * @param description WSDL 2.0 WOM description
- * @param definition WSDL 1.1 WSDL4J based <code>Definition</code>
- */
- public WSDLVersionWrapper(WSDLDescription description,
- Definition definition) {
- this.definition = definition;
- this.description = description;
- }
-
- /**
- * Returns the WSDL 1.1 Definition
- *
- * @return <code>DEfinition</code>
- */
- public Definition getDefinition() {
- return definition;
- }
-
- /**
- * Returns a WOM description
- *
- * @return <code>WSDLDescription</code>
- */
- public WSDLDescription getDescription() {
- return description;
- }
-}
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.axis2.wsdl;
+
+import org.apache.wsdl.WSDLDescription;
+
+import javax.wsdl.Definition;
+
+/**
+ * @author chathura@opensource.lk
+ */
+public class WSDLVersionWrapper {
+
+ private Definition definition;
+
+ private WSDLDescription description;
+
+
+ /**
+ * @param description WSDL 2.0 WOM description
+ * @param definition WSDL 1.1 WSDL4J based <code>Definition</code>
+ */
+ public WSDLVersionWrapper(WSDLDescription description,
+ Definition definition) {
+ this.definition = definition;
+ this.description = description;
+ }
+
+ /**
+ * Returns the WSDL 1.1 Definition
+ *
+ * @return <code>DEfinition</code>
+ */
+ public Definition getDefinition() {
+ return definition;
+ }
+
+ /**
+ * Returns a WOM description
+ *
+ * @return <code>WSDLDescription</code>
+ */
+ public WSDLDescription getDescription() {
+ return description;
+ }
+}
Propchange: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/WSDLVersionWrapper.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WOMBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WOMBuilder.java?rev=289289&r1=289288&r2=289289&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WOMBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WOMBuilder.java Thu Sep 15 11:52:11 2005
@@ -1,87 +1,87 @@
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.axis2.wsdl.builder;
-
-import org.apache.axis2.wsdl.WSDLVersionWrapper;
-
-import javax.wsdl.WSDLException;
-import java.io.InputStream;
-
-/**
- * @author chathura@opensource.lk
- */
-public interface WOMBuilder {
-
- /**
- * Buils a WOM and a WSDL4J object model from given the URI of the WSDL file and
- * will be returned as a wrapper object WSDLVersionWrapper.
- * @param uri URI pointing to the WSDL document.
- * @return WSDLVersionWrapper which contains both the WSDL 2.0 and WSDL 1.1
- * object models.
- * @throws WSDLException
- */
- public WSDLVersionWrapper build(String uri) throws WSDLException;
-
- /**
- * Buils a WOM and a WSDL4J object model from given the URI of the WSDL file and
- * will be returned as a wrapper object WSDLVersionWrapper. A WSDL Component Factory
- * can be passed into the builder using which the WOM component can be built out of.
- * For example: The Enigne uses the WOM's components in the context hierarchy but
- * those are extended components.
- * (<code>ServiceDescription</code> extends <code>WSDLService</code>.)
- * So when deployment build the WOM it would prefer to get a <code>ServiceDescription</code>
- * built in place of a <code>WSDLService</code>. This can be achieved by passing the
- * correct Component Factory that will instanciate the correct object for the WOM builder.
- * @param uri URI pointing to the WSDL document.
- * @param wsdlComponentFactory The ComponentFactory that will be used to create the
- * WOm components out of.
- * @return WSDLVersionWrapper which contains both the WSDL 2.0 and WSDL 1.1
- * object models.
- * @throws WSDLException
- */
- public WSDLVersionWrapper build(String uri,
- WSDLComponentFactory wsdlComponentFactory) throws WSDLException;
-
- /**
- * Buils a WOM and a WSDL4J object model from given the URI of the WSDL file and
- * will be returned as a wrapper object WSDLVersionWrapper.
- * @param in InputStream from which the WSDL document can be read in.
- * @return WSDLVersionWrapper which contains both the WSDL 2.0 and WSDL 1.1
- * object models.
- * @throws WSDLException
- */
- public WSDLVersionWrapper build(InputStream in) throws WSDLException ;
-
- /**
- * Buils a WOM and a WSDL4J object model from given the URI of the WSDL file and
- * will be returned as a wrapper object WSDLVersionWrapper. A WSDL Component Factory
- * can be passed into the builder using which the WOM component can be built out of.
- * For example: The Enigne uses the WOM's components in the context hierarchy but
- * those are extended components.
- * (<code>ServiceDescription</code> extends <code>WSDLService</code>.)
- * So when deployment build the WOM it would prefer to get a <code>ServiceDescription</code>
- * built in place of a <code>WSDLService</code>. This can be achieved by passing the
- * correct Component Factory that will instanciate the correct object for the WOM builder.
- * @param in InputStream from which the WSDL document can be read in.
- * @param wsdlComponentFactory The ComponentFactory that will be used to create the
- * WOm components out of.
- * @return WSDLVersionWrapper which contains both the WSDL 2.0 and WSDL 1.1
- * object models.
- * @throws WSDLException
- */
- public WSDLVersionWrapper build(InputStream in,
- WSDLComponentFactory wsdlComponentFactory) throws WSDLException;
-}
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.axis2.wsdl.builder;
+
+import org.apache.axis2.wsdl.WSDLVersionWrapper;
+
+import javax.wsdl.WSDLException;
+import java.io.InputStream;
+
+/**
+ * @author chathura@opensource.lk
+ */
+public interface WOMBuilder {
+
+ /**
+ * Buils a WOM and a WSDL4J object model from given the URI of the WSDL file and
+ * will be returned as a wrapper object WSDLVersionWrapper.
+ * @param uri URI pointing to the WSDL document.
+ * @return WSDLVersionWrapper which contains both the WSDL 2.0 and WSDL 1.1
+ * object models.
+ * @throws WSDLException
+ */
+ public WSDLVersionWrapper build(String uri) throws WSDLException;
+
+ /**
+ * Buils a WOM and a WSDL4J object model from given the URI of the WSDL file and
+ * will be returned as a wrapper object WSDLVersionWrapper. A WSDL Component Factory
+ * can be passed into the builder using which the WOM component can be built out of.
+ * For example: The Enigne uses the WOM's components in the context hierarchy but
+ * those are extended components.
+ * (<code>ServiceDescription</code> extends <code>WSDLService</code>.)
+ * So when deployment build the WOM it would prefer to get a <code>ServiceDescription</code>
+ * built in place of a <code>WSDLService</code>. This can be achieved by passing the
+ * correct Component Factory that will instanciate the correct object for the WOM builder.
+ * @param uri URI pointing to the WSDL document.
+ * @param wsdlComponentFactory The ComponentFactory that will be used to create the
+ * WOm components out of.
+ * @return WSDLVersionWrapper which contains both the WSDL 2.0 and WSDL 1.1
+ * object models.
+ * @throws WSDLException
+ */
+ public WSDLVersionWrapper build(String uri,
+ WSDLComponentFactory wsdlComponentFactory) throws WSDLException;
+
+ /**
+ * Buils a WOM and a WSDL4J object model from given the URI of the WSDL file and
+ * will be returned as a wrapper object WSDLVersionWrapper.
+ * @param in InputStream from which the WSDL document can be read in.
+ * @return WSDLVersionWrapper which contains both the WSDL 2.0 and WSDL 1.1
+ * object models.
+ * @throws WSDLException
+ */
+ public WSDLVersionWrapper build(InputStream in) throws WSDLException ;
+
+ /**
+ * Buils a WOM and a WSDL4J object model from given the URI of the WSDL file and
+ * will be returned as a wrapper object WSDLVersionWrapper. A WSDL Component Factory
+ * can be passed into the builder using which the WOM component can be built out of.
+ * For example: The Enigne uses the WOM's components in the context hierarchy but
+ * those are extended components.
+ * (<code>ServiceDescription</code> extends <code>WSDLService</code>.)
+ * So when deployment build the WOM it would prefer to get a <code>ServiceDescription</code>
+ * built in place of a <code>WSDLService</code>. This can be achieved by passing the
+ * correct Component Factory that will instanciate the correct object for the WOM builder.
+ * @param in InputStream from which the WSDL document can be read in.
+ * @param wsdlComponentFactory The ComponentFactory that will be used to create the
+ * WOm components out of.
+ * @return WSDLVersionWrapper which contains both the WSDL 2.0 and WSDL 1.1
+ * object models.
+ * @throws WSDLException
+ */
+ public WSDLVersionWrapper build(InputStream in,
+ WSDLComponentFactory wsdlComponentFactory) throws WSDLException;
+}
Propchange: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WOMBuilder.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WOMBuilderFactory.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WOMBuilderFactory.java?rev=289289&r1=289288&r2=289289&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WOMBuilderFactory.java (original)
+++ webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WOMBuilderFactory.java Thu Sep 15 11:52:11 2005
@@ -1,105 +1,105 @@
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.axis2.wsdl.builder;
-
-import org.apache.axis2.wsdl.builder.wsdl4j.WSDL1ToWOMBuilder;
-import org.apache.wsdl.WSDLConstants;
-import org.apache.wsdl.util.Utils;
-import org.w3c.dom.Document;
-import org.xml.sax.SAXException;
-
-import javax.wsdl.WSDLException;
-import javax.xml.parsers.ParserConfigurationException;
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * @author chathura@opensource.lk
- */
-public class WOMBuilderFactory {
-
- public static final int WSDL11 = 1;
- public static final int wsdl20 = 2;
-
-
- public static WOMBuilder getBuilder(int wsdlDocumentType) throws WSDLException {
-
- if (wsdlDocumentType == WSDL11) {
- return new WSDL1ToWOMBuilder();
- }
- if (wsdlDocumentType == wsdl20) {
- return new WSDL2ToWOMBuilder();
- }
- throw new WSDLException(WSDLException.INVALID_WSDL,
- "The document type specified is not valid");
- }
-
-
- public static WOMBuilder getBuilder(InputStream in) throws WSDLException {
- // Load the wsdl as a DOM
- Document doc;
- try {
- doc = Utils.newDocument(in);
- } catch (ParserConfigurationException e) {
- throw new WSDLException(WSDLException.PARSER_ERROR,
- "Parser Configuration Exception",
- e);
- } catch (IOException e1) {
- throw new WSDLException(WSDLException.PARSER_ERROR,
- "WSDL Document read error",
- e1);
- } catch (SAXException e2) {
- throw new WSDLException(WSDLException.PARSER_ERROR,
- "Parser Exception",
- e2);
- }
-
-
- //Check the target namespace of the WSDL and determine the WSDL version.
- int version = getWSDLVersion(doc);
-
- if (version == WSDL11) {
- return new WSDL1ToWOMBuilder();
- } else if (version == wsdl20) {
- return new WSDL2ToWOMBuilder();
- }
-
- throw new WSDLException(WSDLException.OTHER_ERROR,
- "Unable to Figure out the WSDL vesion of the Document");
- }
-
- /**
- * Will return an int that will represent the wsdl version and the int will correspond to the static
- * variables defined in this class.
- *
- * @param doc
- * @return
- * @throws WSDLException If the version cannot be determined
- */
- private static int getWSDLVersion(Document doc) throws WSDLException {
- //TODO check weather the namespaces are correct and the / problem too
- if (WSDLConstants.WSDL2_0_NAMESPACE.equals(
- doc.getDocumentElement().getNamespaceURI())) {
- return wsdl20;
- } else if (WSDLConstants.WSDL1_1_NAMESPACE.equals(
- doc.getDocumentElement().getNamespaceURI())) {
- return WSDL11;
- }
-
- throw new WSDLException(WSDLException.OTHER_ERROR,
- "Unable to Figure out the WSDL vesion of the Document");
- }
-}
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.axis2.wsdl.builder;
+
+import org.apache.axis2.wsdl.builder.wsdl4j.WSDL1ToWOMBuilder;
+import org.apache.wsdl.WSDLConstants;
+import org.apache.wsdl.util.Utils;
+import org.w3c.dom.Document;
+import org.xml.sax.SAXException;
+
+import javax.wsdl.WSDLException;
+import javax.xml.parsers.ParserConfigurationException;
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * @author chathura@opensource.lk
+ */
+public class WOMBuilderFactory {
+
+ public static final int WSDL11 = 1;
+ public static final int wsdl20 = 2;
+
+
+ public static WOMBuilder getBuilder(int wsdlDocumentType) throws WSDLException {
+
+ if (wsdlDocumentType == WSDL11) {
+ return new WSDL1ToWOMBuilder();
+ }
+ if (wsdlDocumentType == wsdl20) {
+ return new WSDL2ToWOMBuilder();
+ }
+ throw new WSDLException(WSDLException.INVALID_WSDL,
+ "The document type specified is not valid");
+ }
+
+
+ public static WOMBuilder getBuilder(InputStream in) throws WSDLException {
+ // Load the wsdl as a DOM
+ Document doc;
+ try {
+ doc = Utils.newDocument(in);
+ } catch (ParserConfigurationException e) {
+ throw new WSDLException(WSDLException.PARSER_ERROR,
+ "Parser Configuration Exception",
+ e);
+ } catch (IOException e1) {
+ throw new WSDLException(WSDLException.PARSER_ERROR,
+ "WSDL Document read error",
+ e1);
+ } catch (SAXException e2) {
+ throw new WSDLException(WSDLException.PARSER_ERROR,
+ "Parser Exception",
+ e2);
+ }
+
+
+ //Check the target namespace of the WSDL and determine the WSDL version.
+ int version = getWSDLVersion(doc);
+
+ if (version == WSDL11) {
+ return new WSDL1ToWOMBuilder();
+ } else if (version == wsdl20) {
+ return new WSDL2ToWOMBuilder();
+ }
+
+ throw new WSDLException(WSDLException.OTHER_ERROR,
+ "Unable to Figure out the WSDL vesion of the Document");
+ }
+
+ /**
+ * Will return an int that will represent the wsdl version and the int will correspond to the static
+ * variables defined in this class.
+ *
+ * @param doc
+ * @return
+ * @throws WSDLException If the version cannot be determined
+ */
+ private static int getWSDLVersion(Document doc) throws WSDLException {
+ //TODO check weather the namespaces are correct and the / problem too
+ if (WSDLConstants.WSDL2_0_NAMESPACE.equals(
+ doc.getDocumentElement().getNamespaceURI())) {
+ return wsdl20;
+ } else if (WSDLConstants.WSDL1_1_NAMESPACE.equals(
+ doc.getDocumentElement().getNamespaceURI())) {
+ return WSDL11;
+ }
+
+ throw new WSDLException(WSDLException.OTHER_ERROR,
+ "Unable to Figure out the WSDL vesion of the Document");
+ }
+}
Propchange: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WOMBuilderFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WSDL2ToWOMBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WSDL2ToWOMBuilder.java?rev=289289&r1=289288&r2=289289&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WSDL2ToWOMBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WSDL2ToWOMBuilder.java Thu Sep 15 11:52:11 2005
@@ -1,98 +1,98 @@
-/*
- * Copyright 2001-2004 The apace Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * tap://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.axis2.wsdl.builder;
-
-import org.apache.axis2.wsdl.WSDLVersionWrapper;
-
-import javax.wsdl.WSDLException;
-import java.io.InputStream;
-
-/**
- * @author chathura@opensource.lk
- */
-public class WSDL2ToWOMBuilder implements WOMBuilder {
-
- /**
- * Buils a WOM and a WSDL4J object model from given the URI of the WSDL file and
- * will be returned as a wrapper object WSDLVersionWrapper.
- * @param uri URI pointing to the WSDL document.
- * @return WSDLVersionWrapper which contains both the WSDL 2.0 and WSDL 1.1
- * object models.
- * @throws WSDLException
- */
- public WSDLVersionWrapper build(String uri) throws WSDLException{
- throw new UnsupportedOperationException("Not implemented as yet");
- }
-
- /**
- * Buils a WOM and a WSDL4J object model from given the URI of the WSDL file and
- * will be returned as a wrapper object WSDLVersionWrapper. A WSDL Component Factory
- * can be passed into the builder using which the WOM component can be built out of.
- * For example: The Enigne uses the WOM's components in the context hierarchy but
- * those are extended components.
- * (<code>ServiceDescription</code> extends <code>WSDLService</code>.)
- * So when deployment build the WOM it would prefer to get a <code>ServiceDescription</code>
- * built in place of a <code>WSDLService</code>. This can be achieved by passing the
- * correct Component Factory that will instanciate the correct object for the WOM builder.
- * @param uri URI pointing to the WSDL document.
- * @param wsdlComponentFactory The ComponentFactory that will be used to create the
- * WOm components out of.
- * @return WSDLVersionWrapper which contains both the WSDL 2.0 and WSDL 1.1
- * object models.
- * @throws WSDLException
- */
- public WSDLVersionWrapper build(String uri,
- WSDLComponentFactory wsdlComponentFactory) throws WSDLException{
- throw new UnsupportedOperationException("Not implemented as yet");
- }
-
- /**
- * Buils a WOM and a WSDL4J object model from given the URI of the WSDL file and
- * will be returned as a wrapper object WSDLVersionWrapper.
- * @param in InputStream from which the WSDL document can be read in.
- * @return WSDLVersionWrapper which contains both the WSDL 2.0 and WSDL 1.1
- * object models.
- * @throws WSDLException
- */
- public WSDLVersionWrapper build(InputStream in) throws WSDLException {
- throw new UnsupportedOperationException("Not implemented as yet");
- }
-
- /**
- * Buils a WOM and a WSDL4J object model from given the URI of the WSDL file and
- * will be returned as a wrapper object WSDLVersionWrapper. A WSDL Component Factory
- * can be passed into the builder using which the WOM component can be built out of.
- * For example: The Enigne uses the WOM's components in the context hierarchy but
- * those are extended components.
- * (<code>ServiceDescription</code> extends <code>WSDLService</code>.)
- * So when deployment build the WOM it would prefer to get a <code>ServiceDescription</code>
- * built in place of a <code>WSDLService</code>. This can be achieved by passing the
- * correct Component Factory that will instanciate the correct object for the WOM builder.
- * @param in InputStream from which the WSDL document can be read in.
- * @param wsdlComponentFactory The ComponentFactory that will be used to create the
- * WOm components out of.
- * @return WSDLVersionWrapper which contains both the WSDL 2.0 and WSDL 1.1
- * object models.
- * @throws WSDLException
- */
- public WSDLVersionWrapper build(InputStream in,
- WSDLComponentFactory wsdlComponentFactory) throws WSDLException{
- throw new UnsupportedOperationException("Not implemented as yet");
- }
-
-
-
-}
+/*
+ * Copyright 2001-2004 The apace Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * tap://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.axis2.wsdl.builder;
+
+import org.apache.axis2.wsdl.WSDLVersionWrapper;
+
+import javax.wsdl.WSDLException;
+import java.io.InputStream;
+
+/**
+ * @author chathura@opensource.lk
+ */
+public class WSDL2ToWOMBuilder implements WOMBuilder {
+
+ /**
+ * Buils a WOM and a WSDL4J object model from given the URI of the WSDL file and
+ * will be returned as a wrapper object WSDLVersionWrapper.
+ * @param uri URI pointing to the WSDL document.
+ * @return WSDLVersionWrapper which contains both the WSDL 2.0 and WSDL 1.1
+ * object models.
+ * @throws WSDLException
+ */
+ public WSDLVersionWrapper build(String uri) throws WSDLException{
+ throw new UnsupportedOperationException("Not implemented as yet");
+ }
+
+ /**
+ * Buils a WOM and a WSDL4J object model from given the URI of the WSDL file and
+ * will be returned as a wrapper object WSDLVersionWrapper. A WSDL Component Factory
+ * can be passed into the builder using which the WOM component can be built out of.
+ * For example: The Enigne uses the WOM's components in the context hierarchy but
+ * those are extended components.
+ * (<code>ServiceDescription</code> extends <code>WSDLService</code>.)
+ * So when deployment build the WOM it would prefer to get a <code>ServiceDescription</code>
+ * built in place of a <code>WSDLService</code>. This can be achieved by passing the
+ * correct Component Factory that will instanciate the correct object for the WOM builder.
+ * @param uri URI pointing to the WSDL document.
+ * @param wsdlComponentFactory The ComponentFactory that will be used to create the
+ * WOm components out of.
+ * @return WSDLVersionWrapper which contains both the WSDL 2.0 and WSDL 1.1
+ * object models.
+ * @throws WSDLException
+ */
+ public WSDLVersionWrapper build(String uri,
+ WSDLComponentFactory wsdlComponentFactory) throws WSDLException{
+ throw new UnsupportedOperationException("Not implemented as yet");
+ }
+
+ /**
+ * Buils a WOM and a WSDL4J object model from given the URI of the WSDL file and
+ * will be returned as a wrapper object WSDLVersionWrapper.
+ * @param in InputStream from which the WSDL document can be read in.
+ * @return WSDLVersionWrapper which contains both the WSDL 2.0 and WSDL 1.1
+ * object models.
+ * @throws WSDLException
+ */
+ public WSDLVersionWrapper build(InputStream in) throws WSDLException {
+ throw new UnsupportedOperationException("Not implemented as yet");
+ }
+
+ /**
+ * Buils a WOM and a WSDL4J object model from given the URI of the WSDL file and
+ * will be returned as a wrapper object WSDLVersionWrapper. A WSDL Component Factory
+ * can be passed into the builder using which the WOM component can be built out of.
+ * For example: The Enigne uses the WOM's components in the context hierarchy but
+ * those are extended components.
+ * (<code>ServiceDescription</code> extends <code>WSDLService</code>.)
+ * So when deployment build the WOM it would prefer to get a <code>ServiceDescription</code>
+ * built in place of a <code>WSDLService</code>. This can be achieved by passing the
+ * correct Component Factory that will instanciate the correct object for the WOM builder.
+ * @param in InputStream from which the WSDL document can be read in.
+ * @param wsdlComponentFactory The ComponentFactory that will be used to create the
+ * WOm components out of.
+ * @return WSDLVersionWrapper which contains both the WSDL 2.0 and WSDL 1.1
+ * object models.
+ * @throws WSDLException
+ */
+ public WSDLVersionWrapper build(InputStream in,
+ WSDLComponentFactory wsdlComponentFactory) throws WSDLException{
+ throw new UnsupportedOperationException("Not implemented as yet");
+ }
+
+
+
+}
Propchange: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WSDL2ToWOMBuilder.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WSDLComponentFactory.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WSDLComponentFactory.java?rev=289289&r1=289288&r2=289289&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WSDLComponentFactory.java (original)
+++ webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WSDLComponentFactory.java Thu Sep 15 11:52:11 2005
@@ -1,106 +1,106 @@
-package org.apache.axis2.wsdl.builder;
-
-import org.apache.wsdl.*;
-import org.apache.wsdl.extensions.ExtensionFactory;
-
-/**
- * @author chathura@opensource.lk
- */
-public interface WSDLComponentFactory {
-
- /**
- * @return A new instance of type <code>WSDLDescription</code>
- */
- public WSDLDescription createDescription();
-
- /**
- * @return A new instance of type <code>WSDLService</code>
- */
- public WSDLService createService();
-
- /**
- * @return A new instance of type <code>WSDLInterface</code>
- */
- public WSDLInterface createInterface();
-
- /**
- * @return A new instance of type <code>WSDLTypes</code>
- */
- public WSDLTypes createTypes();
-
- /**
- * @return A new instance of type <code>WSDLBinding</code>
- */
- public WSDLBinding createBinding();
-
- /**
- * @return A new instance of type <code>WSDLOperation</code>
- */
- public WSDLOperation createOperation();
-
- /**
- * @return A new instance of type <code>WSDLEndpoint</code>
- */
- public WSDLEndpoint createEndpoint();
-
- /**
- * @return A new instance of type <code>WSDLFault</code>
- */
- public WSDLFaultReference createFaultReference();
-
- /**
- * @return A new instance of type <code>WSDLFeature</code>
- */
- public WSDLFeature createFeature();
-
- /**
- * @return A new instance of type <code>WSDLImport</code>
- */
- public WSDLImport createImport();
-
- /**
- * @return A new instance of type <code>WSDLInclude</code>
- */
- public WSDLInclude createInclude();
-
- /**
- * Method createProperty
- *
- * @return A new instance of <code>WSDLProperty</code>
- */
- public WSDLProperty createProperty();
-
- /**
- * @return A new instance of <code>MessageReference</code>
- */
- public MessageReference createMessageReference();
-
- /**
- * @return A new instance of <code>WSDLBindingMessageReference</code>
- */
- public WSDLBindingMessageReference createWSDLBindingMessageReference();
-
- /**
- * @return A new instance of <code>WSDLBindingOperation</code>
- */
- public WSDLBindingOperation createWSDLBindingOperation();
-
-
- /**
- * @return A new instance of <code>WSDLExtensibilityAttribute</code>
- */
- public WSDLExtensibilityAttribute createWSDLExtensibilityAttribute();
-
- /**
- * @return A new instance of <code>WSDLBindingFault</code>
- */
- public WSDLBindingFault createBindingFault();
-
- /**
- * @return A new Instance of <code>ExtensionFactory</code> that
- * is capable of creating the correct <code>ExtensibilityElement</code>
- * given a <code>QName</code>.
- */
- public ExtensionFactory createExtensionFactory();
-
-}
+package org.apache.axis2.wsdl.builder;
+
+import org.apache.wsdl.*;
+import org.apache.wsdl.extensions.ExtensionFactory;
+
+/**
+ * @author chathura@opensource.lk
+ */
+public interface WSDLComponentFactory {
+
+ /**
+ * @return A new instance of type <code>WSDLDescription</code>
+ */
+ public WSDLDescription createDescription();
+
+ /**
+ * @return A new instance of type <code>WSDLService</code>
+ */
+ public WSDLService createService();
+
+ /**
+ * @return A new instance of type <code>WSDLInterface</code>
+ */
+ public WSDLInterface createInterface();
+
+ /**
+ * @return A new instance of type <code>WSDLTypes</code>
+ */
+ public WSDLTypes createTypes();
+
+ /**
+ * @return A new instance of type <code>WSDLBinding</code>
+ */
+ public WSDLBinding createBinding();
+
+ /**
+ * @return A new instance of type <code>WSDLOperation</code>
+ */
+ public WSDLOperation createOperation();
+
+ /**
+ * @return A new instance of type <code>WSDLEndpoint</code>
+ */
+ public WSDLEndpoint createEndpoint();
+
+ /**
+ * @return A new instance of type <code>WSDLFault</code>
+ */
+ public WSDLFaultReference createFaultReference();
+
+ /**
+ * @return A new instance of type <code>WSDLFeature</code>
+ */
+ public WSDLFeature createFeature();
+
+ /**
+ * @return A new instance of type <code>WSDLImport</code>
+ */
+ public WSDLImport createImport();
+
+ /**
+ * @return A new instance of type <code>WSDLInclude</code>
+ */
+ public WSDLInclude createInclude();
+
+ /**
+ * Method createProperty
+ *
+ * @return A new instance of <code>WSDLProperty</code>
+ */
+ public WSDLProperty createProperty();
+
+ /**
+ * @return A new instance of <code>MessageReference</code>
+ */
+ public MessageReference createMessageReference();
+
+ /**
+ * @return A new instance of <code>WSDLBindingMessageReference</code>
+ */
+ public WSDLBindingMessageReference createWSDLBindingMessageReference();
+
+ /**
+ * @return A new instance of <code>WSDLBindingOperation</code>
+ */
+ public WSDLBindingOperation createWSDLBindingOperation();
+
+
+ /**
+ * @return A new instance of <code>WSDLExtensibilityAttribute</code>
+ */
+ public WSDLExtensibilityAttribute createWSDLExtensibilityAttribute();
+
+ /**
+ * @return A new instance of <code>WSDLBindingFault</code>
+ */
+ public WSDLBindingFault createBindingFault();
+
+ /**
+ * @return A new Instance of <code>ExtensionFactory</code> that
+ * is capable of creating the correct <code>ExtensibilityElement</code>
+ * given a <code>QName</code>.
+ */
+ public ExtensionFactory createExtensionFactory();
+
+}
Propchange: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WSDLComponentFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDL11MEPFinder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDL11MEPFinder.java?rev=289289&r1=289288&r2=289289&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDL11MEPFinder.java (original)
+++ webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDL11MEPFinder.java Thu Sep 15 11:52:11 2005
@@ -1,68 +1,68 @@
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.axis2.wsdl.builder.wsdl4j;
-
-import org.apache.wsdl.WSDLConstants;
-import org.apache.wsdl.impl.WSDLProcessingException;
-
-import javax.wsdl.Operation;
-import javax.wsdl.OperationType;
-
-/**
- * @author chathura@opensource.lk
- */
-public class WSDL11MEPFinder {
-
- public static String getMEP(Operation operation) {
-// boolean inMessageExist = false, outMessageExist = false;
-// if(null != operation.getInput()){
-// inMessageExist = true;
-// }
-// if(null != operation.getOutput()){
-// outMessageExist = true;
-// }
-//
-// if(inMessageExist && outMessageExist){
-// return WSDLConstants.MEP_URI_IN_OUT;
-// }
-//
-// if(inMessageExist && !outMessageExist){
-// return WSDLConstants.MEP_URI_IN_ONLY;
-// }
-//
-// if(!inMessageExist && outMessageExist){
-// return WSDLConstants.MEP_URI_OUT_ONLY;
-// }
-//
- OperationType operationType = operation.getStyle();
- if (null != operationType) {
-
- if (operationType.equals(OperationType.REQUEST_RESPONSE))
- return WSDLConstants.MEP_URI_IN_OUT;
-
- if (operationType.equals(OperationType.ONE_WAY))
- return WSDLConstants.MEP_URI_IN_ONLY;
-
- if (operationType.equals(OperationType.NOTIFICATION))
- return WSDLConstants.MEP_URI_OUT_ONLY;
-
- if (operationType.equals(OperationType.SOLICIT_RESPONSE))
- return WSDLConstants.MEP_URI_OUT_IN;
- }
- throw new WSDLProcessingException("Cannot Determine the MEP");
-
- }
-}
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.axis2.wsdl.builder.wsdl4j;
+
+import org.apache.wsdl.WSDLConstants;
+import org.apache.wsdl.impl.WSDLProcessingException;
+
+import javax.wsdl.Operation;
+import javax.wsdl.OperationType;
+
+/**
+ * @author chathura@opensource.lk
+ */
+public class WSDL11MEPFinder {
+
+ public static String getMEP(Operation operation) {
+// boolean inMessageExist = false, outMessageExist = false;
+// if(null != operation.getInput()){
+// inMessageExist = true;
+// }
+// if(null != operation.getOutput()){
+// outMessageExist = true;
+// }
+//
+// if(inMessageExist && outMessageExist){
+// return WSDLConstants.MEP_URI_IN_OUT;
+// }
+//
+// if(inMessageExist && !outMessageExist){
+// return WSDLConstants.MEP_URI_IN_ONLY;
+// }
+//
+// if(!inMessageExist && outMessageExist){
+// return WSDLConstants.MEP_URI_OUT_ONLY;
+// }
+//
+ OperationType operationType = operation.getStyle();
+ if (null != operationType) {
+
+ if (operationType.equals(OperationType.REQUEST_RESPONSE))
+ return WSDLConstants.MEP_URI_IN_OUT;
+
+ if (operationType.equals(OperationType.ONE_WAY))
+ return WSDLConstants.MEP_URI_IN_ONLY;
+
+ if (operationType.equals(OperationType.NOTIFICATION))
+ return WSDLConstants.MEP_URI_OUT_ONLY;
+
+ if (operationType.equals(OperationType.SOLICIT_RESPONSE))
+ return WSDLConstants.MEP_URI_OUT_IN;
+ }
+ throw new WSDLProcessingException("Cannot Determine the MEP");
+
+ }
+}
Propchange: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDL11MEPFinder.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDL1ToWOMBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDL1ToWOMBuilder.java?rev=289289&r1=289288&r2=289289&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDL1ToWOMBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDL1ToWOMBuilder.java Thu Sep 15 11:52:11 2005
@@ -1,182 +1,182 @@
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.axis2.wsdl.builder.wsdl4j;
-
-import org.apache.axis2.wsdl.WSDLVersionWrapper;
-import org.apache.axis2.wsdl.builder.WOMBuilder;
-import org.apache.axis2.wsdl.builder.WSDLComponentFactory;
-import org.apache.axis2.wsdl.util.XMLUtils;
-import org.apache.wsdl.WSDLDescription;
-import org.apache.wsdl.impl.WSDLDescriptionImpl;
-import org.w3c.dom.Document;
-import org.xml.sax.SAXException;
-
-import javax.wsdl.Definition;
-import javax.wsdl.WSDLException;
-import javax.wsdl.factory.WSDLFactory;
-import javax.wsdl.xml.WSDLReader;
-import javax.xml.parsers.ParserConfigurationException;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * @author chathura@opensource.lk
- */
-public class WSDL1ToWOMBuilder implements WOMBuilder {
-
- /**
- * Buils a WOM and a WSDL4J object model from given the URI of the WSDL file and
- * will be returned as a wrapper object WSDLVersionWrapper.
- * @param in InputStream from which the WSDL document can be read in.
- * @return WSDLVersionWrapper which contains both the WSDL 2.0 and WSDL 1.1
- * object models.
- * @throws WSDLException
- */
- public WSDLVersionWrapper build(InputStream in) throws WSDLException {
- return build(in, null);
- }
-
- /**
- * Buils a WOM and a WSDL4J object model from given the URI of the WSDL file and
- * will be returned as a wrapper object WSDLVersionWrapper. A WSDL Component Factory
- * can be passed into the builder using which the WOM component can be built out of.
- * For example: The Enigne uses the WOM's components in the context hierarchy but
- * those are extended components.
- * (<code>ServiceDescription</code> extends <code>WSDLService</code>.)
- * So when deployment build the WOM it would prefer to get a <code>ServiceDescription</code>
- * built in place of a <code>WSDLService</code>. This can be achieved by passing the
- * correct Component Factory that will instanciate the correct object for the WOM builder.
- * @param in InputStream from which the WSDL document can be read in.
- * @param wsdlComponentFactory The ComponentFactory that will be used to create the
- * WOm components out of.
- * @return WSDLVersionWrapper which contains both the WSDL 2.0 and WSDL 1.1
- * object models.
- * @throws WSDLException
- */
- public WSDLVersionWrapper build(InputStream in,
- WSDLComponentFactory wsdlComponentFactory) throws WSDLException {
- if(null == wsdlComponentFactory){
- wsdlComponentFactory = new WSDLDescriptionImpl();
- }
- WSDLDescription wsdlDescription = wsdlComponentFactory.createDescription();
-
- Definition wsdl1Definition = this.readInTheWSDLFile(in);
- WSDLPump pump = new WSDLPump(wsdlDescription, wsdl1Definition);
- pump.pump();
-
- return new WSDLVersionWrapper(wsdlDescription, wsdl1Definition);
- }
-
-
- /**
- * Buils a WOM and a WSDL4J object model from given the URI of the WSDL file and
- * will be returned as a wrapper object WSDLVersionWrapper.
- * @param uri URI pointing to the WSDL document.
- * @return WSDLVersionWrapper which contains both the WSDL 2.0 and WSDL 1.1
- * object models.
- * @throws WSDLException
- */
- public WSDLVersionWrapper build(String uri) throws WSDLException {
- return build(uri, null);
- }
-
- /**
- * Buils a WOM and a WSDL4J object model from given the URI of the WSDL file and
- * will be returned as a wrapper object WSDLVersionWrapper. A WSDL Component Factory
- * can be passed into the builder using which the WOM component can be built out of.
- * For example: The Enigne uses the WOM's components in the context hierarchy but
- * those are extended components.
- * (<code>ServiceDescription</code> extends <code>WSDLService</code>.)
- * So when deployment build the WOM it would prefer to get a <code>ServiceDescription</code>
- * built in place of a <code>WSDLService</code>. This can be achieved by passing the
- * correct Component Factory that will instanciate the correct object for the WOM builder.
- * @param uri URI pointing to the WSDL document.
- * @param wsdlComponentFactory The ComponentFactory that will be used to create the
- * WOm components out of.
- * @return WSDLVersionWrapper which contains both the WSDL 2.0 and WSDL 1.1
- * object models.
- * @throws WSDLException
- */
- public WSDLVersionWrapper build(String uri,
- WSDLComponentFactory wsdlComponentFactory) throws WSDLException {
- if(null == wsdlComponentFactory){
- wsdlComponentFactory = new WSDLDescriptionImpl();
- }
- WSDLDescription wsdlDescription = wsdlComponentFactory.createDescription();
-
- Definition wsdl1Definition = this.readInTheWSDLFile(uri);
- WSDLPump pump = new WSDLPump(wsdlDescription,
- wsdl1Definition,
- wsdlComponentFactory);
- pump.pump();
-
- return new WSDLVersionWrapper(wsdlDescription, wsdl1Definition);
-
- }
-
- private Definition readInTheWSDLFile(String uri) throws WSDLException {
-
- WSDLReader reader =
- WSDLFactory.newInstance().newWSDLReader();
- File file = new File(uri);
- String baseURI = file.getParentFile()!=null?file.getParentFile().toURI().toString():null;
-
- Document doc;
- try {
- doc = XMLUtils.newDocument(uri);
- } catch (ParserConfigurationException e) {
- throw new WSDLException(WSDLException.PARSER_ERROR,
- "Parser Configuration Error",
- e);
- } catch (SAXException e) {
- throw new WSDLException(WSDLException.PARSER_ERROR,
- "Parser SAX Error",
- e);
-
- } catch (IOException e) {
- throw new WSDLException(WSDLException.INVALID_WSDL, "IO Error", e);
- }
-
- return reader.readWSDL(baseURI, doc);
- }
-
- private Definition readInTheWSDLFile(InputStream in) throws WSDLException {
-
- WSDLReader reader =
- WSDLFactory.newInstance().newWSDLReader();
-
- Document doc;
- try {
- doc = XMLUtils.newDocument(in);
- } catch (ParserConfigurationException e) {
- throw new WSDLException(WSDLException.PARSER_ERROR,
- "Parser Configuration Error",
- e);
- } catch (SAXException e) {
- throw new WSDLException(WSDLException.PARSER_ERROR,
- "Parser SAX Error",
- e);
-
- } catch (IOException e) {
- throw new WSDLException(WSDLException.INVALID_WSDL, "IO Error", e);
- }
-
- return reader.readWSDL(null, doc);
- }
-
-
-}
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.axis2.wsdl.builder.wsdl4j;
+
+import org.apache.axis2.wsdl.WSDLVersionWrapper;
+import org.apache.axis2.wsdl.builder.WOMBuilder;
+import org.apache.axis2.wsdl.builder.WSDLComponentFactory;
+import org.apache.axis2.wsdl.util.XMLUtils;
+import org.apache.wsdl.WSDLDescription;
+import org.apache.wsdl.impl.WSDLDescriptionImpl;
+import org.w3c.dom.Document;
+import org.xml.sax.SAXException;
+
+import javax.wsdl.Definition;
+import javax.wsdl.WSDLException;
+import javax.wsdl.factory.WSDLFactory;
+import javax.wsdl.xml.WSDLReader;
+import javax.xml.parsers.ParserConfigurationException;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * @author chathura@opensource.lk
+ */
+public class WSDL1ToWOMBuilder implements WOMBuilder {
+
+ /**
+ * Buils a WOM and a WSDL4J object model from given the URI of the WSDL file and
+ * will be returned as a wrapper object WSDLVersionWrapper.
+ * @param in InputStream from which the WSDL document can be read in.
+ * @return WSDLVersionWrapper which contains both the WSDL 2.0 and WSDL 1.1
+ * object models.
+ * @throws WSDLException
+ */
+ public WSDLVersionWrapper build(InputStream in) throws WSDLException {
+ return build(in, null);
+ }
+
+ /**
+ * Buils a WOM and a WSDL4J object model from given the URI of the WSDL file and
+ * will be returned as a wrapper object WSDLVersionWrapper. A WSDL Component Factory
+ * can be passed into the builder using which the WOM component can be built out of.
+ * For example: The Enigne uses the WOM's components in the context hierarchy but
+ * those are extended components.
+ * (<code>ServiceDescription</code> extends <code>WSDLService</code>.)
+ * So when deployment build the WOM it would prefer to get a <code>ServiceDescription</code>
+ * built in place of a <code>WSDLService</code>. This can be achieved by passing the
+ * correct Component Factory that will instanciate the correct object for the WOM builder.
+ * @param in InputStream from which the WSDL document can be read in.
+ * @param wsdlComponentFactory The ComponentFactory that will be used to create the
+ * WOm components out of.
+ * @return WSDLVersionWrapper which contains both the WSDL 2.0 and WSDL 1.1
+ * object models.
+ * @throws WSDLException
+ */
+ public WSDLVersionWrapper build(InputStream in,
+ WSDLComponentFactory wsdlComponentFactory) throws WSDLException {
+ if(null == wsdlComponentFactory){
+ wsdlComponentFactory = new WSDLDescriptionImpl();
+ }
+ WSDLDescription wsdlDescription = wsdlComponentFactory.createDescription();
+
+ Definition wsdl1Definition = this.readInTheWSDLFile(in);
+ WSDLPump pump = new WSDLPump(wsdlDescription, wsdl1Definition);
+ pump.pump();
+
+ return new WSDLVersionWrapper(wsdlDescription, wsdl1Definition);
+ }
+
+
+ /**
+ * Buils a WOM and a WSDL4J object model from given the URI of the WSDL file and
+ * will be returned as a wrapper object WSDLVersionWrapper.
+ * @param uri URI pointing to the WSDL document.
+ * @return WSDLVersionWrapper which contains both the WSDL 2.0 and WSDL 1.1
+ * object models.
+ * @throws WSDLException
+ */
+ public WSDLVersionWrapper build(String uri) throws WSDLException {
+ return build(uri, null);
+ }
+
+ /**
+ * Buils a WOM and a WSDL4J object model from given the URI of the WSDL file and
+ * will be returned as a wrapper object WSDLVersionWrapper. A WSDL Component Factory
+ * can be passed into the builder using which the WOM component can be built out of.
+ * For example: The Enigne uses the WOM's components in the context hierarchy but
+ * those are extended components.
+ * (<code>ServiceDescription</code> extends <code>WSDLService</code>.)
+ * So when deployment build the WOM it would prefer to get a <code>ServiceDescription</code>
+ * built in place of a <code>WSDLService</code>. This can be achieved by passing the
+ * correct Component Factory that will instanciate the correct object for the WOM builder.
+ * @param uri URI pointing to the WSDL document.
+ * @param wsdlComponentFactory The ComponentFactory that will be used to create the
+ * WOm components out of.
+ * @return WSDLVersionWrapper which contains both the WSDL 2.0 and WSDL 1.1
+ * object models.
+ * @throws WSDLException
+ */
+ public WSDLVersionWrapper build(String uri,
+ WSDLComponentFactory wsdlComponentFactory) throws WSDLException {
+ if(null == wsdlComponentFactory){
+ wsdlComponentFactory = new WSDLDescriptionImpl();
+ }
+ WSDLDescription wsdlDescription = wsdlComponentFactory.createDescription();
+
+ Definition wsdl1Definition = this.readInTheWSDLFile(uri);
+ WSDLPump pump = new WSDLPump(wsdlDescription,
+ wsdl1Definition,
+ wsdlComponentFactory);
+ pump.pump();
+
+ return new WSDLVersionWrapper(wsdlDescription, wsdl1Definition);
+
+ }
+
+ private Definition readInTheWSDLFile(String uri) throws WSDLException {
+
+ WSDLReader reader =
+ WSDLFactory.newInstance().newWSDLReader();
+ File file = new File(uri);
+ String baseURI = file.getParentFile()!=null?file.getParentFile().toURI().toString():null;
+
+ Document doc;
+ try {
+ doc = XMLUtils.newDocument(uri);
+ } catch (ParserConfigurationException e) {
+ throw new WSDLException(WSDLException.PARSER_ERROR,
+ "Parser Configuration Error",
+ e);
+ } catch (SAXException e) {
+ throw new WSDLException(WSDLException.PARSER_ERROR,
+ "Parser SAX Error",
+ e);
+
+ } catch (IOException e) {
+ throw new WSDLException(WSDLException.INVALID_WSDL, "IO Error", e);
+ }
+
+ return reader.readWSDL(baseURI, doc);
+ }
+
+ private Definition readInTheWSDLFile(InputStream in) throws WSDLException {
+
+ WSDLReader reader =
+ WSDLFactory.newInstance().newWSDLReader();
+
+ Document doc;
+ try {
+ doc = XMLUtils.newDocument(in);
+ } catch (ParserConfigurationException e) {
+ throw new WSDLException(WSDLException.PARSER_ERROR,
+ "Parser Configuration Error",
+ e);
+ } catch (SAXException e) {
+ throw new WSDLException(WSDLException.PARSER_ERROR,
+ "Parser SAX Error",
+ e);
+
+ } catch (IOException e) {
+ throw new WSDLException(WSDLException.INVALID_WSDL, "IO Error", e);
+ }
+
+ return reader.readWSDL(null, doc);
+ }
+
+
+}
Propchange: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDL1ToWOMBuilder.java
------------------------------------------------------------------------------
svn:eol-style = native