Author: bimargulies
Date: Mon Aug 30 23:39:47 2010
New Revision: 991029
URL: http://svn.apache.org/viewvc?rev=991029&view=rev
Log:
Fix package names and add license notices.
Added:
cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_jms/src/main/java/demo/
- copied from r991023,
cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_jms/src/main/java/test/
Removed:
cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_jms/src/main/java/test/
Modified:
cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_jms/pom.xml
cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_jms/src/main/java/demo/client/ClientHTTP.java
cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_jms/src/main/java/demo/client/ClientJMS.java
cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_jms/src/main/java/demo/server/ServerHTTP.java
cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_jms/src/main/java/demo/server/ServerJMS.java
cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_jms/src/main/java/demo/service/HelloWorld.java
cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_jms/src/main/java/demo/service/impl/HelloWorldImpl.java
cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_jms/src/main/resources/cxf.xml
Modified:
cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_jms/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_jms/pom.xml?rev=991029&r1=991028&r2=991029&view=diff
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_jms/pom.xml
(original)
+++
cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_jms/pom.xml
Mon Aug 30 23:39:47 2010
@@ -17,21 +17,24 @@
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>java_first_jaxws_jms</artifactId>
- <name>Java First demo using JAX-WS and JMS</name>
- <parent>
- <groupId>org.apache.cxf.samples</groupId>
- <artifactId>cxf-samples</artifactId>
- <version>2.3.0-SNAPSHOT</version>
- </parent>
- <properties>
- <cxf.version>${project.version}</cxf.version>
- </properties>
+<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>java_first_jaxws_jms</artifactId>
+ <name>Java First demo using JAX-WS and JMS</name>
+ <parent>
+ <groupId>org.apache.cxf.samples</groupId>
+ <artifactId>cxf-samples</artifactId>
+ <version>2.3.0-SNAPSHOT</version>
+ </parent>
+
+ <properties>
+ <cxf.version>${project.version}</cxf.version>
+ </properties>
<build>
- <sourceDirectory>src</sourceDirectory>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
@@ -58,7 +61,7 @@
<goal>java</goal>
</goals>
<configuration>
-
<mainClass>demo.hw.server.Server</mainClass>
+
<mainClass>demo.server.ServerJMS</mainClass>
</configuration>
</execution>
</executions>
@@ -81,7 +84,7 @@
<goal>java</goal>
</goals>
<configuration>
-
<mainClass>demo.hw.client.Client</mainClass>
+
<mainClass>demo.client.ClientJMS</mainClass>
</configuration>
</execution>
</executions>
@@ -90,12 +93,14 @@
</build>
</profile>
</profiles>
- <dependencies>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>5.4.0</version>
- </dependency>
+
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-core</artifactId>
+ <version>5.4.0</version>
+ </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
@@ -111,5 +116,5 @@
<artifactId>cxf-rt-transports-jms</artifactId>
<version>${cxf.version}</version>
</dependency>
- </dependencies>
+ </dependencies>
</project>
Modified:
cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_jms/src/main/java/demo/client/ClientHTTP.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_jms/src/main/java/demo/client/ClientHTTP.java?rev=991029&r1=991023&r2=991029&view=diff
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_jms/src/main/java/demo/client/ClientHTTP.java
(original)
+++
cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_jms/src/main/java/demo/client/ClientHTTP.java
Mon Aug 30 23:39:47 2010
@@ -17,7 +17,7 @@
* under the License.
*/
-package test.client;
+package demo.client;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -25,7 +25,7 @@ import java.util.logging.Logger;
import org.apache.cxf.interceptor.LoggingInInterceptor;
import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
-import test.service.HelloWorld;
+import demo.service.HelloWorld;
public final class ClientHTTP {
Modified:
cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_jms/src/main/java/demo/client/ClientJMS.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_jms/src/main/java/demo/client/ClientJMS.java?rev=991029&r1=991023&r2=991029&view=diff
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_jms/src/main/java/demo/client/ClientJMS.java
(original)
+++
cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_jms/src/main/java/demo/client/ClientJMS.java
Mon Aug 30 23:39:47 2010
@@ -17,12 +17,12 @@
* under the License.
*/
-package test.client;
+package demo.client;
import org.apache.cxf.interceptor.LoggingInInterceptor;
import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
-import test.service.HelloWorld;
+import demo.service.HelloWorld;
public final class ClientJMS {
Modified:
cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_jms/src/main/java/demo/server/ServerHTTP.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_jms/src/main/java/demo/server/ServerHTTP.java?rev=991029&r1=991023&r2=991029&view=diff
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_jms/src/main/java/demo/server/ServerHTTP.java
(original)
+++
cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_jms/src/main/java/demo/server/ServerHTTP.java
Mon Aug 30 23:39:47 2010
@@ -17,13 +17,13 @@
* under the License.
*/
-package test.server;
+package demo.server;
import org.apache.cxf.interceptor.LoggingInInterceptor;
import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
-import test.service.HelloWorld;
-import test.service.impl.HelloWorldImpl;
+import demo.service.HelloWorld;
+import demo.service.impl.HelloWorldImpl;
public class ServerHTTP {
Modified:
cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_jms/src/main/java/demo/server/ServerJMS.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_jms/src/main/java/demo/server/ServerJMS.java?rev=991029&r1=991023&r2=991029&view=diff
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_jms/src/main/java/demo/server/ServerJMS.java
(original)
+++
cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_jms/src/main/java/demo/server/ServerJMS.java
Mon Aug 30 23:39:47 2010
@@ -17,13 +17,13 @@
* under the License.
*/
-package test.server;
+package demo.server;
import org.apache.cxf.interceptor.LoggingInInterceptor;
import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
-import test.service.HelloWorld;
-import test.service.impl.HelloWorldImpl;
+import demo.service.HelloWorld;
+import demo.service.impl.HelloWorldImpl;
public class ServerJMS {
Modified:
cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_jms/src/main/java/demo/service/HelloWorld.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_jms/src/main/java/demo/service/HelloWorld.java?rev=991029&r1=991023&r2=991029&view=diff
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_jms/src/main/java/demo/service/HelloWorld.java
(original)
+++
cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_jms/src/main/java/demo/service/HelloWorld.java
Mon Aug 30 23:39:47 2010
@@ -1,4 +1,22 @@
-package test.service;
+/**
+ * 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 demo.service;
import javax.jws.WebMethod;
import javax.jws.WebParam;
Modified:
cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_jms/src/main/java/demo/service/impl/HelloWorldImpl.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_jms/src/main/java/demo/service/impl/HelloWorldImpl.java?rev=991029&r1=991023&r2=991029&view=diff
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_jms/src/main/java/demo/service/impl/HelloWorldImpl.java
(original)
+++
cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_jms/src/main/java/demo/service/impl/HelloWorldImpl.java
Mon Aug 30 23:39:47 2010
@@ -1,8 +1,26 @@
-package test.service.impl;
+/**
+ * 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 demo.service.impl;
import javax.jws.WebService;
-import test.service.HelloWorld;
+import demo.service.HelloWorld;
@WebService
public class HelloWorldImpl implements HelloWorld {
Modified:
cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_jms/src/main/resources/cxf.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_jms/src/main/resources/cxf.xml?rev=991029&r1=991028&r2=991029&view=diff
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_jms/src/main/resources/cxf.xml
(original)
+++
cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_jms/src/main/resources/cxf.xml
Mon Aug 30 23:39:47 2010
@@ -14,7 +14,6 @@
<import resource="classpath:META-INF/cxf/cxf.xml" />
<import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
- <import resource="classpath:META-INF/cxf/cxf-extension-local.xml" />
<import resource="classpath:META-INF/cxf/cxf-extension-http.xml" />
<import resource="classpath:META-INF/cxf/cxf-servlet.xml" />
<import resource="classpath:META-INF/cxf/cxf-extension-jms.xml" />
