Author: ffang
Date: Tue Dec 8 04:34:13 2009
New Revision: 888254
URL: http://svn.apache.org/viewvc?rev=888254&view=rev
Log:
[SM-1917]servicemix-cxf-se-wsdl-first-service-unit generates a wrong package
structure
Added:
servicemix/archetypes/trunk/servicemix-cxf-se-wsdl-first-service-unit/src/main/resources/archetype-resources/src/main/java/PersonImpl.java
- copied, changed from r888237,
servicemix/archetypes/trunk/servicemix-cxf-se-wsdl-first-service-unit/src/main/resources/archetype-resources/src/main/java/org/apache/servicemix/samples/wsdl_first/PersonImpl.java
Removed:
servicemix/archetypes/trunk/servicemix-cxf-se-wsdl-first-service-unit/src/main/resources/archetype-resources/src/main/java/org/apache/servicemix/samples/wsdl_first/PersonImpl.java
Modified:
servicemix/archetypes/trunk/servicemix-cxf-se-wsdl-first-service-unit/src/main/resources/META-INF/maven/archetype.xml
servicemix/archetypes/trunk/servicemix-cxf-se-wsdl-first-service-unit/src/main/resources/archetype-resources/pom.xml
servicemix/archetypes/trunk/servicemix-cxf-se-wsdl-first-service-unit/src/main/resources/archetype-resources/src/main/resources/xbean.xml
Modified:
servicemix/archetypes/trunk/servicemix-cxf-se-wsdl-first-service-unit/src/main/resources/META-INF/maven/archetype.xml
URL:
http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-cxf-se-wsdl-first-service-unit/src/main/resources/META-INF/maven/archetype.xml?rev=888254&r1=888253&r2=888254&view=diff
==============================================================================
---
servicemix/archetypes/trunk/servicemix-cxf-se-wsdl-first-service-unit/src/main/resources/META-INF/maven/archetype.xml
(original)
+++
servicemix/archetypes/trunk/servicemix-cxf-se-wsdl-first-service-unit/src/main/resources/META-INF/maven/archetype.xml
Tue Dec 8 04:34:13 2009
@@ -20,7 +20,7 @@
<archetype>
<id>servicemix-cxf-se-service-unit</id>
<sources>
-
<source>src/main/java/org/apache/servicemix/samples/wsdl_first/PersonImpl.java</source>
+ <source>src/main/java/PersonImpl.java</source>
</sources>
<resources>
<resource>src/main/resources/xbean.xml</resource>
Modified:
servicemix/archetypes/trunk/servicemix-cxf-se-wsdl-first-service-unit/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-cxf-se-wsdl-first-service-unit/src/main/resources/archetype-resources/pom.xml?rev=888254&r1=888253&r2=888254&view=diff
==============================================================================
---
servicemix/archetypes/trunk/servicemix-cxf-se-wsdl-first-service-unit/src/main/resources/archetype-resources/pom.xml
(original)
+++
servicemix/archetypes/trunk/servicemix-cxf-se-wsdl-first-service-unit/src/main/resources/archetype-resources/pom.xml
Tue Dec 8 04:34:13 2009
@@ -80,15 +80,18 @@
<execution>
<phase>generate-sources</phase>
<configuration>
- <sourceRoot>./target/jaxws</sourceRoot>
- <wsdlOptions>
- <wsdlOption>
- <wsdl>./src/main/resources/person.wsdl</wsdl>
- <extraargs>
- <extraarg>-verbose</extraarg>
- </extraargs>
- </wsdlOption>
- </wsdlOptions>
+ <sourceRoot>\${basedir}/src/main/java</sourceRoot>
+ <wsdlOptions>
+ <wsdlOption>
+ <!-- Update wsdl tag with appropriate wsdl
file -->
+
<wsdl>\${basedir}/src/main/resources/person.wsdl</wsdl>
+ <extraargs>
+ <extraarg>-verbose</extraarg>
+ </extraargs>
+ </wsdlOption>
+
+ </wsdlOptions>
+
</configuration>
<goals>
<goal>wsdl2java</goal>
Copied:
servicemix/archetypes/trunk/servicemix-cxf-se-wsdl-first-service-unit/src/main/resources/archetype-resources/src/main/java/PersonImpl.java
(from r888237,
servicemix/archetypes/trunk/servicemix-cxf-se-wsdl-first-service-unit/src/main/resources/archetype-resources/src/main/java/org/apache/servicemix/samples/wsdl_first/PersonImpl.java)
URL:
http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-cxf-se-wsdl-first-service-unit/src/main/resources/archetype-resources/src/main/java/PersonImpl.java?p2=servicemix/archetypes/trunk/servicemix-cxf-se-wsdl-first-service-unit/src/main/resources/archetype-resources/src/main/java/PersonImpl.java&p1=servicemix/archetypes/trunk/servicemix-cxf-se-wsdl-first-service-unit/src/main/resources/archetype-resources/src/main/java/org/apache/servicemix/samples/wsdl_first/PersonImpl.java&r1=888237&r2=888254&rev=888254&view=diff
==============================================================================
---
servicemix/archetypes/trunk/servicemix-cxf-se-wsdl-first-service-unit/src/main/resources/archetype-resources/src/main/java/org/apache/servicemix/samples/wsdl_first/PersonImpl.java
(original)
+++
servicemix/archetypes/trunk/servicemix-cxf-se-wsdl-first-service-unit/src/main/resources/archetype-resources/src/main/java/PersonImpl.java
Tue Dec 8 04:34:13 2009
@@ -14,15 +14,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.samples.wsdl_first;
+package ${packageName};
import javax.jws.WebService;
import javax.xml.ws.Holder;
-
+import org.apache.servicemix.samples.wsdl_first.Person;
+import org.apache.servicemix.samples.wsdl_first.UnknownPersonFault;
import org.apache.servicemix.samples.wsdl_first.types.GetPerson;
import org.apache.servicemix.samples.wsdl_first.types.GetPersonResponse;
@WebService(serviceName = "PersonService", targetNamespace =
"http://servicemix.apache.org/samples/wsdl-first";, endpointInterface =
"org.apache.servicemix.samples.wsdl_first.Person")
+
public class PersonImpl implements Person {
public void getPerson(Holder<String> personId, Holder<String> ssn,
Holder<String> name)
@@ -31,7 +33,7 @@
if (personId.value == null || personId.value.length() == 0) {
org.apache.servicemix.samples.wsdl_first.types.UnknownPersonFault
fault = new org.apache.servicemix.samples.wsdl_first.types.UnknownPersonFault();
fault.setPersonId(personId.value);
- throw new UnknownPersonFault(null, fault);
+ throw new UnknownPersonFault(null,fault);
}
name.value = "Guillaume";
ssn.value = "000-000-0000";
Modified:
servicemix/archetypes/trunk/servicemix-cxf-se-wsdl-first-service-unit/src/main/resources/archetype-resources/src/main/resources/xbean.xml
URL:
http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-cxf-se-wsdl-first-service-unit/src/main/resources/archetype-resources/src/main/resources/xbean.xml?rev=888254&r1=888253&r2=888254&view=diff
==============================================================================
---
servicemix/archetypes/trunk/servicemix-cxf-se-wsdl-first-service-unit/src/main/resources/archetype-resources/src/main/resources/xbean.xml
(original)
+++
servicemix/archetypes/trunk/servicemix-cxf-se-wsdl-first-service-unit/src/main/resources/archetype-resources/src/main/resources/xbean.xml
Tue Dec 8 04:34:13 2009
@@ -25,7 +25,7 @@
<cxfse:endpoint>
<cxfse:pojo>
- <bean class="org.apache.servicemix.samples.wsdl_first.PersonImpl" />
+ <bean class="${packageName}.PersonImpl" />
</cxfse:pojo>
</cxfse:endpoint>
