Author: ningjiang
Date: Thu Nov 26 02:48:46 2009
New Revision: 884376
URL: http://svn.apache.org/viewvc?rev=884376&view=rev
Log:
Fixed the CS errors
Modified:
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
camel/trunk/components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrProducer.java
camel/trunk/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthTestBase.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
Modified:
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java?rev=884376&r1=884375&r2=884376&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
(original)
+++
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
Thu Nov 26 02:48:46 2009
@@ -40,7 +40,6 @@
import org.apache.commons.logging.LogFactory;
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
-import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.common.classloader.ClassLoaderUtils;
import org.apache.cxf.common.util.ClassHelper;
import org.apache.cxf.endpoint.Client;
Modified:
camel/trunk/components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrProducer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrProducer.java?rev=884376&r1=884375&r2=884376&view=diff
==============================================================================
---
camel/trunk/components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrProducer.java
(original)
+++
camel/trunk/components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrProducer.java
Thu Nov 26 02:48:46 2009
@@ -63,7 +63,7 @@
}
private Node findOrCreateNode(Node parent, String path)
- throws RepositoryException {
+ throws RepositoryException {
Node result = parent;
for (String component : path.split("/")) {
component = Text.escapeIllegalJcrChars(component);
Modified:
camel/trunk/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthTestBase.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthTestBase.java?rev=884376&r1=884375&r2=884376&view=diff
==============================================================================
---
camel/trunk/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthTestBase.java
(original)
+++
camel/trunk/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthTestBase.java
Thu Nov 26 02:48:46 2009
@@ -50,8 +50,8 @@
private Repository repository;
private void clean() throws IOException {
- File[] files = { new File("target/repository_with_auth"),
- new File("derby.log") };
+ File[] files = {new File("target/repository_with_auth"),
+ new File("derby.log") };
for (File file : files) {
if (file.exists()) {
FileUtil.delete(file);
@@ -64,8 +64,9 @@
Context context = super.createJndiContext();
File config = new File(CONFIG_FILE);
- if (!config.exists())
+ if (!config.exists()) {
throw new Exception("missing config file: " + config.getPath());
+ }
repository = new TransientRepository(CONFIG_FILE,
"target/repository_with_auth");
@@ -74,9 +75,9 @@
.login(new SimpleCredentials("admin", "admin".toCharArray()));
UserManager userManager = session.getUserManager();
User user = (User) userManager.getAuthorizable("test");
- if (user == null)
+ if (user == null) {
user = userManager.createUser("test", "quatloos");
-
+ }
// set up permissions
String permissionsPath = session.getRootNode().getPath();
AccessControlManager accessControlManager = session
Modified:
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java?rev=884376&r1=884375&r2=884376&view=diff
==============================================================================
---
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
(original)
+++
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
Thu Nov 26 02:48:46 2009
@@ -32,7 +32,6 @@
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.ErrorHandlerBuilderRef;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.spring.PatternBasedPackageScanFilter;
import org.apache.camel.management.DefaultManagementAgent;
import org.apache.camel.management.DefaultManagementLifecycleStrategy;
import org.apache.camel.management.DefaultManagementStrategy;