This is an automated email from the ASF dual-hosted git repository. robertlazarski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
commit 88857ee165318d8e300d04fc5dad00677daaf6b8 Author: Robert Lazarski <[email protected]> AuthorDate: Mon Oct 12 08:28:49 2026 -1000 Fix ant samples in the binary distribution; remove dead samples Samples ship under modules/samples, but most build.xml files still located AXIS2_HOME two levels up, so ant failed. pojoguidespring now fetches Spring 7.0.9 from Maven Central and servicelifecycle builds against Axiom 2.0. The yahoo*, googlespellcheck, jaxws-dynamic and book samples are removed. Co-Authored-By: Claude Opus 5.5 <[email protected]> --- .../src/main/assembly/bin-assembly.xml | 5 - modules/samples/advanced-rmi/build.xml | 2 +- modules/samples/book/README | 9 - modules/samples/book/pom.xml | 150 ----------- modules/samples/book/src/main/log4j2.xml | 44 ---- .../samples/book/src/main/samples/demo/Book.java | 50 ---- .../book/src/main/samples/demo/BookService.java | 41 --- .../services/BookService/META-INF/services.xml | 35 --- modules/samples/book/src/webapp/WEB-INF/web.xml | 39 --- modules/samples/googlespellcheck/README.txt | 45 ---- modules/samples/googlespellcheck/build.xml | 119 --------- .../src/sample/spellcheck/editor/AsyncPanel.java | 113 --------- .../src/sample/spellcheck/editor/FormModel.java | 78 ------ .../src/sample/spellcheck/editor/Observer.java | 34 --- .../SimplifiedSpellCheckCallbackHandlerImpl.java | 55 ---- .../sample/spellcheck/editor/SuggestionForm.java | 208 --------------- .../src/sample/spellcheck/editor/SyncPanel.java | 103 -------- modules/samples/jaxws-dynamic/README.txt | 1 - .../resources/wsdl/DynamicSample.wsdl | 101 -------- .../sample/dynamic/DynamicServiceProvider.java | 98 ------- .../resources/META-INF/BaseDataTypesDocLitB.wsdl | 2 +- modules/samples/jaxws-version/build.xml | 2 +- modules/samples/mex/build.xml | 10 +- modules/samples/ping/build.xml | 4 +- modules/samples/pojo/build.xml | 2 +- modules/samples/pojoguide/build.xml | 2 +- modules/samples/pojoguidespring/build.xml | 37 ++- .../pojoguidespring/src/applicationContext.xml | 7 +- modules/samples/quickstart/build.xml | 4 +- modules/samples/quickstartadb/build.xml | 4 +- modules/samples/quickstartaxiom/build.xml | 4 +- modules/samples/quickstartxmlbeans/build.xml | 4 +- modules/samples/script/build.xml | 4 +- modules/samples/servicelifecycle/build.xml | 8 +- .../sample/servicelifecycle/LibraryLifeCycle.java | 10 +- modules/samples/soapwithattachments/build.xml | 2 +- modules/samples/userguide/build.xml | 14 +- modules/samples/version/build.xml | 2 +- modules/samples/yahoojsonsearch/README.txt | 24 -- modules/samples/yahoojsonsearch/build.xml | 57 ----- .../samples/yahoojsonsearch/resources/axis2.xml | 282 --------------------- .../yahooservices/JSONSearch/JSONSearchClient.java | 50 ---- .../yahooservices/JSONSearch/JSONSearchModel.java | 127 ---------- .../yahooservices/JSONSearch/UserInterface.java | 135 ---------- modules/samples/yahoorestsearch/README.txt | 25 -- modules/samples/yahoorestsearch/build.xml | 57 ----- .../yahooservices/RESTSearch/RESTSearchClient.java | 49 ---- .../yahooservices/RESTSearch/RESTSearchModel.java | 115 --------- .../yahooservices/RESTSearch/UserInterface.java | 134 ---------- src/site/markdown/release-notes/2.0.2.md | 15 +- 50 files changed, 79 insertions(+), 2443 deletions(-) diff --git a/modules/distribution/src/main/assembly/bin-assembly.xml b/modules/distribution/src/main/assembly/bin-assembly.xml index 7964bcd5c7..8e1fa44493 100755 --- a/modules/distribution/src/main/assembly/bin-assembly.xml +++ b/modules/distribution/src/main/assembly/bin-assembly.xml @@ -124,14 +124,12 @@ <outputDirectory>modules/samples</outputDirectory> <includes> <include>pom.xml</include> - <include>databinding/**/*</include> <include>faulthandling/**/*</include> <include>jaxws-calculator/**/*</include> <include>jaxws-addressbook/**/*</include> <include>jaxws-samples/**/*</include> <include>java_first_jaxws/**/*</include> <include>jaxws-interop/**/*</include> - <include>jaxws-dynamic/**/*</include> <include>jaxws-version/**/*</include> <include>json/**/*</include> <include>mtom/**/*</include> @@ -141,7 +139,6 @@ <include>quickstart/**/*</include> <include>quickstartadb/**/*</include> <include>quickstartaxiom/**/*</include> - <include>quickstartjibx/**/*</include> <include>quickstartxmlbeans/**/*</include> <include>servicelifecycle/**/*</include> <include>soapwithattachments/**/*</include> @@ -149,8 +146,6 @@ <include>userguide/**/*</include> <include>version/**/*</include> <include>wsdl/**/*</include> - <include>yahoojsonsearch/**/*</include> - <include>yahoorestsearch/**/*</include> <include>swagger-server/**/*</include> </includes> <excludes> diff --git a/modules/samples/advanced-rmi/build.xml b/modules/samples/advanced-rmi/build.xml index 370af65ded..c544b77fd5 100644 --- a/modules/samples/advanced-rmi/build.xml +++ b/modules/samples/advanced-rmi/build.xml @@ -29,7 +29,7 @@ <property name="sample_home" value="${basedir}"/> <property name="classes_dir" value="${sample_home}/classes"/> <property name="src_dir" value="${sample_home}/src"/> - <property name="axis2.home" value="../../" /> + <property name="axis2.home" value="../../../" /> <property name="lib_dir" value="${axis2.home}/lib"/> <property name="dist_dir" value="${axis2.home}/dist"/> <property name="deploy_dir" value="${sample_home}/deploy"/> diff --git a/modules/samples/book/README b/modules/samples/book/README deleted file mode 100644 index be32247a7f..0000000000 --- a/modules/samples/book/README +++ /dev/null @@ -1,9 +0,0 @@ -This example shows how to use Axis2 in a servlet container. You must -have Maven 2.x installed to build this example. To build type: - -$ mvn install war:war - -Rename the resultant war as your_web_app.war and drop it into any servlet engine. -The WSDL file for the service should be viewable at: - -http://yourhost:port/your_web_app/services/BookService?wsdl \ No newline at end of file diff --git a/modules/samples/book/pom.xml b/modules/samples/book/pom.xml deleted file mode 100644 index cefb4bf47f..0000000000 --- a/modules/samples/book/pom.xml +++ /dev/null @@ -1,150 +0,0 @@ -<!-- - ~ Licensed to the Apache Software Foundation (ASF) under one - ~ or more contributor license agreements. See the NOTICE file - ~ distributed with this work for additional information - ~ regarding copyright ownership. The ASF licenses this file - ~ to you under the Apache License, Version 2.0 (the - ~ "License"); you may not use this file except in compliance - ~ with the License. You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, - ~ software distributed under the License is distributed on an - ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - ~ KIND, either express or implied. See the License for the - ~ specific language governing permissions and limitations - ~ under the License. - --> - -<project xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.axis2.examples</groupId> - <artifactId>axis2-book</artifactId> - <name>Book Example</name> - <version>1.1</version> - <inceptionYear>2004</inceptionYear> - - <dependencies> - <dependency> - <groupId>jakarta.servlet</groupId> - <artifactId>jakarta.servlet-api</artifactId> - <version>6.0.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.axis2</groupId> - <artifactId>axis2-kernel</artifactId> - <version>1.8.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.axis2</groupId> - <artifactId>axis2-codegen</artifactId> - <version>1.8.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.axis2</groupId> - <artifactId>axis2-adb</artifactId> - <version>1.8.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.ws.commons.axiom</groupId> - <artifactId>axiom-api</artifactId> - <version>1.3.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.ws.commons.axiom</groupId> - <artifactId>axiom-impl</artifactId> - <version>1.3.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.ws.xmlschema</groupId> - <artifactId>xmlschema-core</artifactId> - <version>2.2.5</version> - </dependency> - <dependency> - <groupId>org.apache.neethi</groupId> - <artifactId>neethi</artifactId> - <version>3.2.2</version> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.2</version> - </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - <version>4.5.13</version> - </dependency> - <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - <version>1.15</version> - </dependency> - <dependency> - <groupId>org.codehaus.woodstox</groupId> - <artifactId>woodstox-core-asl</artifactId> - <version>4.4.1</version> - </dependency> - <dependency> - <groupId>wsdl4j</groupId> - <artifactId>wsdl4j</artifactId> - <version>1.6.3</version> - </dependency> - <dependency> - <groupId>org.apache.axis2</groupId> - <artifactId>axis2-transport-http</artifactId> - <version>1.8.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.axis2</groupId> - <artifactId>axis2-transport-local</artifactId> - <version>1.8.0-SNAPSHOT</version> - </dependency> - - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <warSourceDirectory>${basedir}/src/webapp</warSourceDirectory> - </configuration> - </plugin> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.8.1</version> - <configuration> - <source>1.8</source> - <target>1.8</target> - </configuration> - </plugin> - </plugins> - <sourceDirectory>src/main</sourceDirectory> - <testSourceDirectory>src/test</testSourceDirectory> - <resources> - <resource> - <directory>src/main</directory> - <includes> - <include>**/*.xml</include> - </includes> - </resource> - </resources> - <testResources> - <testResource> - <directory>src/test</directory> - <includes> - <include>**/*.xml</include> - <include>**/*.properties</include> - <include>**/*.wsdl</include> - </includes> - </testResource> - </testResources> - </build> - -</project> diff --git a/modules/samples/book/src/main/log4j2.xml b/modules/samples/book/src/main/log4j2.xml deleted file mode 100644 index d2e94acaaf..0000000000 --- a/modules/samples/book/src/main/log4j2.xml +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<Configuration status="debug" name="axis2" packages=""> - <Appenders> - <Console name="Console" target="SYSTEM_OUT"> - <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/> - </Console> - <RollingFile name="RollingFile" append="true" fileName="axis2.log" filePattern="axis2-%i.log.gz"> - <PatternLayout> - <Pattern>%d %p %c{1.} [%t] %m%n</Pattern> - </PatternLayout> - <Policies> - <OnStartupTriggeringPolicy/> - <SizeBasedTriggeringPolicy size="20 MB"/> - </Policies> - <DefaultRolloverStrategy max="10"> - <Delete basePath="${baseDir}" > - <IfFileName glob="*.log.*"> - <IfAny> - <IfLastModified age="5d" />- - </IfAny> - </IfFileName> - </Delete> - </DefaultRolloverStrategy> - </RollingFile> - </Appenders> - <Loggers> - <Logger name="org.apache" level="warn" additivity="false" > - <AppenderRef ref="RollingFile"/> - <AppenderRef ref="Console"/> - </Logger> - <Logger name="org.apache.axis2" level="debug" additivity="false" > - <AppenderRef ref="RollingFile"/> - <AppenderRef ref="Console"/> - </Logger> - <Logger name="org.springframework" level="warn" additivity="false" > - <AppenderRef ref="RollingFile"/> - <AppenderRef ref="Console"/> - </Logger> - <Root level="debug"> - <AppenderRef ref="Console"/> - <AppenderRef ref="RollingFile"/> - </Root> - </Loggers> -</Configuration> diff --git a/modules/samples/book/src/main/samples/demo/Book.java b/modules/samples/book/src/main/samples/demo/Book.java deleted file mode 100644 index 5449454991..0000000000 --- a/modules/samples/book/src/main/samples/demo/Book.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package samples.demo; - -public class Book { - private String title; - private String isbn; - private String author; - - public String getIsbn() { - return isbn; - } - - public void setIsbn(String isbn) { - this.isbn = isbn; - } - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public String getAuthor() { - return author; - } - - public void setAuthor(String author) { - this.author = author; - } -} - diff --git a/modules/samples/book/src/main/samples/demo/BookService.java b/modules/samples/book/src/main/samples/demo/BookService.java deleted file mode 100644 index 37a65527a8..0000000000 --- a/modules/samples/book/src/main/samples/demo/BookService.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package samples.demo; - -public class BookService { - private Book onlyBook; - - public BookService() { - onlyBook = new Book(); - onlyBook.setAuthor("Glen Daniels"); - onlyBook.setTitle("Using Axis2"); - onlyBook.setIsbn("0123456789"); - } - - public Book[] getBooks() { - return new Book[]{onlyBook}; - } - - public Book findBook(String isbn) { - if (isbn.equals(onlyBook.getIsbn())) - return onlyBook; - - return null; - } -} diff --git a/modules/samples/book/src/webapp/WEB-INF/services/BookService/META-INF/services.xml b/modules/samples/book/src/webapp/WEB-INF/services/BookService/META-INF/services.xml deleted file mode 100644 index 806ae8ce9b..0000000000 --- a/modules/samples/book/src/webapp/WEB-INF/services/BookService/META-INF/services.xml +++ /dev/null @@ -1,35 +0,0 @@ -<!-- - ~ Licensed to the Apache Software Foundation (ASF) under one - ~ or more contributor license agreements. See the NOTICE file - ~ distributed with this work for additional information - ~ regarding copyright ownership. The ASF licenses this file - ~ to you under the Apache License, Version 2.0 (the - ~ "License"); you may not use this file except in compliance - ~ with the License. You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, - ~ software distributed under the License is distributed on an - ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - ~ KIND, either express or implied. See the License for the - ~ specific language governing permissions and limitations - ~ under the License. - --> - -<serviceGroup> - <service name="BookService" - targetNamespace="http://ws.apache.org/axis2/samples/book/";> - <description> - Book sample service - </description> - <schema schemaNamespace="http://ws.apache.org/axis2/samples/book/xsd/"/> - <parameter name="ServiceClass" locked="false">samples.demo.BookService</parameter> - <operation name="getBooks"> - <messageReceiver class="org.apache.axis2.rpc.receivers.RPCMessageReceiver"/> - </operation> - <operation name="findBook"> - <messageReceiver class="org.apache.axis2.rpc.receivers.RPCMessageReceiver"/> - </operation> - </service> -</serviceGroup> \ No newline at end of file diff --git a/modules/samples/book/src/webapp/WEB-INF/web.xml b/modules/samples/book/src/webapp/WEB-INF/web.xml deleted file mode 100644 index d6613fc787..0000000000 --- a/modules/samples/book/src/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ~ Licensed to the Apache Software Foundation (ASF) under one - ~ or more contributor license agreements. See the NOTICE file - ~ distributed with this work for additional information - ~ regarding copyright ownership. The ASF licenses this file - ~ to you under the Apache License, Version 2.0 (the - ~ "License"); you may not use this file except in compliance - ~ with the License. You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, - ~ software distributed under the License is distributed on an - ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - ~ KIND, either express or implied. See the License for the - ~ specific language governing permissions and limitations - ~ under the License. - --> - -<web-app - xmlns="https://jakarta.ee/xml/ns/jakartaee"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"; - version="6.0"> - - <servlet> - <servlet-name>AxisServlet</servlet-name> - <display-name>Apache-Axis Servlet</display-name> - <servlet-class> - org.apache.axis2.transport.http.AxisServlet</servlet-class> - <load-on-startup>1</load-on-startup> - </servlet> - - <servlet-mapping> - <servlet-name>AxisServlet</servlet-name> - <url-pattern>/services/*</url-pattern> - </servlet-mapping> -</web-app> diff --git a/modules/samples/googlespellcheck/README.txt b/modules/samples/googlespellcheck/README.txt deleted file mode 100644 index 064763f0d8..0000000000 --- a/modules/samples/googlespellcheck/README.txt +++ /dev/null @@ -1,45 +0,0 @@ -Sample: Google Spell Checker -============================= - -Introduction -============ - -This example demonstrates the use of asynchronous Web method invocations. The user can continue to type -text on the text editor where the text editor does the spell check from a hosted Web service. The Web -method invocation is carried out in an asynchronous manner allowing the user to continuously type text -without having to stall for the response. - - -Pre-Requisites -============== - -Apache Ant 1.6.2 or later - - -Running The Sample -================== - -To generate stubs and run the text editor, type ant. - -Note that when running the build script, a stub is generated for the hosted spell check service at: -http://tools.wso2.net:12001/axis2/services/SimplifiedSpellCheck?wsdl - -N.B.: This public Web service uses Google Web APIs to provide spell check service. In case of a -failure SimplifiedSpellCheck echo sends back the phrase (sent for spell check) instead of throwing -an error. Therefore, if the spell check editor just outputs the input words/phrase, that is because -of this behavior of the SimplifiedSpellCheck service. - -Help -==== -Please contact axis-user list ([email protected]) if you have any trouble running the sample. - - - - - - - - - - - diff --git a/modules/samples/googlespellcheck/build.xml b/modules/samples/googlespellcheck/build.xml deleted file mode 100644 index 241bdf6a44..0000000000 --- a/modules/samples/googlespellcheck/build.xml +++ /dev/null @@ -1,119 +0,0 @@ -<!-- - ~ Licensed to the Apache Software Foundation (ASF) under one - ~ or more contributor license agreements. See the NOTICE file - ~ distributed with this work for additional information - ~ regarding copyright ownership. The ASF licenses this file - ~ to you under the Apache License, Version 2.0 (the - ~ "License"); you may not use this file except in compliance - ~ with the License. You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, - ~ software distributed under the License is distributed on an - ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - ~ KIND, either express or implied. See the License for the - ~ specific language governing permissions and limitations - ~ under the License. - --> - -<project name="googlespellcheck" basedir="." default="run.client"> - - <!-- Compile for a fixed release rather than whatever JDK runs the build, - so the class files load on every JDK the project supports and stale - output cannot outlive a JDK change. A value inherited from the Maven - build wins over this default. --> - <property name="maven.compiler.release" value="17"/> - - <property name="wsdl" value="http://tools.wso2.net:12001/axis2/services/SimplifiedSpellCheck?wsdl"; /> - - <property name="dest.dir" value="build" /> - - <property name="dest.dir.classes" value="${dest.dir}/classes" /> - - <property name="dest.dir.lib" value="${dest.dir}/lib" /> - - <property name="axis2.home" value="../../" /> - - <path id="client.class.path"> - <fileset dir="${axis2.home}/lib"> - <include name="*.jar" /> - </fileset> - <fileset dir="${dest.dir.lib}" includes="*.jar" /> - </path> - - <path id="build.class.path"> - <fileset dir="${axis2.home}/lib"> - <include name="*.jar" /> - </fileset> - </path> - - <target name="clean"> - - <delete dir="${dest.dir}" /> - - <delete dir="src" includes="sample/spellcheck/stub/**"/> - - </target> - - <target name="prepare"> - - <mkdir dir="${dest.dir}" /> - - <mkdir dir="${dest.dir.classes}" /> - - <mkdir dir="${dest.dir.lib}" /> - - </target> - - <target name="run.client" depends="clean,prepare"> - - <antcall target="client.codegen-stub"> - <param name="wsdl" value="${wsdl}"/> - </antcall> - - <antcall target="client.compile" /> - - <antcall target="client.jar" /> - - <antcall target="client.run" /> - </target> - - <target name="client.codegen-stub"> - - <java classname="org.apache.axis2.wsdl.WSDL2Java"> - <arg value="-uri" /> - <arg value="${wsdl}" /> - <arg value="-p" /> - <arg value="sample.spellcheck.stub" /> - <arg value="-o" /> - <arg value="src" /> - <arg value="-f"/> - <classpath refid="build.class.path" /> - </java> - - </target> - - <target name="client.compile"> - - <javac srcdir="src" destdir="${dest.dir.classes}" includeantruntime="false" release="${maven.compiler.release}"> - <classpath refid="build.class.path" /> - </javac> - - </target> - - <target name="client.jar"> - - <jar basedir="${dest.dir.classes}" destfile="${dest.dir.lib}/editor.jar" /> - - </target> - - <target name="client.run"> - - <java classname="sample.spellcheck.editor.SuggestionForm" fork="true"> - <classpath refid="client.class.path" /> - </java> - - </target> - -</project> \ No newline at end of file diff --git a/modules/samples/googlespellcheck/src/sample/spellcheck/editor/AsyncPanel.java b/modules/samples/googlespellcheck/src/sample/spellcheck/editor/AsyncPanel.java deleted file mode 100644 index 84c0516181..0000000000 --- a/modules/samples/googlespellcheck/src/sample/spellcheck/editor/AsyncPanel.java +++ /dev/null @@ -1,113 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package sample.spellcheck.editor; - -import java.awt.Color; -import java.awt.GridBagConstraints; -import java.awt.GridBagLayout; -import java.awt.event.KeyEvent; -import java.awt.event.KeyListener; - -import javax.swing.JScrollPane; -import javax.swing.JTextArea; -import javax.swing.JTextField; - -/** - * class sample.google.spellcheck.AsyncPanel - * This Impements its own GUI of the Asynchronous Client and it updates the string after getting the response to textarea - */ -public class AsyncPanel extends javax.swing.JPanel implements Observer, - KeyListener { - FormModel formModel; - JTextArea writingTextArea; - JTextArea displayTextArea; - JTextField errorMessageField; - - public AsyncPanel() { - GridBagLayout gbLayout = new GridBagLayout(); - GridBagConstraints constraint = new GridBagConstraints(); - this.setLayout(gbLayout); - - formModel = new FormModel(this); - - writingTextArea = new JTextArea(); - writingTextArea.setLineWrap(true); - - displayTextArea = new JTextArea(); - displayTextArea.setEditable(false); - displayTextArea.setLineWrap(true); - - errorMessageField = new JTextField(); - errorMessageField.setEditable(false); - errorMessageField.setBackground(Color.LIGHT_GRAY); - errorMessageField.setForeground(Color.RED); - - JScrollPane scrollPaneGet = new JScrollPane(writingTextArea); - JScrollPane scrollPaneSet = new JScrollPane(displayTextArea); - - writingTextArea.setText("Enter a String"); - writingTextArea.addKeyListener(this); - - constraint.fill = GridBagConstraints.BOTH; - constraint.gridx = 0; - constraint.weightx = 1; - constraint.weighty = 8; - gbLayout.setConstraints(scrollPaneGet, constraint); - this.add(scrollPaneGet); - gbLayout.setConstraints(scrollPaneSet, constraint); - this.add(scrollPaneSet); - constraint.weighty = 1; - gbLayout.setConstraints(errorMessageField, constraint); - this.add(errorMessageField); - - - } - - public void update(String message) { - displayTextArea.setText(displayTextArea.getText() + " " + message); - } - - //updates the error message to the error message display area - public void updateError(String message) { - errorMessageField.setText(message); - } - - - public void keyPressed(KeyEvent e) { - int key = e.getKeyChar(); - if ((key == KeyEvent.VK_SPACE) || (key == KeyEvent.VK_ENTER)) { - String[] words = writingTextArea.getText().split("\\s"); - if (words.length > 0) - formModel.doAsyncSpellingSuggestion(words[words.length - 1]); - } - } - - public void keyReleased(KeyEvent e) { - } - - public void keyTyped(KeyEvent e) { - } - - public void clear() { - displayTextArea.setText(""); - writingTextArea.setText(""); - errorMessageField.setText(""); - } -} diff --git a/modules/samples/googlespellcheck/src/sample/spellcheck/editor/FormModel.java b/modules/samples/googlespellcheck/src/sample/spellcheck/editor/FormModel.java deleted file mode 100644 index a1fa17c106..0000000000 --- a/modules/samples/googlespellcheck/src/sample/spellcheck/editor/FormModel.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package sample.spellcheck.editor; - -import sample.spellcheck.stub.SimplifiedSpellCheckStub; -import sample.spellcheck.stub.SimplifiedSpellCheckStub.DoSpellingSuggestions; -import sample.spellcheck.stub.SimplifiedSpellCheckStub.DoSpellingSuggestionsResponse; - -/** - * class sample.google.spellcheck.FormModel - * This is the Impementation of the Asynchronous Client - */ -public class FormModel { - Observer observer; - - public FormModel(Observer observer) { - this.observer = observer; - } - - public void doAsyncSpellingSuggestion(String word) { - - try { - - SimplifiedSpellCheckStub stub = new SimplifiedSpellCheckStub(); - - DoSpellingSuggestions doSpellingSuggestions = new DoSpellingSuggestions(); - doSpellingSuggestions.setPhrase(word); - - SimplifiedSpellCheckCallbackHandlerImpl callbackHandlerImpl = new SimplifiedSpellCheckCallbackHandlerImpl(observer, word); - - stub.startdoSpellingSuggestions(doSpellingSuggestions, callbackHandlerImpl); - - } catch (Exception ex) { - observer.updateError(ex.getMessage()); - } - } - - public void doSyncSpellingSuggestion(String word) { - - try { - SimplifiedSpellCheckStub stub = new SimplifiedSpellCheckStub(); - - DoSpellingSuggestions suggestions = new DoSpellingSuggestions(); - suggestions.setPhrase(word); - - DoSpellingSuggestionsResponse response = stub.doSpellingSuggestions(suggestions); - String suggestion = response.get_return(); - - if (suggestion == null) { - observer.update("No suggestions found for " + word); - - } else { - observer.update(suggestion); - } - - } catch (Exception ex) { - observer.updateError(ex.getMessage()); - } - } - -} diff --git a/modules/samples/googlespellcheck/src/sample/spellcheck/editor/Observer.java b/modules/samples/googlespellcheck/src/sample/spellcheck/editor/Observer.java deleted file mode 100644 index 6db83c6787..0000000000 --- a/modules/samples/googlespellcheck/src/sample/spellcheck/editor/Observer.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package sample.spellcheck.editor; - - -/** - * interface sample.google.spellcheck.Observer - */ -public interface Observer { - // updates the message to the main test display area - public void update(String message); - - //updates the error message to the error message display area - public void updateError(String message); - - public void clear(); -} diff --git a/modules/samples/googlespellcheck/src/sample/spellcheck/editor/SimplifiedSpellCheckCallbackHandlerImpl.java b/modules/samples/googlespellcheck/src/sample/spellcheck/editor/SimplifiedSpellCheckCallbackHandlerImpl.java deleted file mode 100644 index fb7257acb3..0000000000 --- a/modules/samples/googlespellcheck/src/sample/spellcheck/editor/SimplifiedSpellCheckCallbackHandlerImpl.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package sample.spellcheck.editor; - -import sample.spellcheck.stub.SimplifiedSpellCheckCallbackHandler; -import sample.spellcheck.stub.SimplifiedSpellCheckStub.DoSpellingSuggestionsResponse; - -public class SimplifiedSpellCheckCallbackHandlerImpl extends SimplifiedSpellCheckCallbackHandler { - - private Observer observer = null; - private String phrase = null; - - public SimplifiedSpellCheckCallbackHandlerImpl(Observer observer, String phrase) { - this.observer = observer; - this.phrase = phrase; - } - - public void receiveResultdoSpellingSuggestions(DoSpellingSuggestionsResponse param1) { - String suggestion = param1.get_return(); - - if (suggestion == null) { - observer.update(phrase); - observer.updateError( - "No suggestions found for " + phrase); - } else { - observer.update(suggestion); - } - } - - public void receiveErrordoSpellingSuggestions(Exception e) { - e.printStackTrace(); - observer.updateError(e.getMessage()); - } - - - - -} - diff --git a/modules/samples/googlespellcheck/src/sample/spellcheck/editor/SuggestionForm.java b/modules/samples/googlespellcheck/src/sample/spellcheck/editor/SuggestionForm.java deleted file mode 100644 index b99de16ce1..0000000000 --- a/modules/samples/googlespellcheck/src/sample/spellcheck/editor/SuggestionForm.java +++ /dev/null @@ -1,208 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package sample.spellcheck.editor; - -import java.awt.BorderLayout; -import java.awt.Container; -import java.awt.Dimension; -import java.awt.GridLayout; -import java.awt.HeadlessException; -import java.awt.Toolkit; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.KeyEvent; -import java.io.File; -import java.io.IOException; - -import javax.swing.JEditorPane; -import javax.swing.JFrame; -import javax.swing.JMenu; -import javax.swing.JMenuBar; -import javax.swing.JMenuItem; -import javax.swing.JOptionPane; -import javax.swing.JScrollPane; -import javax.swing.KeyStroke; -import javax.swing.WindowConstants; -import javax.swing.event.HyperlinkEvent; -import javax.swing.event.HyperlinkListener; - -/** - * class sample.google.spellcheck.SuggestionForm - * This is the implementation of the GUI - */ -public class SuggestionForm extends javax.swing.JFrame implements HyperlinkListener { - private AsyncPanel asyncPanel; - private SyncPanel syncPanel; - private JEditorPane helpDisplayPane; - - private JMenuItem syncMenuItem; - private JMenuItem asyncMenuItem; - private static final String HELP_FILE_NAME = "/docs/GoogleSpellCheck.html"; - - - public SuggestionForm() throws HeadlessException { - asyncPanel = new AsyncPanel(); - syncPanel = new SyncPanel(); - - JMenuBar menuBar; - //Create the menu bar. - menuBar = new JMenuBar(); - - JMenu modeMenu = new JMenu("Mode"); - modeMenu.setMnemonic(KeyEvent.VK_M); - syncMenuItem = new JMenuItem("Sync Mode", KeyEvent.VK_S); - syncMenuItem.setAccelerator( - KeyStroke.getKeyStroke(KeyEvent.VK_S, ActionEvent.CTRL_MASK)); - syncMenuItem.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - setSyncPanel(); - } - }); - asyncMenuItem = new JMenuItem("ASync Mode", KeyEvent.VK_A); - asyncMenuItem.setAccelerator( - KeyStroke.getKeyStroke(KeyEvent.VK_A, ActionEvent.CTRL_MASK)); - asyncMenuItem.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - setAsyncPanel(); - } - }); - modeMenu.add(syncMenuItem); - modeMenu.add(asyncMenuItem); - - JMenu clearMenu = new JMenu("Clear"); - clearMenu.setMnemonic(KeyEvent.VK_C); - JMenuItem clearMenuItem = new JMenuItem("Clear text boxes"); - clearMenuItem.setAccelerator( - KeyStroke.getKeyStroke(KeyEvent.VK_C, ActionEvent.CTRL_MASK)); - clearMenuItem.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - asyncPanel.clear(); - syncPanel.clear(); - } - }); - clearMenu.add(clearMenuItem); - - JMenu helpMenu = new JMenu("Help"); - JMenuItem mnuItemHelp = new JMenuItem("Show Help"); - helpMenu.add(mnuItemHelp); - - mnuItemHelp.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - showHelp(); - } - }); - - menuBar.add(modeMenu); - menuBar.add(clearMenu); - menuBar.add(helpMenu); - - this.setJMenuBar(menuBar); - - this.getContentPane().setLayout(new GridLayout(1, 1)); - setAsyncPanel(); - - - } - - public static void main(String[] args) { - SuggestionForm form = new SuggestionForm(); - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - form.setLocation(screenSize.width / 4, - screenSize.height / 4); - form.setSize(screenSize.width / 2, screenSize.height / 2); - form.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE); - //form.setResizable(false); - //form.pack(); - form.setVisible(true); - } - - private void setAsyncPanel() { - this.getContentPane().removeAll(); - this.getContentPane().add(asyncPanel); - this.syncMenuItem.setEnabled(true); - this.asyncMenuItem.setEnabled(false); - this.getContentPane().repaint(); - this.setTitle("Google Spell checker - Async Mode"); - this.setVisible(true); - - } - - private void setSyncPanel() { - this.getContentPane().removeAll(); - this.getContentPane().add(syncPanel); - this.syncMenuItem.setEnabled(false); - this.asyncMenuItem.setEnabled(true); - this.getContentPane().repaint(); - this.setTitle("Google Spell checker - Sync Mode"); - this.setVisible(true); - } - - /** - * method showHelp - */ - private void showHelp() { - - JFrame frame = new JFrame(); - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - frame.setLocation(screenSize.width / 5, - screenSize.height / 5); - frame.setSize(screenSize.width / 2, screenSize.height / 2); - - BorderLayout layout = new BorderLayout(); - - JScrollPane jsp; - - - helpDisplayPane = new JEditorPane(); - helpDisplayPane.addHyperlinkListener(this); - helpDisplayPane.setEditable(false); - helpDisplayPane.setContentType("text/html"); - - jsp = new JScrollPane(helpDisplayPane); - - Container contentPane = frame.getContentPane(); - contentPane.setLayout(layout); - contentPane.add(jsp, BorderLayout.CENTER); - String helpDoc = System.getProperty("user.dir") + HELP_FILE_NAME; - - try { - helpDisplayPane.setPage(new File(helpDoc).toURL()); - } catch (IOException e) { - JOptionPane.showMessageDialog(this, "Help file not detected", "Help file error", - JOptionPane.ERROR_MESSAGE); - return; - } - frame.setVisible(true); - } - - - public void hyperlinkUpdate(HyperlinkEvent e) { - if (e.getEventType() == HyperlinkEvent.EventType.ACTIVATED) { - try { - String url = e.getURL().toString(); - helpDisplayPane.setPage(url); - } catch (Exception err) { - JOptionPane.showMessageDialog(this, "Help file not detected", err.getMessage(), - JOptionPane.ERROR_MESSAGE); - } - - } - } -} diff --git a/modules/samples/googlespellcheck/src/sample/spellcheck/editor/SyncPanel.java b/modules/samples/googlespellcheck/src/sample/spellcheck/editor/SyncPanel.java deleted file mode 100644 index 54ac6638d1..0000000000 --- a/modules/samples/googlespellcheck/src/sample/spellcheck/editor/SyncPanel.java +++ /dev/null @@ -1,103 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package sample.spellcheck.editor; - -import javax.swing.*; - -import java.awt.*; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; - -/** - * class sample.google.spellcheck.SyncPanel - * This Impements its own GUI of the Synchronous Client and it send the SOAP request after the mouse event. - */ -public class SyncPanel extends javax.swing.JPanel implements Observer, - ActionListener { - FormModel formModel; - JTextArea writingTextArea; - JTextArea displayTextArea; - JTextField errorMessageField; - JButton sendButton; - - public SyncPanel() { - GridBagLayout gbLayout = new GridBagLayout(); - GridBagConstraints constraint = new GridBagConstraints(); - this.setLayout(gbLayout); - - formModel = new FormModel(this); - writingTextArea = new javax.swing.JTextArea(); - writingTextArea.setLineWrap(true); - - displayTextArea = new javax.swing.JTextArea(); - displayTextArea.setLineWrap(true); - displayTextArea.setEditable(false); - - errorMessageField = new JTextField(); - errorMessageField.setEditable(false); - errorMessageField.setBackground(Color.LIGHT_GRAY); - errorMessageField.setForeground(Color.RED); - - sendButton = new javax.swing.JButton("Send"); - JScrollPane scrollPaneget = new JScrollPane(writingTextArea); - JScrollPane scrollPaneset = new JScrollPane(displayTextArea); - writingTextArea.setText("Enter a String"); - - constraint.fill = GridBagConstraints.BOTH; - constraint.gridx = 0; - constraint.weightx = 1; - constraint.weighty = 8; - gbLayout.setConstraints(scrollPaneget, constraint); - this.add(scrollPaneget); - gbLayout.setConstraints(scrollPaneset, constraint); - this.add(scrollPaneset); - constraint.weighty = 1; - gbLayout.setConstraints(sendButton, constraint); - this.add(sendButton); - gbLayout.setConstraints(errorMessageField, constraint); - this.add(errorMessageField); - - sendButton.addActionListener(this); - - } - - public void update(String suggestion) { - displayTextArea.setText(suggestion); - } - - //updates the error message to the error message display area - public void updateError(String message) { - errorMessageField.setText(message); - } - - public void actionPerformed(ActionEvent e) { - String str = writingTextArea.getText().trim(); - formModel.doSyncSpellingSuggestion(str); - } - - public void clear() { - writingTextArea.setText(""); - displayTextArea.setText(""); - errorMessageField.setText(""); - } - -} - - diff --git a/modules/samples/jaxws-dynamic/README.txt b/modules/samples/jaxws-dynamic/README.txt deleted file mode 100644 index ed6ce89e74..0000000000 --- a/modules/samples/jaxws-dynamic/README.txt +++ /dev/null @@ -1 +0,0 @@ -This sample will show how to create a dynamic client/service using JAX-WS. \ No newline at end of file diff --git a/modules/samples/jaxws-dynamic/resources/wsdl/DynamicSample.wsdl b/modules/samples/jaxws-dynamic/resources/wsdl/DynamicSample.wsdl deleted file mode 100644 index ce8d06c348..0000000000 --- a/modules/samples/jaxws-dynamic/resources/wsdl/DynamicSample.wsdl +++ /dev/null @@ -1,101 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions xmlns="http://schemas.xmlsoap.org/wsdl/"; - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"; - xmlns:tns="http://axis2.apache.com/jaxws/sample/dynamic"; - xmlns:xsd="http://www.w3.org/2001/XMLSchema"; - name="EchoService" - targetNamespace="http://axis2.apache.com/jaxws/sample/dynamic";> - <types> - <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"; - xmlns:tns="http://axis2.apache.com/jaxws/sample/dynamic"; - targetNamespace="http://axis2.apache.com/jaxws/sample/dynamic"; version="1.0"> - - <xs:element name="operation1" type="xsd:string"/> - <xs:element name="operation1Response" type="xsd:string"/> - - <xs:element name="operation2" type="xsd:int"/> - <xs:element name="operation2Response" type="xsd:int"/> - - <xs:element name="operation3" type="xsd:boolean"/> - <xs:element name="operation3Response" type="xsd:boolean"/> - - </xs:schema> - </types> - - <message name="operation1"> - <part element="tns:operation1" name="parameters"/> - </message> - - <message name="operation1Response"> - <part element="tns:operation1Response" name="parameters"/> - </message> - - <message name="operation2"> - <part element="tns:operation2" name="parameters"/> - </message> - - <message name="operation2Response"> - <part element="tns:operation2Response" name="parameters"/> - </message> - - <message name="operation3"> - <part element="tns:operation3" name="parameters"/> - </message> - - <message name="operation3Response"> - <part element="tns:operation3Response" name="parameters"/> - </message> - - <portType name="Generic"> - <operation name="operation1"> - <input message="tns:operation1"/> - <output message="tns:operation1Response"/> - </operation> - <operation name="operation2"> - <input message="tns:operation2"/> - <output message="tns:operation2Response"/> - </operation> - <operation name="operation3"> - <input message="tns:operation3"/> - <output message="tns:operation3Response"/> - </operation> - </portType> - - <binding name="GenericBinding" type="tns:Generic"> - <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> - <operation name="operation1"> - <soap:operation soapAction=""/> - <input> - <soap:body use="literal"/> - </input> - <output> - <soap:body use="literal"/> - </output> - </operation> - <operation name="operation2"> - <soap:operation soapAction=""/> - <input> - <soap:body use="literal"/> - </input> - <output> - <soap:body use="literal"/> - </output> - </operation> - <operation name="operation3"> - <soap:operation soapAction=""/> - <input> - <soap:body use="literal"/> - </input> - <output> - <soap:body use="literal"/> - </output> - </operation> - </binding> - - <service name="GenericService"> - <port binding="tns:GenericBinding" name="EchoPort"> - <soap:address location="http://localhost:8080/services/GenericService"/> - </port> - </service> - -</definitions> \ No newline at end of file diff --git a/modules/samples/jaxws-dynamic/src/org/apache/axis2/jaxws/sample/dynamic/DynamicServiceProvider.java b/modules/samples/jaxws-dynamic/src/org/apache/axis2/jaxws/sample/dynamic/DynamicServiceProvider.java deleted file mode 100644 index 76e58621a5..0000000000 --- a/modules/samples/jaxws-dynamic/src/org/apache/axis2/jaxws/sample/dynamic/DynamicServiceProvider.java +++ /dev/null @@ -1,98 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.axis2.jaxws.sample.dynamic; - -import jakarta.annotation.Resource; -import javax.xml.namespace.QName; -import javax.xml.transform.Result; -import javax.xml.transform.Source; -import javax.xml.transform.Transformer; -import javax.xml.transform.TransformerConfigurationException; -import javax.xml.transform.TransformerException; -import javax.xml.transform.TransformerFactory; -import javax.xml.transform.TransformerFactoryConfigurationError; -import javax.xml.transform.stream.StreamResult; -import javax.xml.transform.stream.StreamSource; -import jakarta.xml.ws.BindingType; -import jakarta.xml.ws.Provider; -import jakarta.xml.ws.WebServiceContext; -import jakarta.xml.ws.WebServiceException; -import jakarta.xml.ws.WebServiceProvider; -import jakarta.xml.ws.soap.SOAPBinding; -import jakarta.xml.ws.handler.MessageContext; -import jakarta.xml.ws.http.HTTPBinding; -import java.io.ByteArrayInputStream; -import java.io.InputStream; -import java.io.StringWriter; - -@WebServiceProvider(serviceName="GenericService", wsdlLocation="WEB-INF/wsdl/DynamicSample.wsdl") -@BindingType(SOAPBinding.SOAP11HTTP_BINDING) -public class DynamicServiceProvider implements Provider<Source> { - - @Resource(type=WebServiceContext.class) - public WebServiceContext context; - - public Source invoke(Source source) { - - //TestLogger.logger.debug(">> SourceProvider: Request received.\n"); - if (source == null) { - return source; - } - - if (context == null) { - //TestLogger.logger.debug("[DynamicServiceProvider] the WebServiceContext was null."); - throw new WebServiceException("A WebServiceException should have been injected."); - } - - QName wsdlService = (QName) context.getMessageContext().get(MessageContext.WSDL_SERVICE); - QName wsdlOperation = (QName) context.getMessageContext().get(MessageContext.WSDL_OPERATION); - - System.out.println("[DynamicServiceProvider] service name: " + wsdlService); - System.out.println("[DynamicServiceProvider] operation name: " + wsdlOperation); - - //TestLogger.logger.debug("[DynamicServiceProvider] service name: " + wsdlService); - //TestLogger.logger.debug("[DynamicServiceProvider] operation name: " + wsdlOperation); - - StringWriter writer = new StringWriter(); - try { - Transformer t = TransformerFactory.newInstance().newTransformer(); - Result result = new StreamResult(writer); - t.transform(source, result); - } catch (TransformerConfigurationException e) { - throw new WebServiceException(e); - } catch (TransformerFactoryConfigurationError e) { - throw new WebServiceException(e); - } catch (TransformerException e) { - throw new WebServiceException(e); - } - - String text = writer.getBuffer().toString(); - //TestLogger.logger.debug(">> Source Request on Server: \n" + text); - - if (text != null && text.contains("throwWebServiceException")) { - throw new WebServiceException("provider"); - } - - ByteArrayInputStream stream = new ByteArrayInputStream(text.getBytes()); - Source srcStream = new StreamSource((InputStream) stream); - return srcStream; - } - -} - diff --git a/modules/samples/jaxws-interop/src/main/resources/META-INF/BaseDataTypesDocLitB.wsdl b/modules/samples/jaxws-interop/src/main/resources/META-INF/BaseDataTypesDocLitB.wsdl index 7a700d03f8..c303b31520 100644 --- a/modules/samples/jaxws-interop/src/main/resources/META-INF/BaseDataTypesDocLitB.wsdl +++ b/modules/samples/jaxws-interop/src/main/resources/META-INF/BaseDataTypesDocLitB.wsdl @@ -512,7 +512,7 @@ <wsdl:service name="BaseDataTypesDocLitBService"> <wsdl:port name="BasicHttpBinding_IBaseDataTypesDocLitB" binding="tns:BasicHttpBinding_IBaseDataTypesDocLitB"> <soap:address - location="http://localhost:8080/axis2/services/TopDownSampleServiceService.IBaseDataTypesDocLitBPort"/> + location="http://localhost:8080/axis2/services/BaseDataTypesDocLitBService.BasicHttpBinding_IBaseDataTypesDocLitB"/> </wsdl:port> </wsdl:service> </wsdl:definitions> diff --git a/modules/samples/jaxws-version/build.xml b/modules/samples/jaxws-version/build.xml index 94058af41f..a517bbbf78 100644 --- a/modules/samples/jaxws-version/build.xml +++ b/modules/samples/jaxws-version/build.xml @@ -29,7 +29,7 @@ <property name="dest.dir.classes" value="${dest.dir}/classes" /> - <property name="axis2.home" value="../../" /> + <property name="axis2.home" value="../../../" /> <property name="repository.path" value="${axis2.home}/repository/servicejars" /> diff --git a/modules/samples/mex/build.xml b/modules/samples/mex/build.xml index c14f11162d..8bf084af94 100644 --- a/modules/samples/mex/build.xml +++ b/modules/samples/mex/build.xml @@ -24,10 +24,10 @@ output cannot outlive a JDK change. A value inherited from the Maven build wins over this default. --> <property name="maven.compiler.release" value="17"/> - <property name="mainDir" value="../.."/> + <property name="mainDir" value="../../.."/> <property name="classes.dir" value="build/classes"/> <path id="axis.classpath"> - <fileset dir="../../lib"> + <fileset dir="../../../lib"> <include name="*.jar"/> </fileset> <pathelement location="build/userguideMex.jar"/> @@ -58,7 +58,7 @@ <include name="userguide/mex/services/example1/**/*.class"/> </fileset> </jar> - <copy file="build/DefaultAxis2DataLocatorDemoService.aar" tofile="../../repository/services/DefaultAxis2DataLocatorDemoService.aar" overwrite="true"/> + <copy file="build/DefaultAxis2DataLocatorDemoService.aar" tofile="../../../repository/services/DefaultAxis2DataLocatorDemoService.aar" overwrite="true"/> <jar destfile="build/ServiceLevelDataLocatorDemoService.aar" > <fileset dir="src/userguide/mex/services/example2/"> <include name="META-INF/**"/> @@ -70,7 +70,7 @@ <include name="userguide/mex/datalocators/*.class"/> </fileset> </jar> - <copy file="build/ServiceLevelDataLocatorDemoService.aar" tofile="../../repository/services/ServiceLevelDataLocatorDemoService.aar" overwrite="true"/> + <copy file="build/ServiceLevelDataLocatorDemoService.aar" tofile="../../../repository/services/ServiceLevelDataLocatorDemoService.aar" overwrite="true"/> <jar destfile="build/WSDLDataLocatorDemoService.aar"> <fileset dir="src/userguide/mex/services/example3/"> <include name="META-INF/**"/> @@ -82,7 +82,7 @@ <include name="userguide/mex/datalocators/*.class"/> </fileset> </jar> - <copy file="build/WSDLDataLocatorDemoService.aar" tofile="../../repository/services/WSDLDataLocatorDemoService.aar" overwrite="true"/> + <copy file="build/WSDLDataLocatorDemoService.aar" tofile="../../../repository/services/WSDLDataLocatorDemoService.aar" overwrite="true"/> </target> <target name="run.client.default" depends="compile"> diff --git a/modules/samples/ping/build.xml b/modules/samples/ping/build.xml index 064bc42d46..fb19e6fca5 100644 --- a/modules/samples/ping/build.xml +++ b/modules/samples/ping/build.xml @@ -26,7 +26,7 @@ <property name="maven.compiler.release" value="17"/> <property environment="env"/> - <property name="AXIS2_HOME" value="../../"/> + <property name="AXIS2_HOME" value="../../../"/> <property name="build.dir" value="build"/> @@ -67,7 +67,7 @@ <jar destfile="${build.dir}/SamplePingService.aar"> <fileset excludes="**/Test.class" dir="${build.dir}/classes"/> </jar> - <copy file="${build.dir}/SamplePingService.aar" destfile="../../repository/services" /> + <copy file="${build.dir}/SamplePingService.aar" destfile="../../../repository/services" /> </target> <target name="run.client" depends="compile"> diff --git a/modules/samples/pojo/build.xml b/modules/samples/pojo/build.xml index 380160ae30..77bd1ffb65 100644 --- a/modules/samples/pojo/build.xml +++ b/modules/samples/pojo/build.xml @@ -31,7 +31,7 @@ <property name="dest.dir.lib" value="${dest.dir}/lib" /> - <property name="axis2.home" value="../../" /> + <property name="axis2.home" value="../../../" /> <property name="repository.path" value="${axis2.home}/repository/services" /> diff --git a/modules/samples/pojoguide/build.xml b/modules/samples/pojoguide/build.xml index a2f8a2b085..b6dfa7e4db 100644 --- a/modules/samples/pojoguide/build.xml +++ b/modules/samples/pojoguide/build.xml @@ -29,7 +29,7 @@ <property name="dest.dir" value="build" /> <property name="dest.dir.classes" value="${dest.dir}/${service.name}" /> <property name="dest.dir.lib" value="${dest.dir}/lib" /> - <property name="axis2.home" value="../../" /> + <property name="axis2.home" value="../../../" /> <property name="repository.path" value="${axis2.home}/repository" /> <path id="build.class.path"> diff --git a/modules/samples/pojoguidespring/build.xml b/modules/samples/pojoguidespring/build.xml index 56d01be392..6ab2e38e24 100644 --- a/modules/samples/pojoguidespring/build.xml +++ b/modules/samples/pojoguidespring/build.xml @@ -28,7 +28,7 @@ <property environment="env" /> <property name="service-name" value="WeatherSpringService" /> <property name="dest.dir" value="target" /> - <property name="axis2.home" value="../../" /> + <property name="axis2.home" value="../../../" /> <property name="repository.path" value="${axis2.home}/repository" /> @@ -114,27 +114,36 @@ <copy file="${dest.dir}/${service-name}.aar" todir="${catalina-modules}" /> </target> - <!--We are not shipping spring jar with the release. This target can be used to - download spring jar to run this sample.--> + <!-- Spring is not shipped with Axis2. The service is compiled against these + jars, downloaded once from Maven Central into lib/. --> + <property name="spring.version" value="7.0.9" /> + <property name="maven.central" value="https://repo.maven.apache.org/maven2/org/springframework"; /> + <target name="checkSpringJarAvailability"> - <!--if either one of jar is not available, spring_available will set to false--> + <!--if any jar is missing, spring_available stays unset--> <condition property="spring_available"> <and> - <available file="lib/spring-core-1.2.8.jar" /> - <available file="lib/spring-context-1.2.8.jar" /> - <available file="lib/spring-beans-1.2.8.jar" /> + <available file="lib/spring-core-${spring.version}.jar" /> + <available file="lib/spring-beans-${spring.version}.jar" /> + <available file="lib/spring-context-${spring.version}.jar" /> + <available file="lib/spring-aop-${spring.version}.jar" /> + <available file="lib/spring-expression-${spring.version}.jar" /> </and> </condition> </target> <target name="download.jars" depends="checkSpringJarAvailability" unless="spring_available"> - <echo message="Spring jars not available.Downloading...."/> + <echo message="Spring jars not available. Downloading from Maven Central...."/> <mkdir dir="lib"/> - <get src="http://ws.zones.apache.org/repository/org.springframework/jars/spring-core-1.2.8.jar"; - dest="lib/spring-core-1.2.8.jar" verbose="true"/> - <get src="http://ws.zones.apache.org/repository/org.springframework/jars/spring-context-1.2.8.jar"; - dest="lib/spring-context-1.2.8.jar" verbose="true"/> - <get src="http://ws.zones.apache.org/repository/org.springframework/jars/spring-beans-1.2.8.jar"; - dest="lib/spring-beans-1.2.8.jar" verbose="true"/> + <get src="${maven.central}/spring-core/${spring.version}/spring-core-${spring.version}.jar" + dest="lib/spring-core-${spring.version}.jar" verbose="true"/> + <get src="${maven.central}/spring-beans/${spring.version}/spring-beans-${spring.version}.jar" + dest="lib/spring-beans-${spring.version}.jar" verbose="true"/> + <get src="${maven.central}/spring-context/${spring.version}/spring-context-${spring.version}.jar" + dest="lib/spring-context-${spring.version}.jar" verbose="true"/> + <get src="${maven.central}/spring-aop/${spring.version}/spring-aop-${spring.version}.jar" + dest="lib/spring-aop-${spring.version}.jar" verbose="true"/> + <get src="${maven.central}/spring-expression/${spring.version}/spring-expression-${spring.version}.jar" + dest="lib/spring-expression-${spring.version}.jar" verbose="true"/> </target> </project> diff --git a/modules/samples/pojoguidespring/src/applicationContext.xml b/modules/samples/pojoguidespring/src/applicationContext.xml index d8dfcb6bff..a259cd1212 100644 --- a/modules/samples/pojoguidespring/src/applicationContext.xml +++ b/modules/samples/pojoguidespring/src/applicationContext.xml @@ -19,9 +19,10 @@ ~ under the License. --> -<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd";> - -<beans> +<beans xmlns="http://www.springframework.org/schema/beans"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://www.springframework.org/schema/beans + https://www.springframework.org/schema/beans/spring-beans.xsd";> <bean id="applicationContext" class="org.apache.axis2.extensions.spring.receivers.ApplicationContextHolder" /> diff --git a/modules/samples/quickstart/build.xml b/modules/samples/quickstart/build.xml index 369de6fc01..1d100bd7bc 100644 --- a/modules/samples/quickstart/build.xml +++ b/modules/samples/quickstart/build.xml @@ -26,7 +26,7 @@ <property name="maven.compiler.release" value="17"/> <property environment="env"/> - <property name="AXIS2_HOME" value="../.."/> + <property name="AXIS2_HOME" value="../../.."/> <property name="build.dir" value="build"/> @@ -76,7 +76,7 @@ <fileset excludes="**/Test.class" dir="${build.dir}/classes"/> </jar> <copy file="${build.dir}/StockQuoteService.aar" - toDir="${basedir}/../../repository/services" + toDir="${basedir}/../../../repository/services" overwrite="yes"> </copy> </target> diff --git a/modules/samples/quickstartadb/build.xml b/modules/samples/quickstartadb/build.xml index 6e5973f8f2..e4865930c9 100644 --- a/modules/samples/quickstartadb/build.xml +++ b/modules/samples/quickstartadb/build.xml @@ -20,7 +20,7 @@ <project name="quickstartadb" basedir="." default="generate.service"> <property environment="env"/> - <property name="AXIS2_HOME" value="../.."/> + <property name="AXIS2_HOME" value="../../.."/> <property name="wsdl.uri" value="./resources/META-INF/StockQuoteService.wsdl"/> <property name="service.target" value="build/service"/> @@ -78,7 +78,7 @@ <property name="axis2.home" value="../../${AXIS2_HOME}"/> </ant> <copy file="${basedir}/build/service/build/lib/StockQuoteService.aar" - toDir="${basedir}/../../repository/services" + toDir="${basedir}/../../../repository/services" overwrite="yes"> </copy> diff --git a/modules/samples/quickstartaxiom/build.xml b/modules/samples/quickstartaxiom/build.xml index facf238a41..41cabc6cfa 100644 --- a/modules/samples/quickstartaxiom/build.xml +++ b/modules/samples/quickstartaxiom/build.xml @@ -26,7 +26,7 @@ <property name="maven.compiler.release" value="17"/> <property environment="env"/> - <property name="AXIS2_HOME" value="../.."/> + <property name="AXIS2_HOME" value="../../.."/> <property name="build.dir" value="build"/> @@ -68,7 +68,7 @@ <fileset excludes="**/Test.class" dir="${build.dir}/classes"/> </jar> <copy file="${build.dir}/StockQuoteService.aar" - toDir="${basedir}/../../repository/services" + toDir="${basedir}/../../../repository/services" overwrite="yes"> </copy> </target> diff --git a/modules/samples/quickstartxmlbeans/build.xml b/modules/samples/quickstartxmlbeans/build.xml index d3a0d4ad82..bc1f756131 100644 --- a/modules/samples/quickstartxmlbeans/build.xml +++ b/modules/samples/quickstartxmlbeans/build.xml @@ -20,7 +20,7 @@ <project name="quickstartxmlbeans" basedir="." default="generate.service"> <property environment="env"/> - <property name="AXIS2_HOME" value="../.."/> + <property name="AXIS2_HOME" value="../../.."/> <property name="wsdl.uri" value="./resources/META-INF/StockQuoteService.wsdl"/> <property name="service.target" value="build/service"/> @@ -78,7 +78,7 @@ <property name="axis2.home" value="../../${AXIS2_HOME}"/> </ant> <copy file="${basedir}/build/service/build/lib/StockQuoteService.aar" - toDir="${basedir}/../../repository/services" + toDir="${basedir}/../../../repository/services" overwrite="yes"> </copy> </target> diff --git a/modules/samples/script/build.xml b/modules/samples/script/build.xml index 0652967472..58f7b60300 100644 --- a/modules/samples/script/build.xml +++ b/modules/samples/script/build.xml @@ -18,9 +18,9 @@ --> <project name="script" default="alltests"> - <property name="mainDir" value="../.."/> + <property name="mainDir" value="../../.."/> <path id="axis.classpath"> - <fileset dir="../../lib"> + <fileset dir="../../../lib"> <include name="*.jar"/> </fileset> <pathelement location="./sample.jar"/> diff --git a/modules/samples/servicelifecycle/build.xml b/modules/samples/servicelifecycle/build.xml index 72fb76495c..d7b48330f4 100644 --- a/modules/samples/servicelifecycle/build.xml +++ b/modules/samples/servicelifecycle/build.xml @@ -28,7 +28,7 @@ <property environment="env"/> <property name="service-name" value="Library.aar"/> <property name="dest.dir" value="target"/> - <property name="axis2.home" value="../../" /> + <property name="axis2.home" value="../../../" /> <property name="repository.path" value="${axis2.home}/repository/services" /> @@ -39,7 +39,7 @@ value="${env.CATALINA_HOME}/webapps/axis2/WEB-INF/services"/> <path id="build.class.path"> - <fileset dir="../../lib"> + <fileset dir="../../../lib"> <include name="*.jar"/> </fileset> </path> @@ -105,7 +105,7 @@ <mkdir dir="${dest.dir.classes}"/> <javac debug="on" srcdir="src" destdir="${dest.dir.classes}" includes="client/**" includeantruntime="false" release="${maven.compiler.release}"> <classpath> - <fileset dir="../../lib"> + <fileset dir="../../../lib"> <include name="*.jar"/> </fileset> </classpath> @@ -114,7 +114,7 @@ <java classname="client.LibraryServiceClient"> <classpath> <pathelement location="${dest.dir.classes}"/> - <fileset dir="../../lib"> + <fileset dir="../../../lib"> <include name="*.jar"/> </fileset> </classpath> diff --git a/modules/samples/servicelifecycle/src/sample/servicelifecycle/LibraryLifeCycle.java b/modules/samples/servicelifecycle/src/sample/servicelifecycle/LibraryLifeCycle.java index bf2794d885..bb302c2c96 100644 --- a/modules/samples/servicelifecycle/src/sample/servicelifecycle/LibraryLifeCycle.java +++ b/modules/samples/servicelifecycle/src/sample/servicelifecycle/LibraryLifeCycle.java @@ -21,8 +21,7 @@ package sample.servicelifecycle; import org.apache.axiom.om.OMAbstractFactory; import org.apache.axiom.om.OMElement; import org.apache.axiom.om.OMFactory; -import org.apache.axiom.om.impl.builder.StAXOMBuilder; -import org.apache.axiom.om.util.StAXUtils; +import org.apache.axiom.om.OMXMLBuilderFactory; import org.apache.axis2.AxisFault; import org.apache.axis2.context.ConfigurationContext; import org.apache.axis2.databinding.utils.BeanUtil; @@ -38,7 +37,6 @@ import sample.servicelifecycle.bean.User; import sample.servicelifecycle.bean.UserList; import javax.xml.namespace.QName; -import javax.xml.stream.XMLStreamReader; import java.io.*; import java.util.Iterator; @@ -59,10 +57,8 @@ public class LibraryLifeCycle implements ServiceLifeCycle { libraryElement = allBooks.getParameterElement(); } else { InputStream in = new FileInputStream(libFile); - XMLStreamReader xmlReader = StAXUtils - .createXMLStreamReader(in); - StAXOMBuilder staxOMBuilder = new StAXOMBuilder(xmlReader); - libraryElement = staxOMBuilder.getDocumentElement(); + libraryElement = OMXMLBuilderFactory.createOMBuilder(in) + .getDocumentElement(); noFile = false; } processOmelemnt(libraryElement, service, noFile); diff --git a/modules/samples/soapwithattachments/build.xml b/modules/samples/soapwithattachments/build.xml index 9fe87e292e..5c9b890422 100644 --- a/modules/samples/soapwithattachments/build.xml +++ b/modules/samples/soapwithattachments/build.xml @@ -25,7 +25,7 @@ build wins over this default. --> <property name="maven.compiler.release" value="17"/> <property environment="env" /> - <property name="axis2.home" value="../../" /> + <property name="axis2.home" value="../../../" /> <property name="axis2.repo" value="${axis2.home}/repository" /> <property name="build.dir" value="build" /> <property name="client.classes.dir" value="${build.dir}/classes" /> diff --git a/modules/samples/userguide/build.xml b/modules/samples/userguide/build.xml index f788f4ce23..bc38d3a567 100644 --- a/modules/samples/userguide/build.xml +++ b/modules/samples/userguide/build.xml @@ -24,10 +24,10 @@ output cannot outlive a JDK change. A value inherited from the Maven build wins over this default. --> <property name="maven.compiler.release" value="17"/> - <property name="mainDir" value="../.."/> + <property name="mainDir" value="../../.."/> <property name="classes.dir" value="build/classes"/> <path id="axis.classpath"> - <fileset dir="../../lib"> + <fileset dir="../../../lib"> <include name="*.jar"/> </fileset> <pathelement location="build/userguide.jar"/> @@ -61,7 +61,7 @@ <include name="userguide/example1/**/*.class"/> </fileset> </jar> - <copy file="build/MyService.aar" tofile="../../repository/services/sample-MyService.aar" overwrite="true"/> + <copy file="build/MyService.aar" tofile="../../../repository/services/sample-MyService.aar" overwrite="true"/> <jar destfile="build/MyServiceWithModule.aar" > <fileset dir="src/userguide/example2/"> <include name="META-INF/**"/> @@ -70,7 +70,7 @@ <include name="userguide/example2/**/*.class"/> </fileset> </jar> - <copy file="build/MyServiceWithModule.aar" tofile="../../repository/services/sample-MyServiceWithModule.aar" overwrite="true"/> + <copy file="build/MyServiceWithModule.aar" tofile="../../../repository/services/sample-MyServiceWithModule.aar" overwrite="true"/> <jar destfile="build/WsaMappingService.aar"> <fileset dir="src/userguide/example3/"> <include name="META-INF/**"/> @@ -79,7 +79,7 @@ <include name="userguide/example3/**/*.class"/> </fileset> </jar> - <copy file="build/WsaMappingService.aar" tofile="../../repository/services/sample-WsaMappingService.aar" overwrite="true"/> + <copy file="build/WsaMappingService.aar" tofile="../../../repository/services/sample-WsaMappingService.aar" overwrite="true"/> </target> <target name="generate.module" depends="compile"> @@ -91,8 +91,8 @@ <include name="userguide/loggingmodule/**/*.class"/> </fileset> </jar> - <copy file="build/logging.mar" tofile="../../repository/modules/sample-logging.mar" overwrite="true"/> - <echo message="*** Please add the logging phase to the ../../conf/axis2.xml. For more details please refer to the http://ws.apache.org/axis2/1_2/modules.html ***"/> + <copy file="build/logging.mar" tofile="../../../repository/modules/sample-logging.mar" overwrite="true"/> + <echo message="*** Please add the logging phase to the ../../../conf/axis2.xml. For more details please refer to the http://ws.apache.org/axis2/1_2/modules.html ***"/> </target> <target name="run.client.blocking" depends="compile"> diff --git a/modules/samples/version/build.xml b/modules/samples/version/build.xml index a820571423..d630871c8c 100644 --- a/modules/samples/version/build.xml +++ b/modules/samples/version/build.xml @@ -29,7 +29,7 @@ <property name="dest.dir.classes" value="${dest.dir}/classes" /> - <property name="axis2.home" value="../../" /> + <property name="axis2.home" value="../../../" /> <property name="repository.path" value="${axis2.home}/repository/services" /> diff --git a/modules/samples/yahoojsonsearch/README.txt b/modules/samples/yahoojsonsearch/README.txt deleted file mode 100644 index ea4a73f47f..0000000000 --- a/modules/samples/yahoojsonsearch/README.txt +++ /dev/null @@ -1,24 +0,0 @@ -Sample for Yahoo - Search - JSON -================================= - -Introduction -============ - -Axis2 client API has facilities to accept responses in JSON. - -Yahoo provides an API to call its search service and retrieve JSON responses. This sample demonstrates how to call Yahoo -search service using an Axis2 client which accepts a JSON response. - -Pre-Requisites -============== - -Apache Ant 1.6.2 or later - -Running The Sample -================== - -Type "ant" from Axis2_HOME/samples/yahoojsonsearch directory. - -Help -==== -Please contact axis-user list ([email protected]) if you have any trouble running the sample. diff --git a/modules/samples/yahoojsonsearch/build.xml b/modules/samples/yahoojsonsearch/build.xml deleted file mode 100644 index f4132dc4e3..0000000000 --- a/modules/samples/yahoojsonsearch/build.xml +++ /dev/null @@ -1,57 +0,0 @@ -<!-- - ~ Licensed to the Apache Software Foundation (ASF) under one - ~ or more contributor license agreements. See the NOTICE file - ~ distributed with this work for additional information - ~ regarding copyright ownership. The ASF licenses this file - ~ to you under the Apache License, Version 2.0 (the - ~ "License"); you may not use this file except in compliance - ~ with the License. You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, - ~ software distributed under the License is distributed on an - ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - ~ KIND, either express or implied. See the License for the - ~ specific language governing permissions and limitations - ~ under the License. - --> - -<project name="YahooJSONSearchSample" default="run.client"> - - <!-- Compile for a fixed release rather than whatever JDK runs the build, - so the class files load on every JDK the project supports and stale - output cannot outlive a JDK change. A value inherited from the Maven - build wins over this default. --> - <property name="maven.compiler.release" value="17"/> - <property environment="env" /> - <property name="axis2.home" value="../../" /> - <property name="axis2.repo" value="${axis2.home}/repository" /> - <property name="build.dir" value="build" /> - <property name="client.classes.dir" value="${build.dir}/classes" /> - <path id="axis.classpath"> - <fileset dir="${axis2.home}/lib"> - <include name="*.jar" /> - </fileset> - <pathelement location="build/yahooJSONSearch.jar" /> - </path> - - <target name="compile"> - <mkdir dir="${client.classes.dir}" /> - <!-- Compile client --> - <javac srcdir="src" destdir="${client.classes.dir}" includeantruntime="false" release="${maven.compiler.release}"> - <classpath refid="axis.classpath" /> - </javac> - <jar destfile="${build.dir}/yahooJSONSearch.jar"> - <fileset dir="${build.dir}/classes" /> - </jar> - </target> - <target name="run.client" depends="compile"> - <java classname="sample.yahooservices.JSONSearch.JSONSearchClient" classpathref="axis.classpath" fork="true"> - <jvmarg value="-Daxis2.repo=${axis2.repo}" /> - </java> - </target> - <target name="clean"> - <delete dir="build" /> - </target> -</project> diff --git a/modules/samples/yahoojsonsearch/resources/axis2.xml b/modules/samples/yahoojsonsearch/resources/axis2.xml deleted file mode 100644 index 1dd808bc46..0000000000 --- a/modules/samples/yahoojsonsearch/resources/axis2.xml +++ /dev/null @@ -1,282 +0,0 @@ -<!-- - ~ Licensed to the Apache Software Foundation (ASF) under one - ~ or more contributor license agreements. See the NOTICE file - ~ distributed with this work for additional information - ~ regarding copyright ownership. The ASF licenses this file - ~ to you under the Apache License, Version 2.0 (the - ~ "License"); you may not use this file except in compliance - ~ with the License. You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, - ~ software distributed under the License is distributed on an - ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - ~ KIND, either express or implied. See the License for the - ~ specific language governing permissions and limitations - ~ under the License. - --> - -<axisconfig name="AxisJava2.0"> - <!-- ================================================= --> - <!-- Parameters --> - <!-- ================================================= --> - <parameter name="hotdeployment">true</parameter> - <parameter name="hotupdate">false</parameter> - <parameter name="enableMTOM">false</parameter> - <parameter name="enableSwA">false</parameter> - - <!--Uncomment if you want to enable file caching for attachments --> - <!--parameter name="cacheAttachments">true</parameter> - <parameter name="attachmentDIR"></parameter> - <parameter name="sizeThreshold">4000</parameter--> - - <!--This will give out the timout of the configuration contexts, in seconds--> - <parameter name="ConfigContextTimeoutInterval">30</parameter> - - <!--During a fault, stacktrace can be sent with the fault message. The following flag will control --> - <!--that behaviour.--> - <parameter name="sendStacktraceDetailsWithFaults">false</parameter> - - <!--If there aren't any information available to find out the fault reason, we set the message of the expcetion--> - <!--as the faultreason/Reason. But when a fault is thrown from a service or some where, it will be --> - <!--wrapped by different levels. Due to this the initial exception message can be lost. If this flag--> - <!--is set then, Axis2 tries to get the first exception and set its message as the faultreason/Reason.--> - <parameter name="DrillDownToRootCauseForFaultReason">false</parameter> - - <parameter name="userName"></parameter> - <parameter name="password"></parameter> - - <!--To override repository/services you need to uncomment following parameter and value SHOULD be absolute file path.--> - <!--<parameter name="ServicesDirectory">service</parameter>--> - <!--To override repository/modules you need to uncomment following parameter and value SHOULD be absolute file path--> - <!--<parameter name="ModulesDirectory">modules</parameter>--> - - - - <!--Following params will set the proper context paths for invocations. All the endpoints will have a commons context--> - <!--root which can configured using the following contextRoot parameter--> - <!--<parameter name="contextRoot">axis2</parameter>--> - - <!--Our HTTP endpoints can handle both REST and SOAP. Following parameters can be used to distingiush those endpoints--> - <!--In case of a servlet, if you change this you have to manually change the settings of your servlet container to map this --> - <!--context path to proper Axis2 servlets--> - <!--<parameter name="servicePath">services</parameter>--> - <!--<parameter name="restPath">rest</parameter>--> - - - <!--Set the flag to true if you want to enable transport level session mangment--> - <parameter name="manageTransportSession">false</parameter> - - <!--Following two parameters will be used to handle REST in Axis2. The default settings will make Axis2 to have two--> - <!--different endpoints, one for REST (AxisRESTServlet) one for SOAP message handling (AxisServlet). But following--> - <!--parameters help to tweak the message handling of two main servlets. --> - - <!-- If the enableRESTInAxis2MainServlet is true, then Axis2MainServlet will handle both SOAP and REST messages --> - <parameter name="enableRESTInAxis2MainServlet" locked="true">false</parameter> - - <!-- Following parameter will completely disable REST handling in both the servlets--> - <parameter name="disableREST" locked="true">false</parameter> - - <!-- This will disable the separate servlet we have for REST handling. --> - <parameter name="disableSeparateEndpointForREST" locked="true">false</parameter> - - <!-- If you have a frontend host which exposes this webservice using a different public URL --> - <!-- use this parameter to override autodetected url --> - <!--<parameter name="httpFrontendHostUrl">https://someotherhost/context</parameter>--> - - - <!-- The way of adding listener to the system--> - <!-- <listener class="org.apache.axis2.ObserverIMPL">--> - <!-- <parameter name="RSS_URL">http://127.0.0.1/rss</parameter>--> - <!-- </listener>--> - - <!-- ================================================= --> - <!-- Message Receivers --> - <!-- ================================================= --> - <!--This is the Deafult Message Receiver for the system , if you want to have MessageReceivers for --> - <!--all the other MEP implement it and add the correct entry to here , so that you can refer from--> - <!--any operation --> - <!--Note : You can ovride this for particular service by adding the same element with your requirement--> - <messageReceivers> - <messageReceiver mep="http://www.w3.org/ns/wsdl/in-only"; - class="org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver"/> - <messageReceiver mep="http://www.w3.org/ns/wsdl/in-out"; - class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/> - </messageReceivers> - - <!-- ================================================= --> - <!-- Message Formatter --> - <!-- ================================================= --> - <!--Following content type to message formatter mapping can be used to implement support for different message --> - <!--formats serialization in Axis2. These message formats are expected to be resolved based on the content type. --> - <messageFormatters> - <messageFormatter contentType="application/soap+xml" - class="org.apache.axis2.kernel.http.SOAPMessageFormatter"/> - <messageFormatter contentType="application/json" - class="org.apache.axis2.json.JSONMessageFormatter"/> - <messageFormatter contentType="application/json/badgerfish" - class="org.apache.axis2.json.JSONBadgerfishMessageFormatter"/> - <messageFormatter contentType="text/javascript" - class="org.apache.axis2.json.JSONMessageFormatter"/> - <messageFormatter contentType="application/x-www-form-urlencoded" - class="org.apache.axis2.kernel.http.XFormURLEncodedFormatter"/> - </messageFormatters> - - <!-- ================================================= --> - <!-- Message Builders --> - <!-- ================================================= --> - <!--Following content type to builder mapping can be used to implement support for different message --> - <!--formats in Axis2. These message formats are expected to be resolved based on the content type. --> - <messageBuilders> - <messageBuilder contentType="application/json" - class="org.apache.axis2.json.JSONOMBuilder"/> - <messageBuilder contentType="application/json/badgerfish" - class="org.apache.axis2.json.JSONBadgerfishOMBuilder"/> - <messageBuilder contentType="text/javascript" - class="org.apache.axis2.json.JSONOMBuilder"/> - </messageBuilders> - - <!-- ================================================= --> - <!-- Transport Ins --> - <!-- ================================================= --> - <transportReceiver name="http" - class="org.apache.axis2.transport.http.SimpleHTTPServer"> - <parameter name="port">8080</parameter> - <!-- Here is the complete list of supported parameters (see example settings further below): - port: the port to listen on (default 6060) - hostname: if non-null, url prefix used in reply-to endpoint references (default null) - originServer: value of http Server header in outgoing messages (default "Simple-Server/1.1") - requestTimeout: value in millis of time that requests can wait for data (default 20000) - requestTcpNoDelay: true to maximize performance and minimize latency (default true) - false to minimize bandwidth consumption by combining segments - requestCoreThreadPoolSize: number of threads available for request processing (unless queue fills up) (default 25) - requestMaxThreadPoolSize: number of threads available for request processing if queue fills us (default 150) - note that default queue never fills up: see HttpFactory - threadKeepAliveTime: time to keep threads in excess of core size alive while inactive (default 180) - note that no such threads can exist with default unbounded request queue - threadKeepAliveTimeUnit: TimeUnit of value in threadKeepAliveTime (default SECONDS) (default SECONDS) - --> - <!-- <parameter name="hostname" >http://www.myApp.com/ws</parameter> --> - <!-- <parameter name="originServer" >My-Server/1.1</parameter> --> - <!-- <parameter name="requestTimeout" >10000</parameter> --> - <!-- <parameter name="requestTcpNoDelay" >false</parameter> --> - <!-- <parameter name="requestCoreThreadPoolSize">50</parameter> --> - <!-- <parameter name="requestMaxThreadPoolSize" >100</parameter> --> - <!-- <parameter name="threadKeepAliveTime" >240000</parameter> --> - <!-- <parameter name="threadKeepAliveTimeUnit" >MILLISECONDS</parameter> --> - </transportReceiver> - - <!--Uncomment if you want to have TCP transport support--> - <!--transportReceiver name="tcp" - class="org.apache.axis2.transport.tcp.TCPServer"> - <parameter name="port">6060</parameter-->> - <!--If you want to give your own host address for EPR generation--> - <!--uncommet following paramter , and set as you required.--> - <!--<parameter name="hostname">tcp://myApp.com/ws</parameter>--> - <!-- /transportReceiver --> - - <!-- ================================================= --> - <!-- Transport Outs --> - <!-- ================================================= --> - - <!--Uncomment if you want to have TCP transport support--> - <!-- - <transportSender name="tcp" - class="org.apache.axis2.transport.tcp.TCPTransportSender"/> - --> - <transportSender name="local" - class="org.apache.axis2.transport.local.LocalTransportSender"/> - <transportSender name="http" - class="org.apache.axis2.transport.http.impl.httpclient5.HTTPClient5TransportSender"> - <parameter name="PROTOCOL">HTTP/1.1</parameter> - <parameter name="Transfer-Encoding">chunked</parameter> - </transportSender> - <transportSender name="https" - class="org.apache.axis2.transport.http.impl.httpclient5.HTTPClient5TransportSender"> - <parameter name="PROTOCOL">HTTP/1.1</parameter> - <parameter name="Transfer-Encoding">chunked</parameter> - </transportSender> - - <!-- ================================================= --> - <!-- Global Modules --> - <!-- ================================================= --> - <!-- Comment this to disable Addressing --> - <!--module ref="addressing"/--> - - <!--Configuring module , providing parameters for modules whether they refer or not--> - <!--<moduleConfig name="addressing">--> - <!--<parameter name="addressingPara">N/A</parameter>--> - <!--</moduleConfig>--> - - <!-- ================================================= --> - <!-- Phases --> - <!-- ================================================= --> - <phaseOrder type="InFlow"> - <!-- System pre defined phases --> - <phase name="Transport"> - <handler name="RequestURIBasedDispatcher" - class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"> - <order phase="Transport"/> - </handler> - <handler name="SOAPActionBasedDispatcher" - class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"> - <order phase="Transport"/> - </handler> - </phase> - <phase name="Security"/> - <phase name="PreDispatch"/> - <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase"> - <handler name="AddressingBasedDispatcher" - class="org.apache.axis2.dispatchers.AddressingBasedDispatcher"/> - <handler name="RequestURIOperationDispatcher" - class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/> - - <handler name="SOAPMessageBodyBasedDispatcher" - class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/> - </phase> - <!-- System pre defined phases --> - <!-- After Postdispatch phase module author or or service author can add any phase he want --> - <phase name="OperationInPhase"/> - <phase name="soapmonitorPhase"/> - </phaseOrder> - <phaseOrder type="OutFlow"> - <!-- user can add his own phases to this area --> - <phase name="soapmonitorPhase"/> - <phase name="OperationOutPhase"/> - <!--system predefined phase--> - <!--these phase will run irrespective of the service--> - <phase name="PolicyDetermination"/> - <phase name="MessageOut"/> - <phase name="Security"/> - </phaseOrder> - <phaseOrder type="InFaultFlow"> - <phase name="PreDispatch"/> - <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase"> - <handler name="RequestURIBasedDispatcher" - class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/> - - <handler name="SOAPActionBasedDispatcher" - class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/> - - <handler name="AddressingBasedDispatcher" - class="org.apache.axis2.dispatchers.AddressingBasedDispatcher"/> - <handler name="RequestURIOperationDispatcher" - class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/> - - <handler name="SOAPMessageBodyBasedDispatcher" - class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/> - </phase> - <!-- user can add his own phases to this area --> - <phase name="OperationInFaultPhase"/> - <phase name="soapmonitorPhase"/> - </phaseOrder> - <phaseOrder type="OutFaultFlow"> - <!-- user can add his own phases to this area --> - <phase name="soapmonitorPhase"/> - <phase name="OperationOutFaultPhase"/> - <phase name="PolicyDetermination"/> - <phase name="MessageOut"/> - </phaseOrder> -</axisconfig> - diff --git a/modules/samples/yahoojsonsearch/src/sample/yahooservices/JSONSearch/JSONSearchClient.java b/modules/samples/yahoojsonsearch/src/sample/yahooservices/JSONSearch/JSONSearchClient.java deleted file mode 100644 index eb73bac349..0000000000 --- a/modules/samples/yahoojsonsearch/src/sample/yahooservices/JSONSearch/JSONSearchClient.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package sample.yahooservices.JSONSearch; - -import javax.swing.*; -import java.awt.*; - -public class JSONSearchClient extends JFrame { - public static int width; - public static int height; - - public JSONSearchClient(String title) throws HeadlessException { - super(title); - - this.getContentPane().add(new UserInterface(this)); - this.setVisible(true); - } - - public static void main(String[] args) { - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - width = screenSize.width; - height = screenSize.height; - JSONSearchClient form = new JSONSearchClient("Axis2 Yahoo-JSON Search Client"); - - - int left = (width) / 2; - int top = (height) / 2; - form.setLocation(left, top); - form.setSize(width, height); - form.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE); - form.setVisible(true); - } -} diff --git a/modules/samples/yahoojsonsearch/src/sample/yahooservices/JSONSearch/JSONSearchModel.java b/modules/samples/yahoojsonsearch/src/sample/yahooservices/JSONSearch/JSONSearchModel.java deleted file mode 100644 index b3338310d7..0000000000 --- a/modules/samples/yahoojsonsearch/src/sample/yahooservices/JSONSearch/JSONSearchModel.java +++ /dev/null @@ -1,127 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package sample.yahooservices.JSONSearch; - -import org.apache.axiom.om.OMAbstractFactory; -import org.apache.axiom.om.OMElement; -import org.apache.axiom.om.OMFactory; -import org.apache.axis2.Constants; -import org.apache.axis2.kernel.http.HTTPConstants; -import org.apache.axis2.context.ConfigurationContextFactory; -import org.apache.axis2.context.ConfigurationContext; -import org.apache.axis2.addressing.EndpointReference; -import org.apache.axis2.client.Options; -import org.apache.axis2.client.ServiceClient; - -import java.io.UnsupportedEncodingException; -import java.io.File; -import java.net.URLEncoder; -import java.util.Iterator; - -public class JSONSearchModel { - /** - * HTML Header to desplay snippet text - */ - private String beginHTML = "<HTML><HEAD><TITLE>Search Results</TITLE></HEAD><BODY>"; - - /** - * HTML footer - */ - private String endHTML = "</BODY></HTML>"; - - /** - * Store the texts read by NavigationURL of soap - */ - private String snippet; - - public String searchYahoo(String query, String format) { - try { - snippet = beginHTML; - String epr = "http://api.search.yahoo.com/WebSearchService/V1/webSearch";; - File configFile = new File("resources/axis2.xml"); - ConfigurationContext configurationContext = ConfigurationContextFactory - .createConfigurationContextFromFileSystem(null, configFile - .getAbsolutePath()); - - ServiceClient client = new ServiceClient(configurationContext, null); - Options options = new Options(); - client.setOptions(options); - options.setTo(new EndpointReference(epr)); - options.setProperty(Constants.Configuration.MESSAGE_TYPE, HTTPConstants.MEDIA_TYPE_X_WWW_FORM); - options.setProperty(Constants.Configuration.HTTP_METHOD, Constants.Configuration.HTTP_METHOD_GET); - OMElement response = client.sendReceive(getPayloadForYahooSearchCall(query, format)); - generateSnippet(response); - return snippet; - - } catch (Exception e) { - e.printStackTrace(); - snippet = "<H2>Error occurred during the invocation to Yahoo search service</H2>" + - "<p>" + e.getMessage() + "</p>" + endHTML; - } - return null; - } - - private static OMElement getPayloadForYahooSearchCall(String queryStr, String formatStr) throws UnsupportedEncodingException { - OMFactory fac = OMAbstractFactory.getOMFactory(); - OMElement rootElement = fac.createOMElement("webSearch", null); - - OMElement appId = fac.createOMElement("appid", null, rootElement); - appId.setText("ApacheRestDemo"); - - OMElement query = fac.createOMElement("query", null, rootElement); - query.setText(URLEncoder.encode(queryStr, "UTF-8")); - - OMElement outputType = fac.createOMElement("output", null, rootElement); - outputType.setText("json"); - - if (formatStr != null && formatStr.length() != 0) { - OMElement format = fac.createOMElement("format", null, rootElement); - format.setText(URLEncoder.encode(formatStr, "UTF-8")); - } - return rootElement; - } - - private void generateSnippet(OMElement response) { - String title = null; - String summary = null; - String clickUrl = null; - String url = null; - OMElement result = null; - //get an iterator for Result elements - Iterator itr = response.getChildElements(); - Iterator innerItr; - while (itr.hasNext()) { - result = (OMElement) itr.next(); - innerItr = result.getChildElements(); - if (innerItr.hasNext()) { - title = ((OMElement) innerItr.next()).getText(); - summary = ((OMElement) innerItr.next()).getText(); - url = ((OMElement) innerItr.next()).getText(); - clickUrl = ((OMElement) innerItr.next()).getText(); - if (title != null) { - snippet += "<a href=" + clickUrl + ">" + title + "</a>" + "<br>" + summary + - "<br>" + url + "<br>" + "<br>"; - } - } - } - snippet += endHTML; - } -} - diff --git a/modules/samples/yahoojsonsearch/src/sample/yahooservices/JSONSearch/UserInterface.java b/modules/samples/yahoojsonsearch/src/sample/yahooservices/JSONSearch/UserInterface.java deleted file mode 100644 index 72f317e34a..0000000000 --- a/modules/samples/yahoojsonsearch/src/sample/yahooservices/JSONSearch/UserInterface.java +++ /dev/null @@ -1,135 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package sample.yahooservices.JSONSearch; - -import javax.swing.*; -import javax.swing.event.HyperlinkListener; -import javax.swing.event.HyperlinkEvent; -import java.awt.*; -import java.awt.event.ActionListener; -import java.awt.event.ActionEvent; - -public class UserInterface extends JPanel implements HyperlinkListener { - - private JEditorPane jep; - private JScrollPane scrollPane; - - private JTextField schField; - private JTextField formatField; - - private JButton schButton; - private JButton backButton; - - private JLabel schLabel; - private JLabel formatLabel; - - - private JSONSearchModel model; - private JSONSearchClient parent; - - private String response; - public UserInterface(JSONSearchClient parent) { - this.parent = parent; - model = new JSONSearchModel(); - initComponents(); - - schButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - handleSearch(); - } - }); - - backButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - handleBack(); - } - }); - - Container pane = parent.getContentPane(); - pane.setLayout(null); - - pane.add(schLabel); - pane.add(schField); - pane.add(formatLabel); - pane.add(formatField); - pane.add(backButton); - pane.add(schButton); - pane.add(scrollPane); - } - - public void initComponents() { - schLabel = new JLabel("Search for"); - schLabel.setBounds(20, 10, 80, 25); - schField = new JTextField(); - schField.setBounds(90, 10, 250, 25); - - formatLabel = new JLabel("format"); - formatLabel.setBounds(350, 10, 50, 25); - formatField = new JTextField(); - formatField.setBounds(400, 10, 100, 25); - - backButton = new JButton("Back to Results"); - backButton.setBounds(670, 10, 150, 25); - backButton.setEnabled(false); - - schButton = new JButton("Search"); - schButton.setBounds(510, 10, 150, 25); - - - jep = new JEditorPane(); - jep.setEditable(false); - jep.setContentType("text/html"); - jep.addHyperlinkListener(this); - - scrollPane = new JScrollPane(jep); - scrollPane.setBounds(10, 80, (JSONSearchClient.width - 30), (JSONSearchClient.height - 160)); - - - } - - private void handleSearch(){ - String query = schField.getText(); - - if(!query.equals("")){ - response = model.searchYahoo(query, formatField.getText()); - jep.setText(response); - } - } - - private void handleBack(){ - jep.setText(response); - backButton.setEnabled(false); - } - - public void hyperlinkUpdate(HyperlinkEvent he) { - if (he.getEventType() == HyperlinkEvent.EventType.ACTIVATED) { - try { - jep.setPage(he.getURL()); - backButton.setEnabled(true); - } - catch (Exception e) { - JOptionPane.showMessageDialog(parent, "Page could not be loaded", - "Page Error", JOptionPane.ERROR_MESSAGE); - } - } - - } -} - diff --git a/modules/samples/yahoorestsearch/README.txt b/modules/samples/yahoorestsearch/README.txt deleted file mode 100755 index ab08e22256..0000000000 --- a/modules/samples/yahoorestsearch/README.txt +++ /dev/null @@ -1,25 +0,0 @@ -Sample for Yahoo - Search - REST -================================= - -Introduction -============ - -Axis2 client API has facilities to invoke REST interfaces. The API to be used is almost the same -as the one we use while invoking with REST. - -Yahoo provides a REST API to call its search service. This sample demonstrates how to call Yahoo -search service using an Axis2 client. - -Pre-Requisites -============== - -Apache Ant 1.6.2 or later - -Running The Sample -================== - -Type "ant" from Axis2_HOME/samples/yahoorestsearch directory. - -Help -==== -Please contact axis-user list ([email protected]) if you have any trouble running the sample. diff --git a/modules/samples/yahoorestsearch/build.xml b/modules/samples/yahoorestsearch/build.xml deleted file mode 100755 index 43b0afa94f..0000000000 --- a/modules/samples/yahoorestsearch/build.xml +++ /dev/null @@ -1,57 +0,0 @@ -<!-- - ~ Licensed to the Apache Software Foundation (ASF) under one - ~ or more contributor license agreements. See the NOTICE file - ~ distributed with this work for additional information - ~ regarding copyright ownership. The ASF licenses this file - ~ to you under the Apache License, Version 2.0 (the - ~ "License"); you may not use this file except in compliance - ~ with the License. You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, - ~ software distributed under the License is distributed on an - ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - ~ KIND, either express or implied. See the License for the - ~ specific language governing permissions and limitations - ~ under the License. - --> - -<project name="YahooRestSearchSample" default="run.client"> - - <!-- Compile for a fixed release rather than whatever JDK runs the build, - so the class files load on every JDK the project supports and stale - output cannot outlive a JDK change. A value inherited from the Maven - build wins over this default. --> - <property name="maven.compiler.release" value="17"/> - <property environment="env" /> - <property name="axis2.home" value="../../" /> - <property name="axis2.repo" value="${axis2.home}/repository" /> - <property name="build.dir" value="build" /> - <property name="client.classes.dir" value="${build.dir}/classes" /> - <path id="axis.classpath"> - <fileset dir="${axis2.home}/lib"> - <include name="*.jar" /> - </fileset> - <pathelement location="build/yahooRESTSearch.jar" /> - </path> - - <target name="compile"> - <mkdir dir="${client.classes.dir}" /> - <!-- Compile client --> - <javac srcdir="src" destdir="${client.classes.dir}" includeantruntime="false" release="${maven.compiler.release}"> - <classpath refid="axis.classpath" /> - </javac> - <jar destfile="${build.dir}/yahooRESTSearch.jar"> - <fileset dir="${build.dir}/classes" /> - </jar> - </target> - <target name="run.client" depends="compile"> - <java classname="sample.yahooservices.RESTSearch.RESTSearchClient" classpathref="axis.classpath" fork="true"> - <jvmarg value="-Daxis2.repo=${axis2.repo}" /> - </java> - </target> - <target name="clean"> - <delete dir="build" /> - </target> -</project> diff --git a/modules/samples/yahoorestsearch/src/sample/yahooservices/RESTSearch/RESTSearchClient.java b/modules/samples/yahoorestsearch/src/sample/yahooservices/RESTSearch/RESTSearchClient.java deleted file mode 100644 index bc3a289278..0000000000 --- a/modules/samples/yahoorestsearch/src/sample/yahooservices/RESTSearch/RESTSearchClient.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package sample.yahooservices.RESTSearch; - -import javax.swing.*; -import java.awt.*; - -public class RESTSearchClient extends JFrame { - public static int width; - public static int height; - - public RESTSearchClient(String title) throws HeadlessException { - super(title); - - this.getContentPane().add(new UserInterface(this)); - this.setVisible(true); - } - - public static void main(String[] args) { - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - width = screenSize.width; - height = screenSize.height; - RESTSearchClient form = new RESTSearchClient("Axis2 REST Search Client"); - - int left = (width) / 2; - int top = (height) / 2; - form.setLocation(left, top); - form.setSize(width, height); - form.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE); - form.setVisible(true); - } -} diff --git a/modules/samples/yahoorestsearch/src/sample/yahooservices/RESTSearch/RESTSearchModel.java b/modules/samples/yahoorestsearch/src/sample/yahooservices/RESTSearch/RESTSearchModel.java deleted file mode 100644 index 36507e095c..0000000000 --- a/modules/samples/yahoorestsearch/src/sample/yahooservices/RESTSearch/RESTSearchModel.java +++ /dev/null @@ -1,115 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package sample.yahooservices.RESTSearch; - -import org.apache.axiom.om.OMAbstractFactory; -import org.apache.axiom.om.OMElement; -import org.apache.axiom.om.OMFactory; -import org.apache.axis2.Constants; -import org.apache.axis2.addressing.EndpointReference; -import org.apache.axis2.client.Options; -import org.apache.axis2.client.ServiceClient; - -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; -import java.util.Iterator; - -public class RESTSearchModel { - /** - * HTML Header to desplay snippet text - */ - private String beginHTML = "<HTML><HEAD><TITLE>Search Results</TITLE></HEAD><BODY>"; - - /** - * HTML footer - */ - private String endHTML = "</BODY></HTML>"; - - /** - * Store the texts read by NavigationURL of soap - */ - private String snippet; - - public String searchYahoo(String query, String format) { - try { - snippet = beginHTML; - String epr = "http://search.yahooapis.com/WebSearchService/V1/webSearch";; - - ServiceClient client = new ServiceClient(); - Options options = new Options(); - client.setOptions(options); - options.setTo(new EndpointReference(epr)); - options.setProperty(Constants.Configuration.ENABLE_REST, Constants.VALUE_TRUE); - options.setProperty(Constants.Configuration.HTTP_METHOD, Constants.Configuration.HTTP_METHOD_GET); - options.setProperty(Constants.Configuration.MESSAGE_TYPE,org.apache.axis2.kernel.http.HTTPConstants.MEDIA_TYPE_X_WWW_FORM); - - //if post is through GET of HTTP - OMElement response = client.sendReceive(getPayloadForYahooSearchCall(query, format)); - generateSnippet(response); - return snippet; - - } catch (Exception e) { - e.printStackTrace(); - snippet = "<H2>Error occurred during the invocation to Yahoo search service</H2>" + - "<p>" + e.getMessage() + "</p>" + endHTML; - } - return null; - } - - private static OMElement getPayloadForYahooSearchCall(String queryStr, String formatStr) throws UnsupportedEncodingException { - OMFactory fac = OMAbstractFactory.getOMFactory(); - OMElement rootElement = fac.createOMElement("webSearch", null); - - OMElement appId = fac.createOMElement("appid", null, rootElement); - appId.setText("ApacheRestDemo"); - - OMElement query = fac.createOMElement("query", null, rootElement); - query.setText(URLEncoder.encode(queryStr, "UTF-8")); - - if (formatStr != null && formatStr.length() != 0) { - OMElement format = fac.createOMElement("format", null, rootElement); - format.setText(URLEncoder.encode(formatStr, "UTF-8")); - } - return rootElement; - } - - private void generateSnippet(OMElement response) { - String title = null; - String summary = null; - String clickUrl = null; - String url = null; - OMElement result = null; - //get an iterator for Result elements - Iterator itr = response.getChildElements(); - Iterator innerItr; - while (itr.hasNext()) { - result = (OMElement) itr.next(); - innerItr = result.getChildElements(); - title = ((OMElement) innerItr.next()).getText(); - summary = ((OMElement) innerItr.next()).getText(); - url = ((OMElement) innerItr.next()).getText(); - clickUrl = ((OMElement) innerItr.next()).getText(); - snippet += "<a href=" + clickUrl + ">" + title + "</a>" + "<br>" + summary + - "<br>" + url + "<br>" + "<br>"; - } - snippet += endHTML; - } -} - diff --git a/modules/samples/yahoorestsearch/src/sample/yahooservices/RESTSearch/UserInterface.java b/modules/samples/yahoorestsearch/src/sample/yahooservices/RESTSearch/UserInterface.java deleted file mode 100644 index d9bfc53132..0000000000 --- a/modules/samples/yahoorestsearch/src/sample/yahooservices/RESTSearch/UserInterface.java +++ /dev/null @@ -1,134 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package sample.yahooservices.RESTSearch; - -import javax.swing.*; -import javax.swing.event.HyperlinkListener; -import javax.swing.event.HyperlinkEvent; -import java.awt.*; -import java.awt.event.ActionListener; -import java.awt.event.ActionEvent; - -public class UserInterface extends JPanel implements HyperlinkListener { - - private JEditorPane jep; - private JScrollPane scrollPane; - - private JTextField schField; - private JTextField formatField; - - private JButton schButton; - private JButton backButton; - - private JLabel schLabel; - private JLabel formatLabel; - - - private RESTSearchModel model; - private RESTSearchClient parent; - - private String response; - public UserInterface(RESTSearchClient parent) { - this.parent = parent; - model = new RESTSearchModel(); - initComponents(); - - schButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - handleSearch(); - } - }); - - backButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - handleBack(); - } - }); - - Container pane = parent.getContentPane(); - pane.setLayout(null); - - pane.add(schLabel); - pane.add(schField); - pane.add(formatLabel); - pane.add(formatField); - pane.add(backButton); - pane.add(schButton); - pane.add(scrollPane); - } - - public void initComponents() { - schLabel = new JLabel("Search for"); - schLabel.setBounds(20, 10, 80, 25); - schField = new JTextField(); - schField.setBounds(90, 10, 250, 25); - - formatLabel = new JLabel("format"); - formatLabel.setBounds(350, 10, 50, 25); - formatField = new JTextField(); - formatField.setBounds(400, 10, 100, 25); - - backButton = new JButton("Back to Results"); - backButton.setBounds(670, 10, 150, 25); - backButton.setEnabled(false); - - schButton = new JButton("Search"); - schButton.setBounds(510, 10, 150, 25); - - - jep = new JEditorPane(); - jep.setEditable(false); - jep.setContentType("text/html"); - jep.addHyperlinkListener(this); - - scrollPane = new JScrollPane(jep); - scrollPane.setBounds(10, 80, (RESTSearchClient.width - 30), (RESTSearchClient.height - 160)); - - - } - - private void handleSearch(){ - String query = schField.getText(); - - if(!query.equals("")){ - response = model.searchYahoo(query, formatField.getText()); - jep.setText(response); - } - } - - private void handleBack(){ - jep.setText(response); - backButton.setEnabled(false); - } - - public void hyperlinkUpdate(HyperlinkEvent he) { - if (he.getEventType() == HyperlinkEvent.EventType.ACTIVATED) { - try { - jep.setPage(he.getURL()); - backButton.setEnabled(true); - } - catch (Exception e) { - JOptionPane.showMessageDialog(parent, "Page could not be loaded", - "Page Error", JOptionPane.ERROR_MESSAGE); - } - } - - } -} diff --git a/src/site/markdown/release-notes/2.0.2.md b/src/site/markdown/release-notes/2.0.2.md index 2313b86f72..209c45a427 100644 --- a/src/site/markdown/release-notes/2.0.2.md +++ b/src/site/markdown/release-notes/2.0.2.md @@ -114,9 +114,22 @@ service that had metadata exposure turned off, they no longer will. never part of the build, and its modules declared a parent version that did not match their own aggregator, so it could not be built. Its WSDL 2.0 client also depended on WSDL 2.0 support that is no longer documented. `ServiceClient` can - still be constructed from a WSDL URL; `modules/samples/jaxws-dynamic` covers the + still be constructed from a WSDL URL; `modules/samples/jaxws-addressbook` covers the JAX-WS Dispatch client. +- **Five more unrunnable samples are removed.** `yahoojsonsearch` and `yahoorestsearch` + called Yahoo search APIs that were shut down in 2011, and `googlespellcheck` called a + Google SOAP API retired in 2009; the two Yahoo samples were still in the binary + distribution. `jaxws-dynamic` was shipped with no build file and an empty README, and + `book` depended on 1.8.0 snapshots and was never built. + +- **The ant-built samples in the binary distribution build again.** Since 2.0.1 the + binary distribution has placed samples under `modules/samples/`, but most sample + `build.xml` files still located `AXIS2_HOME` two directories up, so `ant` failed + looking for `modules/lib`. They now resolve `AXIS2_HOME` correctly from + `AXIS2_HOME/modules/samples/<sample>`, and `servicelifecycle`, which still used a + builder class removed in Axiom 2.0, compiles again. + ## Deprecated for Removal - **The mail transport (`axis2-transport-mail`) is deprecated and is planned for
