Author: dkulp
Date: Tue Aug 30 01:20:09 2011
New Revision: 1163065
URL: http://svn.apache.org/viewvc?rev=1163065&view=rev
Log:
Merged revisions 1162894 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1162894 | dkulp | 2011-08-29 12:38:48 -0400 (Mon, 29 Aug 2011) | 1 line
Fix checkstyle errors
........
Added:
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/src/org/
- copied from r1162894,
cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/src/org/
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/src/org/apache/
- copied from r1162894,
cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/src/org/apache/
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/src/org/apache/cxf/
- copied from r1162894,
cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/src/org/apache/cxf/
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/src/org/apache/cxf/alarm_retrieval/
- copied from r1162894,
cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/src/org/apache/cxf/alarm_retrieval/
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/src/org/apache/cxf/alarm_retrieval/client/
- copied from r1162894,
cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/src/org/apache/cxf/alarm_retrieval/client/
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/src/org/apache/cxf/alarm_retrieval/client/AsyncAlarmHandler.java
- copied unchanged from r1162894,
cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/src/org/apache/cxf/alarm_retrieval/client/AsyncAlarmHandler.java
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/src/org/apache/cxf/alarm_retrieval/client/Client.java
- copied unchanged from r1162894,
cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/src/org/apache/cxf/alarm_retrieval/client/Client.java
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/src/org/apache/cxf/alarm_retrieval/server/
- copied from r1162894,
cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/src/org/apache/cxf/alarm_retrieval/server/
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/src/org/apache/cxf/alarm_retrieval/server/AlarmRetrievalImpl.java
- copied unchanged from r1162894,
cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/src/org/apache/cxf/alarm_retrieval/server/AlarmRetrievalImpl.java
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/src/org/apache/cxf/alarm_retrieval/server/Server.java
- copied unchanged from r1162894,
cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/src/org/apache/cxf/alarm_retrieval/server/Server.java
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/logbrowser/src/demo/service/CustomerService.java
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/src/demo/client/AsyncAlarmHandler.java
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/src/demo/client/Client.java
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/src/demo/server/AlarmRetrievalImpl.java
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/src/demo/server/Server.java
Propchange: cxf/branches/2.4.x-fixes/
('svn:mergeinfo' removed)
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/logbrowser/src/demo/service/CustomerService.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/logbrowser/src/demo/service/CustomerService.java?rev=1163065&r1=1163064&r2=1163065&view=diff
==============================================================================
---
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/logbrowser/src/demo/service/CustomerService.java
(original)
+++
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/logbrowser/src/demo/service/CustomerService.java
Tue Aug 30 01:20:09 2011
@@ -21,8 +21,8 @@ package demo.service;
import java.util.HashMap;
import java.util.Map;
+import java.util.logging.Level;
import java.util.logging.Logger;
-import static java.util.logging.Level.*;
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
import javax.ws.rs.GET;
@@ -49,12 +49,12 @@ public class CustomerService {
Validate.notNull(id);
Validate.notEmpty(id);
- LOGGER.log(FINE, "Invoking getCustomer, id={0}", id);
+ LOGGER.log(Level.FINE, "Invoking getCustomer, id={0}", id);
Customer customer = customers.get(Long.parseLong(id));
if (customer == null) {
- LOGGER.log(SEVERE, "Specified customer does not exist, id={0}",
id);
+ LOGGER.log(Level.SEVERE, "Specified customer does not exist,
id={0}", id);
}
return customer;
@@ -65,17 +65,17 @@ public class CustomerService {
public Response updateCustomer(final Customer customer) {
Validate.notNull(customer);
- LOGGER.log(FINE, "Invoking updateCustomer, customer={0}", customer);
+ LOGGER.log(Level.FINE, "Invoking updateCustomer, customer={0}",
customer);
if (isCustomerExists(customer)) {
- LOGGER.log(FINE, "Specified customer exists, update data,
customer={0}", customer);
+ LOGGER.log(Level.FINE, "Specified customer exists, update data,
customer={0}", customer);
} else {
- LOGGER.log(WARNING, "Specified customer does not exist, add data,
customer={0}", customer);
+ LOGGER.log(Level.WARNING, "Specified customer does not exist, add
data, customer={0}", customer);
}
customers.put(customer.getId(), customer);
- LOGGER.log(INFO, "Customer was updated successful, customer={0}",
customer);
+ LOGGER.log(Level.INFO, "Customer was updated successful,
customer={0}", customer);
return Response.ok().build();
}
@@ -85,19 +85,19 @@ public class CustomerService {
Validate.notNull(id);
Validate.notEmpty(id);
- LOGGER.log(FINE, "Invoking deleteCustomer, id={0}", id);
+ LOGGER.log(Level.FINE, "Invoking deleteCustomer, id={0}", id);
long identifier = Long.parseLong(id);
Response response;
if (isCustomerExists(identifier)) {
- LOGGER.log(FINE, "Specified customer exists, remove data, id={0}",
id);
+ LOGGER.log(Level.FINE, "Specified customer exists, remove data,
id={0}", id);
customers.remove(identifier);
- LOGGER.log(INFO, "Customer was removed successful, id={0}", id);
+ LOGGER.log(Level.INFO, "Customer was removed successful, id={0}",
id);
response = Response.ok().build();
} else {
- LOGGER.log(SEVERE, "Specified customer does not exist, remove
fail, id={0}", id);
+ LOGGER.log(Level.SEVERE, "Specified customer does not exist,
remove fail, id={0}", id);
response = Response.notModified().build();
}
