You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2014/12/23 12:52:50 UTC
[4/6] camel git commit: CAMEL-7781: Fixed CS
CAMEL-7781: Fixed CS
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d82786b9
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d82786b9
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d82786b9
Branch: refs/heads/master
Commit: d82786b904a78cd30547827fe7c934bb78e92732
Parents: 8f78b75
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Dec 23 12:38:44 2014 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Dec 23 12:38:44 2014 +0100
----------------------------------------------------------------------
.../pgevent/InvalidStateException.java | 18 +-
.../component/pgevent/PgEventComponent.java | 17 ++
.../component/pgevent/PgEventConsumer.java | 22 +-
.../component/pgevent/PgEventEndpoint.java | 120 +++++------
.../component/pgevent/PgEventProducer.java | 63 +++---
.../src/main/resources/META-INF/LICENSE.txt | 203 +++++++++++++++++++
.../src/main/resources/META-INF/NOTICE.txt | 11 +
.../services/org/apache/camel/component/pgevent | 17 ++
.../apache/camel/pgevent/IntegrationTest.java | 34 ++--
.../src/test/resources/log4j.properties | 38 +++-
10 files changed, 404 insertions(+), 139 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/d82786b9/components/camel-pgevent/src/main/java/org/apache/camel/component/pgevent/InvalidStateException.java
----------------------------------------------------------------------
diff --git a/components/camel-pgevent/src/main/java/org/apache/camel/component/pgevent/InvalidStateException.java b/components/camel-pgevent/src/main/java/org/apache/camel/component/pgevent/InvalidStateException.java
index c28a6d8..5d38e44 100644
--- a/components/camel-pgevent/src/main/java/org/apache/camel/component/pgevent/InvalidStateException.java
+++ b/components/camel-pgevent/src/main/java/org/apache/camel/component/pgevent/InvalidStateException.java
@@ -1,9 +1,10 @@
-/*
- * Copyright 2014 Apache Software Foundation.
- *
- * Licensed 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
+/**
+ * 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
*
@@ -13,13 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.component.pgevent;
-/**
- *
- * @author dphillips
- */
public class InvalidStateException extends RuntimeException {
public InvalidStateException(String message) {
http://git-wip-us.apache.org/repos/asf/camel/blob/d82786b9/components/camel-pgevent/src/main/java/org/apache/camel/component/pgevent/PgEventComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-pgevent/src/main/java/org/apache/camel/component/pgevent/PgEventComponent.java b/components/camel-pgevent/src/main/java/org/apache/camel/component/pgevent/PgEventComponent.java
index 7a9f48f..98b5525 100644
--- a/components/camel-pgevent/src/main/java/org/apache/camel/component/pgevent/PgEventComponent.java
+++ b/components/camel-pgevent/src/main/java/org/apache/camel/component/pgevent/PgEventComponent.java
@@ -1,6 +1,23 @@
+/**
+ * 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 org.apache.camel.component.pgevent;
import java.util.Map;
+
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
import org.apache.camel.impl.UriEndpointComponent;
http://git-wip-us.apache.org/repos/asf/camel/blob/d82786b9/components/camel-pgevent/src/main/java/org/apache/camel/component/pgevent/PgEventConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-pgevent/src/main/java/org/apache/camel/component/pgevent/PgEventConsumer.java b/components/camel-pgevent/src/main/java/org/apache/camel/component/pgevent/PgEventConsumer.java
index 48d14e3..ed93807 100644
--- a/components/camel-pgevent/src/main/java/org/apache/camel/component/pgevent/PgEventConsumer.java
+++ b/components/camel-pgevent/src/main/java/org/apache/camel/component/pgevent/PgEventConsumer.java
@@ -1,3 +1,19 @@
+/**
+ * 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 org.apache.camel.component.pgevent;
import com.impossibl.postgres.api.jdbc.PGConnection;
@@ -25,9 +41,9 @@ public class PgEventConsumer extends DefaultConsumer implements PGNotificationLi
@Override
protected void doStart() throws Exception {
super.doStart();
-
+
dbConnection = endpoint.initJdbc();
- dbConnection.createStatement().execute("LISTEN "+endpoint.getChannel());
+ dbConnection.createStatement().execute("LISTEN " + endpoint.getChannel());
dbConnection.addNotificationListener(endpoint.getChannel(), endpoint.getChannel(), this);
}
@@ -41,7 +57,7 @@ public class PgEventConsumer extends DefaultConsumer implements PGNotificationLi
try {
getProcessor().process(outOnly);
} catch (Exception ex) {
- LOG.error("Unable to process incoming notification from PostgreSQL: processId='"+processId+"', channel='"+channel+"', payload='"+payload+"'", ex);
+ LOG.error("Unable to process incoming notification from PostgreSQL: processId='" + processId + "', channel='" + channel + "', payload='" + payload + "'", ex);
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d82786b9/components/camel-pgevent/src/main/java/org/apache/camel/component/pgevent/PgEventEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-pgevent/src/main/java/org/apache/camel/component/pgevent/PgEventEndpoint.java b/components/camel-pgevent/src/main/java/org/apache/camel/component/pgevent/PgEventEndpoint.java
index b17a43b..6a0e0eb 100644
--- a/components/camel-pgevent/src/main/java/org/apache/camel/component/pgevent/PgEventEndpoint.java
+++ b/components/camel-pgevent/src/main/java/org/apache/camel/component/pgevent/PgEventEndpoint.java
@@ -1,14 +1,29 @@
+/**
+ * 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 org.apache.camel.component.pgevent;
-import com.impossibl.postgres.api.jdbc.PGConnection;
-import com.impossibl.postgres.jdbc.PGDataSource;
import java.io.InvalidClassException;
-import java.net.URISyntaxException;
import java.sql.DriverManager;
-import java.sql.SQLException;
import java.util.Properties;
import javax.naming.directory.InvalidAttributesException;
import javax.sql.DataSource;
+
+import com.impossibl.postgres.api.jdbc.PGConnection;
+import com.impossibl.postgres.jdbc.PGDataSource;
import org.apache.camel.Consumer;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
@@ -26,17 +41,10 @@ import org.slf4j.LoggerFactory;
public class PgEventEndpoint extends DefaultEndpoint {
private static final Logger LOG = LoggerFactory.getLogger(PgEventEndpoint.class);
- private static final String FORMAT1 =
- "^pgevent://([^:]*):(\\d+)/(\\w+)/(\\w+).*$";
-
- private static final String FORMAT2 =
- "^pgevent://([^:]+)/(\\w+)/(\\w+).*$";
-
- private static final String FORMAT3 =
- "^pgevent:///(\\w+)/(\\w+).*$";
-
- private static final String FORMAT4 =
- "^pgevent:(\\w+)/(\\w+)/(\\w+).*$";
+ private static final String FORMAT1 = "^pgevent://([^:]*):(\\d+)/(\\w+)/(\\w+).*$";
+ private static final String FORMAT2 = "^pgevent://([^:]+)/(\\w+)/(\\w+).*$";
+ private static final String FORMAT3 = "^pgevent:///(\\w+)/(\\w+).*$";
+ private static final String FORMAT4 = "^pgevent:(\\w+)/(\\w+)/(\\w+).*$";
@UriParam
private String host = "localhost";
@@ -63,26 +71,6 @@ public class PgEventEndpoint extends DefaultEndpoint {
private PGConnection dbConnection;
- public final PGConnection initJdbc() throws Exception {
- PGConnection conn;
- Properties props = new Properties();
- props.putAll(URISupport.parseQuery(uri));
- if (this.getDatasource()!=null) {
- conn = (PGConnection)this.getDatasource().getConnection();
- } else {
- Class.forName("com.impossibl.postgres.jdbc.PGDriver");
- conn = (PGConnection)DriverManager.getConnection(
- "jdbc:pgsql://"+this.getHost()+":"+this.getPort()+"/"+
- this.getDatabase(), this.getUser(), this.getPass());
- }
- return conn;
- }
-
- @Override
- protected String createEndpointUri() {
- return "pgevent";
- }
-
public PgEventEndpoint(String uri, PgEventComponent component) throws InvalidAttributesException {
super(uri, component);
this.uri = uri;
@@ -96,56 +84,55 @@ public class PgEventEndpoint extends DefaultEndpoint {
parseUri();
}
- public PgEventEndpoint(String uri) throws InvalidAttributesException {
- super(uri);
- this.uri = uri;
- parseUri();
+ public final PGConnection initJdbc() throws Exception {
+ PGConnection conn;
+ Properties props = new Properties();
+ props.putAll(URISupport.parseQuery(uri));
+ if (this.getDatasource() != null) {
+ conn = (PGConnection) this.getDatasource().getConnection();
+ } else {
+ // ensure we can load the class
+ getCamelContext().getClassResolver().resolveMandatoryClass("com.impossibl.postgres.jdbc.PGDriver");
+ conn = (PGConnection) DriverManager.getConnection("jdbc:pgsql://" + this.getHost() + ":" + this.getPort() + "/" + this.getDatabase(), this.getUser(), this.getPass());
+ }
+ return conn;
}
/**
* Parse the provided URI and extract available parameters
- *
+ *
* @throws InvalidAttributesException if there is an error in the parameters
*/
protected final void parseUri() throws InvalidAttributesException {
- LOG.info("URI: "+uri);
+ LOG.info("URI: " + uri);
if (uri.matches(FORMAT1)) {
LOG.info("FORMAT1");
- String[] parts = uri
- .replaceFirst(FORMAT1, "$1:$2:$3:$4")
- .split(":");
+ String[] parts = uri.replaceFirst(FORMAT1, "$1:$2:$3:$4").split(":");
host = parts[0];
port = Integer.parseInt(parts[1]);
database = parts[2];
channel = parts[3];
} else if (uri.matches(FORMAT2)) {
LOG.info("FORMAT2");
- String[] parts = uri
- .replaceFirst(FORMAT2, "$1:$2:$3")
- .split(":");
+ String[] parts = uri.replaceFirst(FORMAT2, "$1:$2:$3").split(":");
host = parts[0];
port = 5432;
database = parts[1];
channel = parts[2];
} else if (uri.matches(FORMAT3)) {
LOG.info("FORMAT3");
- String[] parts = uri
- .replaceFirst(FORMAT3, "$1:$2")
- .split(":");
+ String[] parts = uri.replaceFirst(FORMAT3, "$1:$2").split(":");
host = "localhost";
port = 5432;
database = parts[0];
channel = parts[1];
} else if (uri.matches(FORMAT4)) {
LOG.info("FORMAT4");
- String[] parts = uri
- .replaceFirst(FORMAT4, "$1:$2")
- .split(":");
+ String[] parts = uri.replaceFirst(FORMAT4, "$1:$2").split(":");
database = parts[0];
channel = parts[1];
} else {
- throw new InvalidAttributesException("The provided URL does not "+
- "match the acceptable patterns.");
+ throw new InvalidAttributesException("The provided URL does not match the acceptable patterns.");
}
}
@@ -156,23 +143,20 @@ public class PgEventEndpoint extends DefaultEndpoint {
}
private void validateInputs() throws InvalidClassException, InvalidAttributesException {
- if (getChannel()==null || getChannel().length()==0) {
- throw new InvalidAttributesException("A required parameter was "+
- "not set when creating this Endpoint (channel)");
+ if (getChannel() == null || getChannel().length() == 0) {
+ throw new InvalidAttributesException("A required parameter was not set when creating this Endpoint (channel)");
}
- if (datasource!=null) {
- LOG.info("******Datasource detected*****");
+ if (datasource != null) {
+ LOG.debug("******Datasource detected*****");
if (!PGDataSource.class.isInstance(datasource)) {
- throw new InvalidClassException("The datasource passed to the "+
- "pgevent component is NOT a PGDataSource class from the"+
- "pgjdbc-ng library. See: "+
- "https://github.com/impossibl/pgjdbc-ng");
+ throw new InvalidClassException("The datasource passed to the "
+ + "pgevent component is NOT a PGDataSource class from the"
+ + "pgjdbc-ng library. See: https://github.com/impossibl/pgjdbc-ng");
}
} else {
- if (user==null) {
- throw new InvalidAttributesException("A required parameter was "+
- "not set when creating this Endpoint (pgUser or "+
- "pgDataSource)");
+ if (user == null) {
+ throw new InvalidAttributesException("A required parameter was "
+ + "not set when creating this Endpoint (pgUser or pgDataSource)");
}
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d82786b9/components/camel-pgevent/src/main/java/org/apache/camel/component/pgevent/PgEventProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-pgevent/src/main/java/org/apache/camel/component/pgevent/PgEventProducer.java b/components/camel-pgevent/src/main/java/org/apache/camel/component/pgevent/PgEventProducer.java
index 9ece5ce..0b29619 100644
--- a/components/camel-pgevent/src/main/java/org/apache/camel/component/pgevent/PgEventProducer.java
+++ b/components/camel-pgevent/src/main/java/org/apache/camel/component/pgevent/PgEventProducer.java
@@ -1,9 +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 org.apache.camel.component.pgevent;
+import java.sql.SQLException;
+
import com.impossibl.postgres.api.jdbc.PGConnection;
import com.impossibl.postgres.api.jdbc.PGNotificationListener;
-import java.sql.DriverManager;
-import java.sql.SQLException;
import org.apache.camel.AsyncCallback;
import org.apache.camel.Exchange;
import org.apache.camel.impl.DefaultAsyncProducer;
@@ -22,47 +38,33 @@ public class PgEventProducer extends DefaultAsyncProducer {
public PgEventProducer(PgEventEndpoint endpoint) throws Exception {
super(endpoint);
this.endpoint = endpoint;
- dbConnection = endpoint.initJdbc();
- }
-
- protected final void initJdbc() throws ClassNotFoundException, SQLException {
- if (endpoint.getDatasource()!=null) {
- dbConnection = (PGConnection)endpoint.getDatasource().getConnection();
- } else {
- System.setProperty("pgjdbc.test.user", endpoint.getUser());
- System.setProperty("pgjdbc.test.password", endpoint.getPass());
-
- Class.forName("com.impossibl.postgres.jdbc.PGDriver");
- dbConnection = (PGConnection)DriverManager.getConnection(
- "jdbc:pgsql://"+endpoint.getHost()+":"+endpoint.getPort()+"/"+
- endpoint.getDatabase());
- }
}
@Override
public boolean process(final Exchange exchange, final AsyncCallback callback) {
-
try {
if (dbConnection.isClosed()) {
dbConnection = endpoint.initJdbc();
}
} catch (Exception e) {
- throw new InvalidStateException("Database connection closed "+
- "and could not be re-opened.", e);
+ exchange.setException(new InvalidStateException("Database connection closed and could not be re-opened.", e));
+ callback.done(true);
+ return true;
}
-
- boolean retVal;
+
try {
- dbConnection.createStatement().execute("NOTIFY "+
- endpoint.getChannel()+", '"+
- exchange.getOut().getBody(String.class)+
- "'");
- retVal = true;
+ dbConnection.createStatement().execute("NOTIFY " + endpoint.getChannel() + ", '" + exchange.getOut().getBody(String.class) + "'");
} catch (SQLException e) {
- retVal = false;
+ exchange.setException(e);
}
- callback.done(retVal);
- return retVal;
+ callback.done(true);
+ return true;
+ }
+
+ @Override
+ protected void doStart() throws Exception {
+ super.doStart();
+ dbConnection = endpoint.initJdbc();
}
@Override
@@ -71,5 +73,4 @@ public class PgEventProducer extends DefaultAsyncProducer {
dbConnection.close();
}
-
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/d82786b9/components/camel-pgevent/src/main/resources/META-INF/LICENSE.txt
----------------------------------------------------------------------
diff --git a/components/camel-pgevent/src/main/resources/META-INF/LICENSE.txt b/components/camel-pgevent/src/main/resources/META-INF/LICENSE.txt
new file mode 100644
index 0000000..6b0b127
--- /dev/null
+++ b/components/camel-pgevent/src/main/resources/META-INF/LICENSE.txt
@@ -0,0 +1,203 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed 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.
+
http://git-wip-us.apache.org/repos/asf/camel/blob/d82786b9/components/camel-pgevent/src/main/resources/META-INF/NOTICE.txt
----------------------------------------------------------------------
diff --git a/components/camel-pgevent/src/main/resources/META-INF/NOTICE.txt b/components/camel-pgevent/src/main/resources/META-INF/NOTICE.txt
new file mode 100644
index 0000000..2e215bf
--- /dev/null
+++ b/components/camel-pgevent/src/main/resources/META-INF/NOTICE.txt
@@ -0,0 +1,11 @@
+ =========================================================================
+ == NOTICE file corresponding to the section 4 d of ==
+ == the Apache License, Version 2.0, ==
+ == in this case for the Apache Camel distribution. ==
+ =========================================================================
+
+ This product includes software developed by
+ The Apache Software Foundation (http://www.apache.org/).
+
+ Please read the different LICENSE files present in the licenses directory of
+ this distribution.
http://git-wip-us.apache.org/repos/asf/camel/blob/d82786b9/components/camel-pgevent/src/main/resources/META-INF/services/org/apache/camel/component/pgevent
----------------------------------------------------------------------
diff --git a/components/camel-pgevent/src/main/resources/META-INF/services/org/apache/camel/component/pgevent b/components/camel-pgevent/src/main/resources/META-INF/services/org/apache/camel/component/pgevent
index 0e03561..d7f7925 100644
--- a/components/camel-pgevent/src/main/resources/META-INF/services/org/apache/camel/component/pgevent
+++ b/components/camel-pgevent/src/main/resources/META-INF/services/org/apache/camel/component/pgevent
@@ -1 +1,18 @@
+#
+# 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.
+#
+
class=org.apache.camel.pgevent.PgEventComponent
http://git-wip-us.apache.org/repos/asf/camel/blob/d82786b9/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/IntegrationTest.java
----------------------------------------------------------------------
diff --git a/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/IntegrationTest.java b/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/IntegrationTest.java
index 3579027..e465ec8 100644
--- a/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/IntegrationTest.java
+++ b/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/IntegrationTest.java
@@ -1,9 +1,10 @@
-/*
- * Copyright 2014 Apache Software Foundation.
- *
- * Licensed 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
+/**
+ * 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
*
@@ -13,29 +14,24 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.pgevent;
-import org.apache.camel.component.pgevent.PgEventEndpoint;
-import org.apache.camel.component.pgevent.PgEventComponent;
import com.impossibl.postgres.jdbc.PGDataSource;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.log.LogComponent;
+import org.apache.camel.component.pgevent.PgEventComponent;
+import org.apache.camel.component.pgevent.PgEventEndpoint;
import org.apache.camel.component.timer.TimerComponent;
import org.apache.camel.main.Main;
import org.junit.Before;
import org.junit.Test;
-/**
- *
- * @author dphillips
- */
public class IntegrationTest {
private Main main;
private PGDataSource ds;
-
+
@Before
public void setUp() throws Exception {
ds = new PGDataSource();
@@ -43,7 +39,7 @@ public class IntegrationTest {
ds.setPort(Integer.parseInt(System.getProperty("pgjdbc.test.port", "5432")));
ds.setDatabase(System.getProperty("pgjdbc.test.db", "event_tests"));
ds.setUser(System.getProperty("pgjdbc.test.user", "dphillips"));
-
+
main = new Main();
main.bind("pgevent", new PgEventComponent(PgEventEndpoint.class));
main.bind("log", new LogComponent());
@@ -60,10 +56,10 @@ public class IntegrationTest {
@Override
public void configure() throws Exception {
from("pgevent://127.0.0.1:5432/event_tests/testchannel?user=dphillips")
- .to("log:org.apache.camel.pgevent.PgEventConsumer?level=DEBUG");
+ .to("log:org.apache.camel.pgevent.PgEventConsumer?level=DEBUG");
}
};
-
+
return builder;
}
@@ -73,10 +69,10 @@ public class IntegrationTest {
@Override
public void configure() throws Exception {
from("timer://test?fixedRate=true&period=5000")
- .to("pgevent://127.0.0.1:5432/event_tests/testchannel?user=dphillips");
+ .to("pgevent://127.0.0.1:5432/event_tests/testchannel?user=dphillips");
}
};
-
+
return builder;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d82786b9/components/camel-pgevent/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/components/camel-pgevent/src/test/resources/log4j.properties b/components/camel-pgevent/src/test/resources/log4j.properties
index 57f7548..6b2f224 100644
--- a/components/camel-pgevent/src/test/resources/log4j.properties
+++ b/components/camel-pgevent/src/test/resources/log4j.properties
@@ -1,14 +1,38 @@
+## ---------------------------------------------------------------------------
+## 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.
+## ---------------------------------------------------------------------------
+
#
-# The logging properties used
+# The logging properties used during tests
#
-log4j.rootLogger=DEBUG, out
+log4j.rootLogger=INFO, file
-# uncomment the following line to turn on Camel debugging
+# uncomment this to turn on debug of camel
#log4j.logger.org.apache.camel=DEBUG
+#log4j.logger.org.apache.camel.component.pgevent=TRACE
# CONSOLE appender not used by default
-log4j.appender.out=org.apache.log4j.ConsoleAppender
-log4j.appender.out.layout=org.apache.log4j.PatternLayout
-log4j.appender.out.layout.ConversionPattern=[%30.30t] %-30.30c{1} %-5p %m%n
-#log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
+
+# File appender
+log4j.appender.file=org.apache.log4j.FileAppender
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
+log4j.appender.file.file=target/camel-pgevent-test.log
+log4j.appender.file.append=true