You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ec...@apache.org on 2008/03/28 08:19:20 UTC

svn commit: r642109 - in /geronimo/samples/branches/1.0/migration-webservices: ./ src/com/ibm/j2g/ src/org/ src/org/apache/ src/org/apache/geronimo/ src/org/apache/geronimo/demo/ src/org/apache/geronimo/demo/webservices/ src/org/apache/geronimo/demo/we...

Author: ecraig
Date: Fri Mar 28 00:19:14 2008
New Revision: 642109

URL: http://svn.apache.org/viewvc?rev=642109&view=rev
Log:
GERONIMO-3910
Cleaned up samples/branches/1.0/migration-webservices


Added:
    geronimo/samples/branches/1.0/migration-webservices/src/org/
    geronimo/samples/branches/1.0/migration-webservices/src/org/apache/
    geronimo/samples/branches/1.0/migration-webservices/src/org/apache/geronimo/
    geronimo/samples/branches/1.0/migration-webservices/src/org/apache/geronimo/demo/
    geronimo/samples/branches/1.0/migration-webservices/src/org/apache/geronimo/demo/webservices/
    geronimo/samples/branches/1.0/migration-webservices/src/org/apache/geronimo/demo/webservices/client/
    geronimo/samples/branches/1.0/migration-webservices/src/org/apache/geronimo/demo/webservices/client/PersonPhone.java
    geronimo/samples/branches/1.0/migration-webservices/src/org/apache/geronimo/demo/webservices/client/Search.java
    geronimo/samples/branches/1.0/migration-webservices/src/org/apache/geronimo/demo/webservices/client/SearchPhonesPortType.java
    geronimo/samples/branches/1.0/migration-webservices/src/org/apache/geronimo/demo/webservices/client/SearchPhonesService.java
    geronimo/samples/branches/1.0/migration-webservices/src/org/apache/geronimo/demo/webservices/client/SearchResponse.java
    geronimo/samples/branches/1.0/migration-webservices/src/org/apache/geronimo/demo/webservices/server/
    geronimo/samples/branches/1.0/migration-webservices/src/org/apache/geronimo/demo/webservices/server/PersonPhone.java
    geronimo/samples/branches/1.0/migration-webservices/src/org/apache/geronimo/demo/webservices/server/Search.java
    geronimo/samples/branches/1.0/migration-webservices/src/org/apache/geronimo/demo/webservices/server/SearchPhonesPortType.java
    geronimo/samples/branches/1.0/migration-webservices/src/org/apache/geronimo/demo/webservices/server/SearchPhonesServer.java
    geronimo/samples/branches/1.0/migration-webservices/src/org/apache/geronimo/demo/webservices/server/SearchResponse.java
Removed:
    geronimo/samples/branches/1.0/migration-webservices/src/com/ibm/j2g/
Modified:
    geronimo/samples/branches/1.0/migration-webservices/build.xml
    geronimo/samples/branches/1.0/migration-webservices/web/WEB-INF/geronimo-web.xml
    geronimo/samples/branches/1.0/migration-webservices/web/WEB-INF/search-phones-client-mapping.xml
    geronimo/samples/branches/1.0/migration-webservices/web/WEB-INF/search-phones-server-mapping.xml
    geronimo/samples/branches/1.0/migration-webservices/web/WEB-INF/web.xml
    geronimo/samples/branches/1.0/migration-webservices/web/WEB-INF/webservices.xml
    geronimo/samples/branches/1.0/migration-webservices/web/WEB-INF/wsdl/search-phones-service.wsdl
    geronimo/samples/branches/1.0/migration-webservices/web/index.jsp

Modified: geronimo/samples/branches/1.0/migration-webservices/build.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/1.0/migration-webservices/build.xml?rev=642109&r1=642108&r2=642109&view=diff
==============================================================================
--- geronimo/samples/branches/1.0/migration-webservices/build.xml (original)
+++ geronimo/samples/branches/1.0/migration-webservices/build.xml Fri Mar 28 00:19:14 2008
@@ -79,7 +79,7 @@
             <arg value="--password"/>
             <arg value="${geronimo.password}"/>
             <arg value="undeploy"/>
-            <arg value="com/ibm/j2g/webservices.war"/>
+            <arg value="org/apache/geronimo/demo/webservices.war"/>
         </java>
 
         <java jar="${geronimo.home}/bin/deployer.jar" fork="true">

Added: geronimo/samples/branches/1.0/migration-webservices/src/org/apache/geronimo/demo/webservices/client/PersonPhone.java
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/1.0/migration-webservices/src/org/apache/geronimo/demo/webservices/client/PersonPhone.java?rev=642109&view=auto
==============================================================================
--- geronimo/samples/branches/1.0/migration-webservices/src/org/apache/geronimo/demo/webservices/client/PersonPhone.java (added)
+++ geronimo/samples/branches/1.0/migration-webservices/src/org/apache/geronimo/demo/webservices/client/PersonPhone.java Fri Mar 28 00:19:14 2008
@@ -0,0 +1,52 @@
+/*
+* 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.
+*/
+// This class was generated by the JAXRPC SI, do not edit.
+// Contents subject to change without notice.
+// JAX-RPC Standard Implementation (1.1.3, build R1)
+// Generated source version: 1.1.3
+
+package org.apache.geronimo.demo.webservices.client;
+
+
+public class PersonPhone {
+    protected java.lang.String personName;
+    protected java.lang.String phoneNumber;
+    
+    public PersonPhone() {
+    }
+    
+    public PersonPhone(java.lang.String personName, java.lang.String phoneNumber) {
+        this.personName = personName;
+        this.phoneNumber = phoneNumber;
+    }
+    
+    public java.lang.String getPersonName() {
+        return personName;
+    }
+    
+    public void setPersonName(java.lang.String personName) {
+        this.personName = personName;
+    }
+    
+    public java.lang.String getPhoneNumber() {
+        return phoneNumber;
+    }
+    
+    public void setPhoneNumber(java.lang.String phoneNumber) {
+        this.phoneNumber = phoneNumber;
+    }
+}

Added: geronimo/samples/branches/1.0/migration-webservices/src/org/apache/geronimo/demo/webservices/client/Search.java
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/1.0/migration-webservices/src/org/apache/geronimo/demo/webservices/client/Search.java?rev=642109&view=auto
==============================================================================
--- geronimo/samples/branches/1.0/migration-webservices/src/org/apache/geronimo/demo/webservices/client/Search.java (added)
+++ geronimo/samples/branches/1.0/migration-webservices/src/org/apache/geronimo/demo/webservices/client/Search.java Fri Mar 28 00:19:14 2008
@@ -0,0 +1,42 @@
+/*
+* 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.
+*/
+// This class was generated by the JAXRPC SI, do not edit.
+// Contents subject to change without notice.
+// JAX-RPC Standard Implementation (1.1.3, build R1)
+// Generated source version: 1.1.3
+
+package org.apache.geronimo.demo.webservices.client;
+
+
+public class Search {
+    protected java.lang.String personName;
+    
+    public Search() {
+    }
+    
+    public Search(java.lang.String personName) {
+        this.personName = personName;
+    }
+    
+    public java.lang.String getPersonName() {
+        return personName;
+    }
+    
+    public void setPersonName(java.lang.String personName) {
+        this.personName = personName;
+    }
+}

Added: geronimo/samples/branches/1.0/migration-webservices/src/org/apache/geronimo/demo/webservices/client/SearchPhonesPortType.java
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/1.0/migration-webservices/src/org/apache/geronimo/demo/webservices/client/SearchPhonesPortType.java?rev=642109&view=auto
==============================================================================
--- geronimo/samples/branches/1.0/migration-webservices/src/org/apache/geronimo/demo/webservices/client/SearchPhonesPortType.java (added)
+++ geronimo/samples/branches/1.0/migration-webservices/src/org/apache/geronimo/demo/webservices/client/SearchPhonesPortType.java Fri Mar 28 00:19:14 2008
@@ -0,0 +1,27 @@
+/*
+* 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.
+*/
+// This class was generated by the JAXRPC SI, do not edit.
+// Contents subject to change without notice.
+// JAX-RPC Standard Implementation (1.1.3, build R1)
+// Generated source version: 1.1.3
+
+package org.apache.geronimo.demo.webservices.client;
+
+public interface SearchPhonesPortType extends java.rmi.Remote {
+    public org.apache.geronimo.demo.webservices.client.PersonPhone[] search(java.lang.String personName) throws 
+         java.rmi.RemoteException;
+}

Added: geronimo/samples/branches/1.0/migration-webservices/src/org/apache/geronimo/demo/webservices/client/SearchPhonesService.java
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/1.0/migration-webservices/src/org/apache/geronimo/demo/webservices/client/SearchPhonesService.java?rev=642109&view=auto
==============================================================================
--- geronimo/samples/branches/1.0/migration-webservices/src/org/apache/geronimo/demo/webservices/client/SearchPhonesService.java (added)
+++ geronimo/samples/branches/1.0/migration-webservices/src/org/apache/geronimo/demo/webservices/client/SearchPhonesService.java Fri Mar 28 00:19:14 2008
@@ -0,0 +1,28 @@
+/*
+* 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.
+*/
+// This class was generated by the JAXRPC SI, do not edit.
+// Contents subject to change without notice.
+// JAX-RPC Standard Implementation (1.1.3, build R1)
+// Generated source version: 1.1.3
+
+package org.apache.geronimo.demo.webservices.client;
+
+import javax.xml.rpc.*;
+
+public interface SearchPhonesService extends javax.xml.rpc.Service {
+    public org.apache.geronimo.demo.webservices.client.SearchPhonesPortType getSearchPhonesService() throws ServiceException;
+}

Added: geronimo/samples/branches/1.0/migration-webservices/src/org/apache/geronimo/demo/webservices/client/SearchResponse.java
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/1.0/migration-webservices/src/org/apache/geronimo/demo/webservices/client/SearchResponse.java?rev=642109&view=auto
==============================================================================
--- geronimo/samples/branches/1.0/migration-webservices/src/org/apache/geronimo/demo/webservices/client/SearchResponse.java (added)
+++ geronimo/samples/branches/1.0/migration-webservices/src/org/apache/geronimo/demo/webservices/client/SearchResponse.java Fri Mar 28 00:19:14 2008
@@ -0,0 +1,42 @@
+/*
+* 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.
+*/
+// This class was generated by the JAXRPC SI, do not edit.
+// Contents subject to change without notice.
+// JAX-RPC Standard Implementation (1.1.3, build R1)
+// Generated source version: 1.1.3
+
+package org.apache.geronimo.demo.webservices.client;
+
+
+public class SearchResponse {
+    protected org.apache.geronimo.demo.webservices.client.PersonPhone[] searchReturn;
+    
+    public SearchResponse() {
+    }
+    
+    public SearchResponse(org.apache.geronimo.demo.webservices.client.PersonPhone[] searchReturn) {
+        this.searchReturn = searchReturn;
+    }
+    
+    public org.apache.geronimo.demo.webservices.client.PersonPhone[] getSearchReturn() {
+        return searchReturn;
+    }
+    
+    public void setSearchReturn(org.apache.geronimo.demo.webservices.client.PersonPhone[] searchReturn) {
+        this.searchReturn = searchReturn;
+    }
+}

Added: geronimo/samples/branches/1.0/migration-webservices/src/org/apache/geronimo/demo/webservices/server/PersonPhone.java
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/1.0/migration-webservices/src/org/apache/geronimo/demo/webservices/server/PersonPhone.java?rev=642109&view=auto
==============================================================================
--- geronimo/samples/branches/1.0/migration-webservices/src/org/apache/geronimo/demo/webservices/server/PersonPhone.java (added)
+++ geronimo/samples/branches/1.0/migration-webservices/src/org/apache/geronimo/demo/webservices/server/PersonPhone.java Fri Mar 28 00:19:14 2008
@@ -0,0 +1,52 @@
+/*
+* 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.
+*/
+// This class was generated by the JAXRPC SI, do not edit.
+// Contents subject to change without notice.
+// JAX-RPC Standard Implementation (1.1.3, build R1)
+// Generated source version: 1.1.3
+
+package org.apache.geronimo.demo.webservices.server;
+
+
+public class PersonPhone {
+    protected java.lang.String personName;
+    protected java.lang.String phoneNumber;
+    
+    public PersonPhone() {
+    }
+    
+    public PersonPhone(java.lang.String personName, java.lang.String phoneNumber) {
+        this.personName = personName;
+        this.phoneNumber = phoneNumber;
+    }
+    
+    public java.lang.String getPersonName() {
+        return personName;
+    }
+    
+    public void setPersonName(java.lang.String personName) {
+        this.personName = personName;
+    }
+    
+    public java.lang.String getPhoneNumber() {
+        return phoneNumber;
+    }
+    
+    public void setPhoneNumber(java.lang.String phoneNumber) {
+        this.phoneNumber = phoneNumber;
+    }
+}

Added: geronimo/samples/branches/1.0/migration-webservices/src/org/apache/geronimo/demo/webservices/server/Search.java
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/1.0/migration-webservices/src/org/apache/geronimo/demo/webservices/server/Search.java?rev=642109&view=auto
==============================================================================
--- geronimo/samples/branches/1.0/migration-webservices/src/org/apache/geronimo/demo/webservices/server/Search.java (added)
+++ geronimo/samples/branches/1.0/migration-webservices/src/org/apache/geronimo/demo/webservices/server/Search.java Fri Mar 28 00:19:14 2008
@@ -0,0 +1,42 @@
+/*
+* 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.
+*/
+// This class was generated by the JAXRPC SI, do not edit.
+// Contents subject to change without notice.
+// JAX-RPC Standard Implementation (1.1.3, build R1)
+// Generated source version: 1.1.3
+
+package org.apache.geronimo.demo.webservices.server;
+
+
+public class Search {
+    protected java.lang.String personName;
+    
+    public Search() {
+    }
+    
+    public Search(java.lang.String personName) {
+        this.personName = personName;
+    }
+    
+    public java.lang.String getPersonName() {
+        return personName;
+    }
+    
+    public void setPersonName(java.lang.String personName) {
+        this.personName = personName;
+    }
+}

Added: geronimo/samples/branches/1.0/migration-webservices/src/org/apache/geronimo/demo/webservices/server/SearchPhonesPortType.java
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/1.0/migration-webservices/src/org/apache/geronimo/demo/webservices/server/SearchPhonesPortType.java?rev=642109&view=auto
==============================================================================
--- geronimo/samples/branches/1.0/migration-webservices/src/org/apache/geronimo/demo/webservices/server/SearchPhonesPortType.java (added)
+++ geronimo/samples/branches/1.0/migration-webservices/src/org/apache/geronimo/demo/webservices/server/SearchPhonesPortType.java Fri Mar 28 00:19:14 2008
@@ -0,0 +1,27 @@
+/*
+* 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.
+*/
+// This class was generated by the JAXRPC SI, do not edit.
+// Contents subject to change without notice.
+// JAX-RPC Standard Implementation (1.1.3, build R1)
+// Generated source version: 1.1.3
+
+package org.apache.geronimo.demo.webservices.server;
+
+public interface SearchPhonesPortType extends java.rmi.Remote {
+    public org.apache.geronimo.demo.webservices.server.PersonPhone[] search(java.lang.String personName) throws 
+         java.rmi.RemoteException;
+}

Added: geronimo/samples/branches/1.0/migration-webservices/src/org/apache/geronimo/demo/webservices/server/SearchPhonesServer.java
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/1.0/migration-webservices/src/org/apache/geronimo/demo/webservices/server/SearchPhonesServer.java?rev=642109&view=auto
==============================================================================
--- geronimo/samples/branches/1.0/migration-webservices/src/org/apache/geronimo/demo/webservices/server/SearchPhonesServer.java (added)
+++ geronimo/samples/branches/1.0/migration-webservices/src/org/apache/geronimo/demo/webservices/server/SearchPhonesServer.java Fri Mar 28 00:19:14 2008
@@ -0,0 +1,64 @@
+/*
+* 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.geronimo.demo.webservices.server;
+
+import java.rmi.RemoteException;
+import java.util.ArrayList;
+import java.util.List;
+
+public class SearchPhonesServer implements SearchPhonesPortType {
+
+    /** 
+     * Sample phones data
+     */
+    public final static PersonPhone[] AVAILABLE_PHONES = new PersonPhone[] {
+        new PersonPhone("Tom", "098-765-4321"),
+        new PersonPhone("John", "908-123-4567"),
+        new PersonPhone("Laura", "098-132-7654"),
+        new PersonPhone("Paul", "980-567-1234"),
+        new PersonPhone("Mike", "809-321-7654"),
+        new PersonPhone("Helen", "089-675-1234"),
+        new PersonPhone("Bill", "890-213-7654"),
+        new PersonPhone("Mark", "908-312-4567"),
+        new PersonPhone("Jenny", "809-756-4321"),
+        new PersonPhone("Brian", "980-576-1234")
+    };
+    
+    /**
+     * Searches sample data for persons which name starts with the specified string and returns
+     * an array of found persons with their phones
+     * @param personName string for which names of persons are to be searched
+     * @return array of found persons with their phones or null in case the search parameter
+     *         is null or equals to an empty string
+     */
+    public PersonPhone[] search(String personName) throws RemoteException {
+        if (personName == null || personName.equals("")) {
+            return null;
+        }
+
+        String stringToSearch = personName.toLowerCase();
+                
+        List results = new ArrayList();
+        for (int i = 0; i < AVAILABLE_PHONES.length; i++) {
+            if (AVAILABLE_PHONES[i].getPersonName().toLowerCase().startsWith(stringToSearch)) {
+                results.add(AVAILABLE_PHONES[i]);
+            }
+        }
+        
+        return (PersonPhone[])results.toArray(new PersonPhone[results.size()]);
+    }
+}

Added: geronimo/samples/branches/1.0/migration-webservices/src/org/apache/geronimo/demo/webservices/server/SearchResponse.java
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/1.0/migration-webservices/src/org/apache/geronimo/demo/webservices/server/SearchResponse.java?rev=642109&view=auto
==============================================================================
--- geronimo/samples/branches/1.0/migration-webservices/src/org/apache/geronimo/demo/webservices/server/SearchResponse.java (added)
+++ geronimo/samples/branches/1.0/migration-webservices/src/org/apache/geronimo/demo/webservices/server/SearchResponse.java Fri Mar 28 00:19:14 2008
@@ -0,0 +1,42 @@
+/*
+* 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.
+*/
+// This class was generated by the JAXRPC SI, do not edit.
+// Contents subject to change without notice.
+// JAX-RPC Standard Implementation (1.1.3, build R1)
+// Generated source version: 1.1.3
+
+package org.apache.geronimo.demo.webservices.server;
+
+
+public class SearchResponse {
+    protected org.apache.geronimo.demo.webservices.server.PersonPhone[] searchReturn;
+    
+    public SearchResponse() {
+    }
+    
+    public SearchResponse(org.apache.geronimo.demo.webservices.server.PersonPhone[] searchReturn) {
+        this.searchReturn = searchReturn;
+    }
+    
+    public org.apache.geronimo.demo.webservices.server.PersonPhone[] getSearchReturn() {
+        return searchReturn;
+    }
+    
+    public void setSearchReturn(org.apache.geronimo.demo.webservices.server.PersonPhone[] searchReturn) {
+        this.searchReturn = searchReturn;
+    }
+}

Modified: geronimo/samples/branches/1.0/migration-webservices/web/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/1.0/migration-webservices/web/WEB-INF/geronimo-web.xml?rev=642109&r1=642108&r2=642109&view=diff
==============================================================================
--- geronimo/samples/branches/1.0/migration-webservices/web/WEB-INF/geronimo-web.xml (original)
+++ geronimo/samples/branches/1.0/migration-webservices/web/WEB-INF/geronimo-web.xml Fri Mar 28 00:19:14 2008
@@ -19,7 +19,7 @@
 <!-- This is Geronimo-specific descriptor -->
 
 <web-app xmlns="http://geronimo.apache.org/xml/ns/web" 
-        configId="com/ibm/j2g/webservices.war">
+        configId="org/apache/geronimo/demo/webservices.war">
 
     <context-root>/webservices</context-root>
     

Modified: geronimo/samples/branches/1.0/migration-webservices/web/WEB-INF/search-phones-client-mapping.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/1.0/migration-webservices/web/WEB-INF/search-phones-client-mapping.xml?rev=642109&r1=642108&r2=642109&view=diff
==============================================================================
--- geronimo/samples/branches/1.0/migration-webservices/web/WEB-INF/search-phones-client-mapping.xml (original)
+++ geronimo/samples/branches/1.0/migration-webservices/web/WEB-INF/search-phones-client-mapping.xml Fri Mar 28 00:19:14 2008
@@ -15,18 +15,18 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee    http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd">
+<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee    http://java.sun.com/xml/ns/j2ee/j2ee_jaxrpc_mapping_1_1.xsd">
 <package-mapping>
-<package-type>com.ibm.j2g.webservices.client</package-type>
-<namespaceURI>http://ibm.com/j2g/webservices</namespaceURI>
+<package-type>org.apache.geronimo.demo.webservices.client</package-type>
+<namespaceURI>http://geronimo.apache.org/demo/webservices</namespaceURI>
 </package-mapping>
 <package-mapping>
-<package-type>com.ibm.j2g.webservices.client</package-type>
-<namespaceURI>http://ibm.com/j2g/webservices/types</namespaceURI>
+<package-type>org.apache.geronimo.demo.webservices.client</package-type>
+<namespaceURI>http://geronimo.apache.org/demo/webservices/types</namespaceURI>
 </package-mapping>
 <java-xml-type-mapping>
-<java-type>com.ibm.j2g.webservices.client.PersonPhone</java-type>
-<root-type-qname xmlns:typeNS="http://ibm.com/j2g/webservices/types">typeNS:PersonPhone</root-type-qname>
+<java-type>org.apache.geronimo.demo.webservices.client.PersonPhone</java-type>
+<root-type-qname xmlns:typeNS="http://geronimo.apache.org/demo/webservices/types">typeNS:PersonPhone</root-type-qname>
 <qname-scope>complexType</qname-scope>
 <variable-mapping>
 <java-variable-name>personName</java-variable-name>
@@ -38,8 +38,8 @@
 </variable-mapping>
 </java-xml-type-mapping>
 <java-xml-type-mapping>
-<java-type>com.ibm.j2g.webservices.client.SearchResponse</java-type>
-<anonymous-type-qname>http://ibm.com/j2g/webservices/types:&gt;searchResponse</anonymous-type-qname>
+<java-type>org.apache.geronimo.demo.webservices.client.SearchResponse</java-type>
+<anonymous-type-qname>http://geronimo.apache.org/demo/webservices/types:&gt;searchResponse</anonymous-type-qname>
 <qname-scope>complexType</qname-scope>
 <variable-mapping>
 <java-variable-name>personPhone</java-variable-name>
@@ -47,8 +47,8 @@
 </variable-mapping>
 </java-xml-type-mapping>
 <java-xml-type-mapping>
-<java-type>com.ibm.j2g.webservices.client.Search</java-type>
-<anonymous-type-qname>http://ibm.com/j2g/webservices/types:&gt;search</anonymous-type-qname>
+<java-type>org.apache.geronimo.demo.webservices.client.Search</java-type>
+<anonymous-type-qname>http://geronimo.apache.org/demo/webservices/types:&gt;search</anonymous-type-qname>
 <qname-scope>complexType</qname-scope>
 <variable-mapping>
 <java-variable-name>personName</java-variable-name>
@@ -56,22 +56,22 @@
 </variable-mapping>
 </java-xml-type-mapping>
 <java-xml-type-mapping>
-<java-type>com.ibm.j2g.webservices.client.PersonPhone[]</java-type>
-<anonymous-type-qname>http://ibm.com/j2g/webservices/types:&gt;searchResponse&gt;personPhone[1,unbounded]</anonymous-type-qname>
+<java-type>org.apache.geronimo.demo.webservices.client.PersonPhone[]</java-type>
+<anonymous-type-qname>http://geronimo.apache.org/demo/webservices/types:&gt;searchResponse&gt;personPhone[1,unbounded]</anonymous-type-qname>
 <qname-scope>complexType</qname-scope>
 </java-xml-type-mapping>
 <service-interface-mapping>
-<service-interface>com.ibm.j2g.webservices.client.SearchPhonesService</service-interface>
-<wsdl-service-name xmlns:serviceNS="http://ibm.com/j2g/webservices">serviceNS:SearchPhonesService</wsdl-service-name>
+<service-interface>org.apache.geronimo.demo.webservices.client.SearchPhonesService</service-interface>
+<wsdl-service-name xmlns:serviceNS="http://geronimo.apache.org/demo/webservices">serviceNS:SearchPhonesService</wsdl-service-name>
 <port-mapping>
 <port-name>SearchPhonesService</port-name>
 <java-port-name>SearchPhonesService</java-port-name>
 </port-mapping>
 </service-interface-mapping>
 <service-endpoint-interface-mapping>
-<service-endpoint-interface>com.ibm.j2g.webservices.client.SearchPhonesPortType</service-endpoint-interface>
-<wsdl-port-type xmlns:portTypeNS="http://ibm.com/j2g/webservices">portTypeNS:SearchPhonesPortType</wsdl-port-type>
-<wsdl-binding xmlns:bindingNS="http://ibm.com/j2g/webservices">bindingNS:SearchPhonesBinding</wsdl-binding>
+<service-endpoint-interface>org.apache.geronimo.demo.webservices.client.SearchPhonesPortType</service-endpoint-interface>
+<wsdl-port-type xmlns:portTypeNS="http://geronimo.apache.org/demo/webservices">portTypeNS:SearchPhonesPortType</wsdl-port-type>
+<wsdl-binding xmlns:bindingNS="http://geronimo.apache.org/demo/webservices">bindingNS:SearchPhonesBinding</wsdl-binding>
 <service-endpoint-method-mapping>
 <java-method-name>search</java-method-name>
 <wsdl-operation>search</wsdl-operation>
@@ -80,14 +80,14 @@
 <param-position>0</param-position>
 <param-type>java.lang.String</param-type>
 <wsdl-message-mapping>
-<wsdl-message xmlns:wsdlMsgNS="http://ibm.com/j2g/webservices">wsdlMsgNS:searchRequest</wsdl-message>
+<wsdl-message xmlns:wsdlMsgNS="http://geronimo.apache.org/demo/webservices">wsdlMsgNS:searchRequest</wsdl-message>
 <wsdl-message-part-name>personName</wsdl-message-part-name>
 <parameter-mode>IN</parameter-mode>
 </wsdl-message-mapping>
 </method-param-parts-mapping>
 <wsdl-return-value-mapping>
-<method-return-value>com.ibm.j2g.webservices.client.PersonPhone[]</method-return-value>
-<wsdl-message xmlns:wsdlMsgNS="http://ibm.com/j2g/webservices">wsdlMsgNS:searchResponse</wsdl-message>
+<method-return-value>org.apache.geronimo.demo.webservices.client.PersonPhone[]</method-return-value>
+<wsdl-message xmlns:wsdlMsgNS="http://geronimo.apache.org/demo/webservices">wsdlMsgNS:searchResponse</wsdl-message>
 <wsdl-message-part-name>personPhone</wsdl-message-part-name>
 </wsdl-return-value-mapping>
 </service-endpoint-method-mapping>

Modified: geronimo/samples/branches/1.0/migration-webservices/web/WEB-INF/search-phones-server-mapping.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/1.0/migration-webservices/web/WEB-INF/search-phones-server-mapping.xml?rev=642109&r1=642108&r2=642109&view=diff
==============================================================================
--- geronimo/samples/branches/1.0/migration-webservices/web/WEB-INF/search-phones-server-mapping.xml (original)
+++ geronimo/samples/branches/1.0/migration-webservices/web/WEB-INF/search-phones-server-mapping.xml Fri Mar 28 00:19:14 2008
@@ -15,18 +15,18 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee    http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd">
+<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee    http://java.sun.com/xml/ns/j2ee/j2ee_jaxrpc_mapping_1_1.xsd">
 <package-mapping>
-<package-type>com.ibm.j2g.webservices.server</package-type>
-<namespaceURI>http://ibm.com/j2g/webservices</namespaceURI>
+<package-type>org.apache.geronimo.webservices.server</package-type>
+<namespaceURI>http://geronimo.apache.org/demo/webservices</namespaceURI>
 </package-mapping>
 <package-mapping>
-<package-type>com.ibm.j2g.webservices.server</package-type>
-<namespaceURI>http://ibm.com/j2g/webservices/types</namespaceURI>
+<package-type>org.apache.geronimo.webservices.server</package-type>
+<namespaceURI>http://geronimo.apache.org/demo/webservices/types</namespaceURI>
 </package-mapping>
 <java-xml-type-mapping>
-<java-type>com.ibm.j2g.webservices.server.PersonPhone</java-type>
-<root-type-qname xmlns:typeNS="http://ibm.com/j2g/webservices/types">typeNS:PersonPhone</root-type-qname>
+<java-type>org.apache.geronimo.webservices.server.PersonPhone</java-type>
+<root-type-qname xmlns:typeNS="http://geronimo.apache.org/demo/webservices/types">typeNS:PersonPhone</root-type-qname>
 <qname-scope>complexType</qname-scope>
 <variable-mapping>
 <java-variable-name>personName</java-variable-name>
@@ -38,8 +38,8 @@
 </variable-mapping>
 </java-xml-type-mapping>
 <java-xml-type-mapping>
-<java-type>com.ibm.j2g.webservices.server.SearchResponse</java-type>
-<anonymous-type-qname>http://ibm.com/j2g/webservices/types:&gt;searchResponse</anonymous-type-qname>
+<java-type>org.apache.geronimo.webservices.server.SearchResponse</java-type>
+<anonymous-type-qname>http://geronimo.apache.org/demo/webservices/types:&gt;searchResponse</anonymous-type-qname>
 <qname-scope>complexType</qname-scope>
 <variable-mapping>
 <java-variable-name>personPhone</java-variable-name>
@@ -47,8 +47,8 @@
 </variable-mapping>
 </java-xml-type-mapping>
 <java-xml-type-mapping>
-<java-type>com.ibm.j2g.webservices.server.Search</java-type>
-<anonymous-type-qname>http://ibm.com/j2g/webservices/types:&gt;search</anonymous-type-qname>
+<java-type>org.apache.geronimo.webservices.server.Search</java-type>
+<anonymous-type-qname>http://geronimo.apache.org/demo/webservices/types:&gt;search</anonymous-type-qname>
 <qname-scope>complexType</qname-scope>
 <variable-mapping>
 <java-variable-name>personName</java-variable-name>
@@ -56,22 +56,22 @@
 </variable-mapping>
 </java-xml-type-mapping>
 <java-xml-type-mapping>
-<java-type>com.ibm.j2g.webservices.server.PersonPhone[]</java-type>
-<anonymous-type-qname>http://ibm.com/j2g/webservices/types:&gt;searchResponse&gt;personPhone[1,unbounded]</anonymous-type-qname>
+<java-type>org.apache.geronimo.webservices.server.PersonPhone[]</java-type>
+<anonymous-type-qname>http://geronimo.apache.org/demo/webservices/types:&gt;searchResponse&gt;personPhone[1,unbounded]</anonymous-type-qname>
 <qname-scope>complexType</qname-scope>
 </java-xml-type-mapping>
 <service-interface-mapping>
-<service-interface>com.ibm.j2g.webservices.server.SearchPhonesService</service-interface>
-<wsdl-service-name xmlns:serviceNS="http://ibm.com/j2g/webservices">serviceNS:SearchPhonesService</wsdl-service-name>
+<service-interface>org.apache.geronimo.webservices.server.SearchPhonesService</service-interface>
+<wsdl-service-name xmlns:serviceNS="http://geronimo.apache.org/demo/webservices">serviceNS:SearchPhonesService</wsdl-service-name>
 <port-mapping>
 <port-name>SearchPhonesService</port-name>
 <java-port-name>SearchPhonesService</java-port-name>
 </port-mapping>
 </service-interface-mapping>
 <service-endpoint-interface-mapping>
-<service-endpoint-interface>com.ibm.j2g.webservices.server.SearchPhonesPortType</service-endpoint-interface>
-<wsdl-port-type xmlns:portTypeNS="http://ibm.com/j2g/webservices">portTypeNS:SearchPhonesPortType</wsdl-port-type>
-<wsdl-binding xmlns:bindingNS="http://ibm.com/j2g/webservices">bindingNS:SearchPhonesBinding</wsdl-binding>
+<service-endpoint-interface>org.apache.geronimo.webservices.server.SearchPhonesPortType</service-endpoint-interface>
+<wsdl-port-type xmlns:portTypeNS="http://geronimo.apache.org/demo/webservices">portTypeNS:SearchPhonesPortType</wsdl-port-type>
+<wsdl-binding xmlns:bindingNS="http://geronimo.apache.org/demo/webservices">bindingNS:SearchPhonesBinding</wsdl-binding>
 <service-endpoint-method-mapping>
 <java-method-name>search</java-method-name>
 <wsdl-operation>search</wsdl-operation>
@@ -80,14 +80,14 @@
 <param-position>0</param-position>
 <param-type>java.lang.String</param-type>
 <wsdl-message-mapping>
-<wsdl-message xmlns:wsdlMsgNS="http://ibm.com/j2g/webservices">wsdlMsgNS:searchRequest</wsdl-message>
+<wsdl-message xmlns:wsdlMsgNS="http://geronimo.apache.org/demo/webservices">wsdlMsgNS:searchRequest</wsdl-message>
 <wsdl-message-part-name>personName</wsdl-message-part-name>
 <parameter-mode>IN</parameter-mode>
 </wsdl-message-mapping>
 </method-param-parts-mapping>
 <wsdl-return-value-mapping>
-<method-return-value>com.ibm.j2g.webservices.server.PersonPhone[]</method-return-value>
-<wsdl-message xmlns:wsdlMsgNS="http://ibm.com/j2g/webservices">wsdlMsgNS:searchResponse</wsdl-message>
+<method-return-value>org.apache.geronimo.webservices.server.PersonPhone[]</method-return-value>
+<wsdl-message xmlns:wsdlMsgNS="http://geronimo.apache.org/demo/webservices">wsdlMsgNS:searchResponse</wsdl-message>
 <wsdl-message-part-name>personPhone</wsdl-message-part-name>
 </wsdl-return-value-mapping>
 </service-endpoint-method-mapping>

Modified: geronimo/samples/branches/1.0/migration-webservices/web/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/1.0/migration-webservices/web/WEB-INF/web.xml?rev=642109&r1=642108&r2=642109&view=diff
==============================================================================
--- geronimo/samples/branches/1.0/migration-webservices/web/WEB-INF/web.xml (original)
+++ geronimo/samples/branches/1.0/migration-webservices/web/WEB-INF/web.xml Fri Mar 28 00:19:14 2008
@@ -24,7 +24,7 @@
 
     <servlet>
         <servlet-name>SearchPhonesServer</servlet-name>
-        <servlet-class>com.ibm.j2g.webservices.server.SearchPhonesServer</servlet-class>
+        <servlet-class>org.apache.geronimo.demo.webservices.server.SearchPhonesServer</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>SearchPhonesServer</servlet-name>
@@ -33,7 +33,7 @@
 
     <service-ref>
         <service-ref-name>service/SearchPhones</service-ref-name>
-        <service-interface>com.ibm.j2g.webservices.client.SearchPhonesService</service-interface>
+        <service-interface>org.apache.geronimo.demo.webservices.client.SearchPhonesService</service-interface>
         <wsdl-file>WEB-INF/wsdl/search-phones-service.wsdl</wsdl-file>
         <jaxrpc-mapping-file>WEB-INF/search-phones-client-mapping.xml</jaxrpc-mapping-file>
     </service-ref>

Modified: geronimo/samples/branches/1.0/migration-webservices/web/WEB-INF/webservices.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/1.0/migration-webservices/web/WEB-INF/webservices.xml?rev=642109&r1=642108&r2=642109&view=diff
==============================================================================
--- geronimo/samples/branches/1.0/migration-webservices/web/WEB-INF/webservices.xml (original)
+++ geronimo/samples/branches/1.0/migration-webservices/web/WEB-INF/webservices.xml Fri Mar 28 00:19:14 2008
@@ -25,7 +25,7 @@
         <port-component>
             <port-component-name>SearchPhonesService</port-component-name>
             <wsdl-port>SearchPhonesService</wsdl-port>
-            <service-endpoint-interface>com.ibm.j2g.webservices.server.SearchPhonesPortType</service-endpoint-interface>
+            <service-endpoint-interface>org.apache.geronimo.demo.webservices.server.SearchPhonesPortType</service-endpoint-interface>
             <service-impl-bean>
                 <servlet-link>SearchPhonesServer</servlet-link>
             </service-impl-bean>

Modified: geronimo/samples/branches/1.0/migration-webservices/web/WEB-INF/wsdl/search-phones-service.wsdl
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/1.0/migration-webservices/web/WEB-INF/wsdl/search-phones-service.wsdl?rev=642109&r1=642108&r2=642109&view=diff
==============================================================================
--- geronimo/samples/branches/1.0/migration-webservices/web/WEB-INF/wsdl/search-phones-service.wsdl (original)
+++ geronimo/samples/branches/1.0/migration-webservices/web/WEB-INF/wsdl/search-phones-service.wsdl Fri Mar 28 00:19:14 2008
@@ -15,15 +15,15 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<wsdl:definitions targetNamespace="http://ibm.com/j2g/webservices"
+<wsdl:definitions targetNamespace="http://geronimo.apache.org/demo/webservices"
         xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
         xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
         xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-        xmlns:tns="http://ibm.com/j2g/webservices"
-        xmlns:types="http://ibm.com/j2g/webservices/types">
+        xmlns:tns="http://geronimo.apache.org/demo.webservices"
+        xmlns:types="http://geronimo.apache.org/demo.webservices/types">
 
     <wsdl:types>
-        <xsd:schema targetNamespace="http://ibm.com/j2g/webservices/types">
+        <xsd:schema targetNamespace="http://geronimo.apache.org/demo.webservices/types">
             <xsd:complexType name="PersonPhone">
                 <xsd:sequence>
                     <xsd:element name="personName" type="xsd:string"/>

Modified: geronimo/samples/branches/1.0/migration-webservices/web/index.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/1.0/migration-webservices/web/index.jsp?rev=642109&r1=642108&r2=642109&view=diff
==============================================================================
--- geronimo/samples/branches/1.0/migration-webservices/web/index.jsp (original)
+++ geronimo/samples/branches/1.0/migration-webservices/web/index.jsp Fri Mar 28 00:19:14 2008
@@ -17,24 +17,22 @@
 <%@ page language="java"
     contentType="text/html; charset=utf-8"
     pageEncoding="utf-8"
-    import="com.ibm.j2g.webservices.client.*"
+    import="org.apache.geronimo.demo.webservices.client.*"
 %>
 
-<%!
-    /* Name of the reference to the Search Phones service described in the web.xml file */
+<%!/* Name of the reference to the Search Phones service described in the web.xml file */
     private final static String SERVICE_REF_NAME = "java:comp/env/service/SearchPhones";
 
     /* Used for making hints to users */
-    private final static com.ibm.j2g.webservices.server.PersonPhone[] AVAILABLE_PHONES =
-        com.ibm.j2g.webservices.server.SearchPhonesServer.AVAILABLE_PHONES;
+    private final static org.apache.geronimo.demo.webservices.server.PersonPhone[] AVAILABLE_PHONES =
+        org.apache.geronimo.demo.webservices.server.SearchPhonesServer.AVAILABLE_PHONES;
 
     /* Returns the endpoint for calling methods of the web service */
     public SearchPhonesPortType getService() throws Exception {
         javax.naming.InitialContext ctx = new javax.naming.InitialContext();
         SearchPhonesService service = (SearchPhonesService)ctx.lookup(SERVICE_REF_NAME);
         return service.getSearchPhonesService();
-    }
-%>
+    }%>
 
 <%  String name = request.getParameter("name"); %>