You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2012/03/23 16:15:10 UTC
svn commit: r1304412 - in
/cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world:
./ src/corba/client/ src/corba/server/ src/cxf/client/ src/cxf/server/
src/main/ src/main/idl/ src/main/java/ src/main/java/corba/ src/main/jav...
Author: dkulp
Date: Fri Mar 23 15:15:09 2012
New Revision: 1304412
URL: http://svn.apache.org/viewvc?rev=1304412&view=rev
Log:
Merged revisions 1303124 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1303124 | dkulp | 2012-03-20 16:09:21 -0400 (Tue, 20 Mar 2012) | 2 lines
Update corba/hello-world sample to maven
........
Added:
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/pom.xml (with props)
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/main/
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/main/idl/
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/main/idl/HelloWorld.idl
- copied, changed from r1304411, cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/corba/server/HelloWorldImpl.java
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/main/java/
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/main/java/corba/
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/main/java/corba/client/
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/main/java/corba/client/Client.java (contents, props changed)
- copied, changed from r1304411, cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/corba/client/Client.java
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/main/java/corba/server/
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/main/java/corba/server/HelloWorldImpl.java (contents, props changed)
- copied, changed from r1304411, cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/corba/server/HelloWorldImpl.java
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/main/java/corba/server/Server.java (contents, props changed)
- copied, changed from r1304411, cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/corba/server/Server.java
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/main/java/cxf/
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/main/java/cxf/client/
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/main/java/cxf/client/Client.java (contents, props changed)
- copied, changed from r1304411, cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/cxf/client/Client.java
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/main/java/cxf/server/
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/main/java/cxf/server/HelloWorldImpl.java (contents, props changed)
- copied, changed from r1304411, cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/cxf/server/HelloWorldImpl.java
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/main/java/cxf/server/Server.java (contents, props changed)
- copied, changed from r1304411, cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/cxf/server/Server.java
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/main/resources/
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/main/resources/wsdl/
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/main/resources/wsdl/HelloWorld.wsdl (with props)
Removed:
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/build.xml
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/corba/client/Client.java
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/corba/server/HelloWorldImpl.java
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/corba/server/Server.java
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/cxf/client/Client.java
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/cxf/server/HelloWorldImpl.java
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/cxf/server/Server.java
Added: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/pom.xml?rev=1304412&view=auto
==============================================================================
--- cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/pom.xml (added)
+++ cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/pom.xml Fri Mar 23 15:15:09 2012
@@ -0,0 +1,280 @@
+<!--
+ 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.cxf.samples</groupId>
+ <artifactId>corba-hello-world</artifactId>
+ <packaging>jar</packaging>
+
+ <name>hello-world sample using JAX-WS API's to talk via CORBA/IIOP</name>
+ <description>hello-world sample using JAX-WS API's to talk via CORBA/IIOP</description>
+ <version>2.6.0-SNAPSHOT</version>
+
+ <parent>
+ <groupId>org.apache.cxf.samples</groupId>
+ <artifactId>cxf-samples</artifactId>
+ <version>2.6.0-SNAPSHOT</version>
+ <relativePath>../..</relativePath>
+ </parent>
+ <properties>
+ <cxf.version>${project.version}</cxf.version>
+ <cxf.release.base>${basedir}/../../..</cxf.release.base>
+ </properties>
+ <build>
+ <defaultGoal>install</defaultGoal>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-corbatools-maven-plugin</artifactId>
+ <version>${project.version}</version>
+ <executions>
+ <execution>
+ <id>generate-sources</id>
+ <phase>generate-sources</phase>
+ <configuration>
+ <outputDir>target/generated-wsdl/wsdl</outputDir>
+ <wsdltoidlOptions>
+ <option>
+ <wsdl>src/main/resources/wsdl/HelloWorld.wsdl</wsdl>
+ <extraargs>
+ <arg>-a</arg>
+ <arg>corbaname::localhost:1050#HelloWorld</arg>
+ </extraargs>
+ </option>
+ </wsdltoidlOptions>
+ </configuration>
+ <goals>
+ <goal>wsdl2idl</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-codegen-plugin</artifactId>
+ <version>${project.version}</version>
+ <executions>
+ <execution>
+ <id>generate-sources</id>
+ <phase>generate-sources</phase>
+ <configuration>
+ <wsdlOptions>
+ <wsdlOption>
+ <wsdl>target/generated-wsdl/wsdl/HelloWorld-corba.wsdl</wsdl>
+ <packagenames>
+ <package>cxf.common</package>
+ </packagenames>
+ </wsdlOption>
+ </wsdlOptions>
+ </configuration>
+ <goals>
+ <goal>wsdl2java</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.7</version>
+ <executions>
+ <execution>
+ <id>add-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-resource</goal>
+ </goals>
+ <configuration>
+ <resources>
+ <resource>
+ <directory>target/generated-wsdl</directory>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>idlj-maven-plugin</artifactId>
+ <version>1.1</version>
+ <executions>
+ <execution>
+ <id>generate-sources-from-idl</id>
+ <phase>generate-sources</phase>
+ <configuration>
+ <sources>
+ <source>
+ <packagePrefixes>
+ <packagePrefix>
+ <type>HelloWorld</type>
+ <prefix>corba.common</prefix>
+ </packagePrefix>
+ </packagePrefixes>
+ <compatible>false</compatible>
+ </source>
+ </sources>
+ </configuration>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <profiles>
+ <profile>
+ <id>cxf.server</id>
+ <build>
+ <defaultGoal>test</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>test</phase>
+ <goals>
+ <goal>java</goal>
+ </goals>
+ <configuration>
+ <mainClass>cxf.server.Server</mainClass>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>cxf.client</id>
+ <build>
+ <defaultGoal>test</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>test</phase>
+ <goals>
+ <goal>java</goal>
+ </goals>
+ <configuration>
+ <mainClass>cxf.client.Client</mainClass>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>corba.server</id>
+ <build>
+ <defaultGoal>test</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>test</phase>
+ <goals>
+ <goal>java</goal>
+ </goals>
+ <configuration>
+ <mainClass>corba.server.Server</mainClass>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>corba.client</id>
+ <build>
+ <defaultGoal>test</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>test</phase>
+ <goals>
+ <goal>java</goal>
+ </goals>
+ <configuration>
+ <mainClass>corba.client.Client</mainClass>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxws</artifactId>
+ <version>2.6.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-bindings-corba</artifactId>
+ <version>2.6.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-tools-common</artifactId>
+ <version>2.6.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>3.0.6.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.7</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+</project>
Propchange: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/pom.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Copied: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/main/idl/HelloWorld.idl (from r1304411, cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/corba/server/HelloWorldImpl.java)
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/main/idl/HelloWorld.idl?p2=cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/main/idl/HelloWorld.idl&p1=cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/corba/server/HelloWorldImpl.java&r1=1304411&r2=1304412&rev=1304412&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/corba/server/HelloWorldImpl.java (original)
+++ cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/main/idl/HelloWorld.idl Fri Mar 23 15:15:09 2012
@@ -1,40 +1,25 @@
-/**
- * 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 corba.server;
-
-import org.omg.PortableServer.POA;
-
-public class HelloWorldImpl extends HelloWorldPOA {
- // The servants default POA
- private POA poa;
-
- HelloWorldImpl(POA p) {
- poa = p;
- }
-
- public String greetMe(String inparameter) {
- System.out.println("In greetMe(" + inparameter + ")");
- return "Hi " + inparameter;
- }
-
- public POA _default_POA() {
- return poa;
- }
-}
+/*
+ * 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.
+*/
+
+interface HelloWorld {
+ string
+ greetMe(
+ in string return_message
+ );
+};
Copied: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/main/java/corba/client/Client.java (from r1304411, cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/corba/client/Client.java)
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/main/java/corba/client/Client.java?p2=cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/main/java/corba/client/Client.java&p1=cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/corba/client/Client.java&r1=1304411&r2=1304412&rev=1304412&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/corba/client/Client.java (original)
+++ cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/main/java/corba/client/Client.java Fri Mar 23 15:15:09 2012
@@ -24,6 +24,9 @@ import java.util.Properties;
import org.omg.CORBA.ORB;
import org.omg.CORBA.UserException;
+import corba.common.HelloWorld;
+import corba.common.HelloWorldHelper;
+
public final class Client {
private Client() {
//not consructed
Propchange: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/main/java/corba/client/Client.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/main/java/corba/client/Client.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/main/java/corba/server/HelloWorldImpl.java (from r1304411, cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/corba/server/HelloWorldImpl.java)
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/main/java/corba/server/HelloWorldImpl.java?p2=cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/main/java/corba/server/HelloWorldImpl.java&p1=cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/corba/server/HelloWorldImpl.java&r1=1304411&r2=1304412&rev=1304412&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/corba/server/HelloWorldImpl.java (original)
+++ cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/main/java/corba/server/HelloWorldImpl.java Fri Mar 23 15:15:09 2012
@@ -21,6 +21,8 @@ package corba.server;
import org.omg.PortableServer.POA;
+import corba.common.HelloWorldPOA;
+
public class HelloWorldImpl extends HelloWorldPOA {
// The servants default POA
private POA poa;
Propchange: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/main/java/corba/server/HelloWorldImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/main/java/corba/server/HelloWorldImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/main/java/corba/server/Server.java (from r1304411, cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/corba/server/Server.java)
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/main/java/corba/server/Server.java?p2=cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/main/java/corba/server/Server.java&p1=cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/corba/server/Server.java&r1=1304411&r2=1304412&rev=1304412&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/corba/server/Server.java (original)
+++ cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/main/java/corba/server/Server.java Fri Mar 23 15:15:09 2012
@@ -30,6 +30,8 @@ import org.omg.PortableServer.POA;
import org.omg.PortableServer.POAHelper;
import org.omg.PortableServer.POAManager;
+import corba.common.HelloWorldHelper;
+
public final class Server {
private Server() {
Propchange: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/main/java/corba/server/Server.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/main/java/corba/server/Server.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/main/java/cxf/client/Client.java (from r1304411, cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/cxf/client/Client.java)
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/main/java/cxf/client/Client.java?p2=cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/main/java/cxf/client/Client.java&p1=cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/cxf/client/Client.java&r1=1304411&r2=1304412&rev=1304412&view=diff
==============================================================================
(empty)
Propchange: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/main/java/cxf/client/Client.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/main/java/cxf/client/Client.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/main/java/cxf/server/HelloWorldImpl.java (from r1304411, cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/cxf/server/HelloWorldImpl.java)
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/main/java/cxf/server/HelloWorldImpl.java?p2=cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/main/java/cxf/server/HelloWorldImpl.java&p1=cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/cxf/server/HelloWorldImpl.java&r1=1304411&r2=1304412&rev=1304412&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/cxf/server/HelloWorldImpl.java (original)
+++ cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/main/java/cxf/server/HelloWorldImpl.java Fri Mar 23 15:15:09 2012
@@ -23,7 +23,7 @@ import cxf.common.HelloWorld;
@javax.jws.WebService(portName = "HelloWorldCORBAPort", serviceName = "HelloWorldCORBAService",
targetNamespace = "http://cxf.apache.org/schemas/cxf/idl/HelloWorld",
- wsdlLocation = "file:./build/HelloWorld-corba.wsdl",
+ wsdlLocation = "classpath:/wsdl/HelloWorld-corba.wsdl",
endpointInterface = "cxf.common.HelloWorld")
public class HelloWorldImpl implements HelloWorld {
Propchange: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/main/java/cxf/server/HelloWorldImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/main/java/cxf/server/HelloWorldImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/main/java/cxf/server/Server.java (from r1304411, cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/cxf/server/Server.java)
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/main/java/cxf/server/Server.java?p2=cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/main/java/cxf/server/Server.java&p1=cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/cxf/server/Server.java&r1=1304411&r2=1304412&rev=1304412&view=diff
==============================================================================
(empty)
Propchange: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/main/java/cxf/server/Server.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/main/java/cxf/server/Server.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/main/resources/wsdl/HelloWorld.wsdl
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/main/resources/wsdl/HelloWorld.wsdl?rev=1304412&view=auto
==============================================================================
--- cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/main/resources/wsdl/HelloWorld.wsdl (added)
+++ cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/main/resources/wsdl/HelloWorld.wsdl Fri Mar 23 15:15:09 2012
@@ -0,0 +1,48 @@
+<?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.
+-->
+<wsdl:definitions targetNamespace="http://cxf.apache.org/schemas/cxf/idl/HelloWorld"
+ xmlns:tns="http://cxf.apache.org/schemas/cxf/idl/HelloWorld"
+ xmlns:ns1="http://cxf.apache.org/schemas/cxf/idl/HelloWorld/corba/typemap/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+ <wsdl:types>
+ <xs:schema attributeFormDefault="unqualified"
+ elementFormDefault="unqualified"
+ targetNamespace="http://cxf.apache.org/schemas/cxf/idl/HelloWorld"
+ xmlns="http://cxf.apache.org/schemas/cxf/idl/HelloWorld"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <xs:element name="greetMeResponse" type="xs:string"/>
+ <xs:element name="greetMe" type="xs:string"/>
+ </xs:schema>
+ </wsdl:types>
+ <wsdl:message name="greetMeResponse">
+ <wsdl:part name="outparameter" element="tns:greetMeResponse"/>
+ </wsdl:message>
+ <wsdl:message name="greetMe">
+ <wsdl:part name="inparameter" element="tns:greetMe"/>
+ </wsdl:message>
+ <wsdl:portType name="HelloWorld">
+ <wsdl:operation name="greetMe">
+ <wsdl:input name="greetMeRequest" message="tns:greetMe"/>
+ <wsdl:output name="greetMeResponse" message="tns:greetMeResponse"/>
+ </wsdl:operation>
+ </wsdl:portType>
+</wsdl:definitions>
\ No newline at end of file
Propchange: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/main/resources/wsdl/HelloWorld.wsdl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/main/resources/wsdl/HelloWorld.wsdl
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/main/resources/wsdl/HelloWorld.wsdl
------------------------------------------------------------------------------
svn:mime-type = text/xml