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 2013/02/02 14:25:41 UTC
svn commit: r1441743 - in /camel/trunk: components/camel-gae/
components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/
components/camel-gae/src/main/java/org/apache/camel/component/gae/bind/
components/camel-gae/src/main/java/org/apache/...
Author: davsclaus
Date: Sat Feb 2 13:25:40 2013
New Revision: 1441743
URL: http://svn.apache.org/viewvc?rev=1441743&view=rev
Log:
CAMEL-6030: camel-gae no longer has Spring dependency. Polished as well.
Removed:
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/context/GaeSpringCamelContext.java
Modified:
camel/trunk/components/camel-gae/pom.xml
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthAuthorizeBinding.java
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthComponent.java
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthEndpoint.java
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthJksLoader.java
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthKeyLoader.java
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthPk8Loader.java
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthProducer.java
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthService.java
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthTokenSecret.java
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthUpgradeBinding.java
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/bind/InboundBinding.java
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/bind/OutboundBinding.java
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/context/GaeDefaultCamelContext.java
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/http/GHttpBinding.java
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/http/GHttpProducer.java
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/login/GLoginBinding.java
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/login/GLoginData.java
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/login/GLoginEndpoint.java
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/login/GLoginProducer.java
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/login/GLoginService.java
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/mail/GMailBinding.java
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/mail/GMailEndpoint.java
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/mail/GMailProducer.java
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/task/GTaskBinding.java
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/task/GTaskEndpoint.java
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/task/GTaskEndpointInfo.java
camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/auth/GAuthJksLoaderTest.java
camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/auth/GAuthPk8LoaderTest.java
camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/http/GHttpTestServlet.java
camel/trunk/components/camel-gae/src/test/resources/org/apache/camel/component/gae/auth/context.xml
camel/trunk/components/camel-gae/src/test/resources/org/apache/camel/component/gae/http/context-combined.xml
camel/trunk/components/camel-gae/src/test/resources/org/apache/camel/component/gae/http/context-inbound.xml
camel/trunk/components/camel-gae/src/test/resources/org/apache/camel/component/gae/http/context-outbound.xml
camel/trunk/components/camel-gae/src/test/resources/org/apache/camel/component/gae/http/web-combined.xml
camel/trunk/components/camel-gae/src/test/resources/org/apache/camel/component/gae/http/web-inbound.xml
camel/trunk/components/camel-gae/src/test/resources/org/apache/camel/component/gae/login/context.xml
camel/trunk/components/camel-gae/src/test/resources/org/apache/camel/component/gae/mail/context-outbound.xml
camel/trunk/components/camel-gae/src/test/resources/org/apache/camel/component/gae/task/context-combined.xml
camel/trunk/components/camel-gae/src/test/resources/org/apache/camel/component/gae/task/web-combined.xml
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Modified: camel/trunk/components/camel-gae/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/pom.xml?rev=1441743&r1=1441742&r2=1441743&view=diff
==============================================================================
--- camel/trunk/components/camel-gae/pom.xml (original)
+++ camel/trunk/components/camel-gae/pom.xml Sat Feb 2 13:25:40 2013
@@ -34,6 +34,7 @@
</properties>
<dependencies>
+
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-servlet</artifactId>
@@ -43,10 +44,7 @@
<artifactId>geronimo-servlet_2.5_spec</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
- </dependency>
+
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-api-1.0-sdk</artifactId>
@@ -63,12 +61,6 @@
<version>${google-gdata-version}</version>
</dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>${commons-io-version}</version>
- </dependency>
-
<!-- testing -->
<dependency>
<groupId>com.google.appengine</groupId>
@@ -103,6 +95,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-spring</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<scope>test</scope>
Modified: camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthAuthorizeBinding.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthAuthorizeBinding.java?rev=1441743&r1=1441742&r2=1441743&view=diff
==============================================================================
--- camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthAuthorizeBinding.java (original)
+++ camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthAuthorizeBinding.java Sat Feb 2 13:25:40 2013
@@ -74,11 +74,6 @@ public class GAuthAuthorizeBinding imple
* {@link GAuthComponent} is configured to use the HMAC_SHA1 signature
* method, a cookie is created containing the request token secret. It is
* needed later to upgrade an authorized request token to an access token.
- *
- * @param endpoint
- * @param exchange
- * @param response
- * @return
*/
public Exchange readResponse(GAuthEndpoint endpoint, Exchange exchange, GoogleOAuthParameters response) throws Exception {
String authrUrl = endpoint.newOAuthHelper().createUserAuthorizationUrl(response);
Modified: camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthComponent.java?rev=1441743&r1=1441742&r2=1441743&view=diff
==============================================================================
--- camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthComponent.java (original)
+++ camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthComponent.java Sat Feb 2 13:25:40 2013
@@ -19,7 +19,6 @@ package org.apache.camel.component.gae.a
import java.util.Map;
import com.google.gdata.client.authn.oauth.GoogleOAuthParameters;
-
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
import org.apache.camel.component.gae.bind.OutboundBinding;
@@ -37,9 +36,7 @@ import org.apache.camel.impl.DefaultComp
public class GAuthComponent extends DefaultComponent {
private String consumerKey;
-
private String consumerSecret;
-
private GAuthKeyLoader keyLoader;
public GAuthComponent() {
@@ -93,6 +90,10 @@ public class GAuthComponent extends Defa
endpoint.setAuthorizeBinding(authorizeBinding);
endpoint.setUpgradeBinding(upgradeBinding);
endpoint.setService(service);
+ // ensure to inject CamelContext to key loader
+ if (keyLoader != null) {
+ keyLoader.setCamelContext(getCamelContext());
+ }
endpoint.setKeyLoader(keyLoader);
return endpoint;
}
Modified: camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthEndpoint.java?rev=1441743&r1=1441742&r2=1441743&view=diff
==============================================================================
--- camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthEndpoint.java (original)
+++ camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthEndpoint.java Sat Feb 2 13:25:40 2013
@@ -58,36 +58,16 @@ public class GAuthEndpoint extends Defa
}
private OutboundBinding<GAuthEndpoint, GoogleOAuthParameters, GoogleOAuthParameters> authorizeBinding;
-
private OutboundBinding<GAuthEndpoint, GoogleOAuthParameters, GoogleOAuthParameters> upgradeBinding;
-
private Name name;
-
private String callback;
-
private String scope;
-
private String consumerKey;
-
private String consumerSecret;
-
private GAuthKeyLoader keyLoader;
-
private GAuthService service;
-
private PrivateKey cachedKey;
- /**
- * Creates a new GAuthEndpoint.
- *
- * @param endpointUri
- * @param component
- * component that created this endpoint.
- * @param name
- * either <code>authorize</code> or <code>upgrade</code>.
- * @throws IllegalArgumentException
- * if the endpoint name is invalid.
- */
public GAuthEndpoint(String endpointUri, Component component, String name) {
super(endpointUri, component);
this.name = Name.valueOf(name.toUpperCase());
@@ -100,9 +80,6 @@ public class GAuthEndpoint extends Defa
/**
* Sets the binding for <code>gauth:authorize</code> endpoints.
- *
- * @param authorizeBinding
- * @see GAuthAuthorizeBinding
*/
public void setAuthorizeBinding(OutboundBinding<GAuthEndpoint, GoogleOAuthParameters, GoogleOAuthParameters> authorizeBinding) {
this.authorizeBinding = authorizeBinding;
@@ -114,9 +91,6 @@ public class GAuthEndpoint extends Defa
/**
* Sets the binding for <code>gauth:upgrade</code> endpoints.
- *
- * @param upgradeBinding
- * @see GAuthUpgradeBinding
*/
public void setUpgradeBinding(OutboundBinding<GAuthEndpoint, GoogleOAuthParameters, GoogleOAuthParameters> upgradeBinding) {
this.upgradeBinding = upgradeBinding;
@@ -208,9 +182,6 @@ public class GAuthEndpoint extends Defa
* Sets the consumer secret. This secret is generated when a web application
* is registered at Google. Only set the consumer secret if the HMAC-SHA1
* signature method shall be used.
- *
- * @param consumerSecret
- * consumer secret to set.
*/
public void setConsumerSecret(String consumerSecret) {
this.consumerSecret = consumerSecret;
@@ -231,9 +202,6 @@ public class GAuthEndpoint extends Defa
/**
* Sets a key loader for loading a private key. A private key is required
* when the RSA-SHA1 signature method shall be used.
- *
- * @param keyLoader
- * key loader to set.
*/
public void setKeyLoader(GAuthKeyLoader keyLoader) {
this.keyLoader = keyLoader;
@@ -247,8 +215,6 @@ public class GAuthEndpoint extends Defa
* Sets the service that makes the remote calls to Google services. Testing
* code should inject a mock service here (using serviceRef in endpoint
* URI).
- *
- * @param service
*/
public void setService(GAuthService service) {
this.service = service;
@@ -279,9 +245,6 @@ public class GAuthEndpoint extends Defa
* Creates an {@link OAuthHelper} configured with either an
* {@link OAuthHmacSha1Signer} or an {@link OAuthRsaSha1Signer}, depending
* on this endpoint's properties.
- *
- * @return
- * @throws Exception
*/
OAuthHelper newOAuthHelper() throws Exception {
OAuthSigner signer = null;
Modified: camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthJksLoader.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthJksLoader.java?rev=1441743&r1=1441742&r2=1441743&view=diff
==============================================================================
--- camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthJksLoader.java (original)
+++ camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthJksLoader.java Sat Feb 2 13:25:40 2013
@@ -22,45 +22,49 @@ import java.security.KeyStore.PasswordPr
import java.security.KeyStore.PrivateKeyEntry;
import java.security.PrivateKey;
-import org.springframework.core.io.Resource;
+import org.apache.camel.CamelContext;
+import org.apache.camel.util.IOHelper;
+import org.apache.camel.util.ResourceHelper;
/**
* A Java keystore specific key loader.
*/
public class GAuthJksLoader implements GAuthKeyLoader {
- private Resource keyStoreLocation;
-
+ private CamelContext camelContext;
+ private String keyStoreLocation;
private String storePass;
-
private String keyPass;
-
private String keyAlias;
public GAuthJksLoader() {
this(null, null, null, null);
}
- public GAuthJksLoader(Resource keyStoreLocation, String storePass, String keyPass, String keyAlias) {
+ public GAuthJksLoader(String keyStoreLocation, String storePass, String keyPass, String keyAlias) {
this.keyStoreLocation = keyStoreLocation;
this.storePass = storePass;
this.keyPass = keyPass;
this.keyAlias = keyAlias;
}
+ public CamelContext getCamelContext() {
+ return camelContext;
+ }
+
+ public void setCamelContext(CamelContext camelContext) {
+ this.camelContext = camelContext;
+ }
+
/**
* Set the location of the Java keystore.
- *
- * @param keyStoreLocation
*/
- public void setKeyStoreLocation(Resource keyStoreLocation) {
+ public void setKeyStoreLocation(String keyStoreLocation) {
this.keyStoreLocation = keyStoreLocation;
}
/**
* Sets the password used to open the key store.
- *
- * @param storePass
*/
public void setStorePass(String storePass) {
this.storePass = storePass;
@@ -68,8 +72,6 @@ public class GAuthJksLoader implements G
/**
* Sets the password used to get access to a specific key.
- *
- * @param keyPass
*/
public void setKeyPass(String keyPass) {
this.keyPass = keyPass;
@@ -77,23 +79,20 @@ public class GAuthJksLoader implements G
/**
* Sets the alias of the key to be loaded.
- *
- * @param keyAlias
*/
public void setKeyAlias(String keyAlias) {
this.keyAlias = keyAlias;
}
/**
- * Loads a private key from a Java keystore depending on this loader's
- * properties.
+ * Loads a private key from a Java keystore depending on this loader's properties.
*/
public PrivateKey loadPrivateKey() throws Exception {
- InputStream input = keyStoreLocation.getInputStream();
+ InputStream input = ResourceHelper.resolveMandatoryResourceAsInputStream(getCamelContext().getClassResolver(), keyStoreLocation);
try {
return loadPrivateKey(input);
} finally {
- input.close();
+ IOHelper.close(input);
}
}
Modified: camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthKeyLoader.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthKeyLoader.java?rev=1441743&r1=1441742&r2=1441743&view=diff
==============================================================================
--- camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthKeyLoader.java (original)
+++ camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthKeyLoader.java Sat Feb 2 13:25:40 2013
@@ -18,18 +18,19 @@ package org.apache.camel.component.gae.a
import java.security.PrivateKey;
+import org.apache.camel.CamelContextAware;
+
/**
* Interface used by {@link GAuthComponent} for loading private keys. The private
* key is needed for RSA-SHA1 signatures.
*/
-public interface GAuthKeyLoader {
+public interface GAuthKeyLoader extends CamelContextAware {
/**
* Loads a private key.
*
* @return the loaded private key.
- * @throws Exception
- * if key loading failed.
+ * @throws Exception if key loading failed.
*/
PrivateKey loadPrivateKey() throws Exception;
Modified: camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthPk8Loader.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthPk8Loader.java?rev=1441743&r1=1441742&r2=1441743&view=diff
==============================================================================
--- camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthPk8Loader.java (original)
+++ camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthPk8Loader.java Sat Feb 2 13:25:40 2013
@@ -16,14 +16,15 @@
*/
package org.apache.camel.component.gae.auth;
+import java.io.InputStream;
import java.security.KeyFactory;
import java.security.PrivateKey;
import java.security.spec.PKCS8EncodedKeySpec;
import com.google.gdata.util.common.util.Base64;
-
-import org.apache.commons.io.IOUtils;
-import org.springframework.core.io.Resource;
+import org.apache.camel.CamelContext;
+import org.apache.camel.util.IOHelper;
+import org.apache.camel.util.ResourceHelper;
/**
* A Java PKCS#8-specific key loader.
@@ -33,14 +34,21 @@ public class GAuthPk8Loader implements G
private static final String BEGIN = "-----BEGIN PRIVATE KEY-----";
private static final String END = "-----END PRIVATE KEY-----";
- private Resource keyLocation;
+ private CamelContext camelContext;
+ private String keyLocation;
+
+ public CamelContext getCamelContext() {
+ return camelContext;
+ }
+
+ public void setCamelContext(CamelContext camelContext) {
+ this.camelContext = camelContext;
+ }
/**
* Sets the location of the PKCS#8 file that contains a private key.
- *
- * @param keyLocation
*/
- public void setKeyLocation(Resource keyLocation) {
+ public void setKeyLocation(String keyLocation) {
this.keyLocation = keyLocation;
}
@@ -48,7 +56,13 @@ public class GAuthPk8Loader implements G
* Loads a private key from a PKCS#8 file.
*/
public PrivateKey loadPrivateKey() throws Exception {
- String str = IOUtils.toString(keyLocation.getInputStream());
+ InputStream is = ResourceHelper.resolveMandatoryResourceAsInputStream(getCamelContext().getClassResolver(), keyLocation);
+ String str;
+ try {
+ str = getCamelContext().getTypeConverter().mandatoryConvertTo(String.class, is);
+ } finally {
+ IOHelper.close(is);
+ }
if (str.contains(BEGIN) && str.contains(END)) {
str = str.substring(BEGIN.length(), str.lastIndexOf(END));
Modified: camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthProducer.java?rev=1441743&r1=1441742&r2=1441743&view=diff
==============================================================================
--- camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthProducer.java (original)
+++ camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthProducer.java Sat Feb 2 13:25:40 2013
@@ -47,12 +47,6 @@ public class GAuthProducer extends Defau
* Depending on the {@link GAuthEndpoint.Name}, this method either fetches
* an unauthorized request token and creates a redirect response, or
* upgrades an authorized request token to an access token.
- *
- * @param exchange
- *
- * @see GAuthAuthorizeBinding
- * @see GAuthUpgradeBinding
- * @see GAuthServiceImpl
*/
public void process(Exchange exchange) throws Exception {
if (getEndpoint().getName() == AUTHORIZE) {
@@ -64,7 +58,6 @@ public class GAuthProducer extends Defau
getEndpoint().getService().getAccessToken(params);
getUpgradeBinding().readResponse(getEndpoint(), exchange, params);
}
-
}
}
Modified: camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthService.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthService.java?rev=1441743&r1=1441742&r2=1441743&view=diff
==============================================================================
--- camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthService.java (original)
+++ camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthService.java Sat Feb 2 13:25:40 2013
@@ -26,20 +26,16 @@ public interface GAuthService {
/**
* Gets an unauthorized request token from Google.
*
- * @param oauthParameters
- * value object for providing input data and storing result data
- * (unauthorized request token).
- * @throws Exception
+ * @param oauthParameters value object for providing input data and storing result data
+ * (unauthorized request token).
*/
void getUnauthorizedRequestToken(OAuthParameters oauthParameters) throws Exception;
/**
* Gets an access token from Google.
*
- * @param oauthParameters
- * value object for providing input data (authorized request
- * token) and storing result data (access token).
- * @throws Exception
+ * @param oauthParameters value object for providing input data (authorized request token)
+ * and storing result data (access token).
*/
void getAccessToken(OAuthParameters oauthParameters) throws Exception;
Modified: camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthTokenSecret.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthTokenSecret.java?rev=1441743&r1=1441742&r2=1441743&view=diff
==============================================================================
--- camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthTokenSecret.java (original)
+++ camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthTokenSecret.java Sat Feb 2 13:25:40 2013
@@ -59,8 +59,7 @@ public class GAuthTokenSecret {
/**
* Create a {@link GAuthTokenSecret} from a cookies string.
*
- * @param cookies
- * cookies string.
+ * @param cookies cookies string.
* @return either an {@link GAuthTokenSecret} instance or <code>null</code>
* if there's no cookie with name {@link #COOKIE_NAME}.
*/
Modified: camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthUpgradeBinding.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthUpgradeBinding.java?rev=1441743&r1=1441742&r2=1441743&view=diff
==============================================================================
--- camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthUpgradeBinding.java (original)
+++ camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthUpgradeBinding.java Sat Feb 2 13:25:40 2013
@@ -51,14 +51,8 @@ public class GAuthUpgradeBinding impleme
* {@link GAuthComponent} is configured to use the HMAC_SHA1 signature
* method, a request token secret is obtained from a
* {@link GAuthTokenSecret#COOKIE_NAME} cookie.
- *
- * @param endpoint
- * @param exchange
- * @param request
- * ignored.
- * @return
- * @throws GAuthException
- * if the {@link GAuthComponent} is configured to use the
+ *
+ * @throws GAuthException if the {@link GAuthComponent} is configured to use the
* HMAC_SHA1 signature method but there's no cookie with the
* request token secret.
*/
@@ -85,11 +79,7 @@ public class GAuthUpgradeBinding impleme
/**
* Creates an <code>exchange.getOut()</code> message that containing the
* access token and the access token secret in the message header.
- *
- * @param endpoint
- * @param exchange
- * @param response
- * @return
+ *
* @see #GAUTH_ACCESS_TOKEN
* @see #GAUTH_ACCESS_TOKEN_SECRET
*/
Modified: camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/bind/InboundBinding.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/bind/InboundBinding.java?rev=1441743&r1=1441742&r2=1441743&view=diff
==============================================================================
--- camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/bind/InboundBinding.java (original)
+++ camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/bind/InboundBinding.java Sat Feb 2 13:25:40 2013
@@ -27,12 +27,9 @@ import org.apache.camel.Exchange;
* by {@link Consumer} implementations or their clients to translate between
* protocol-specific or services-specific messages and {@link Exchange} objects.
*
- * @param S
- * request type.
- * @param T
- * response type.
- * @param E
- * endpoint type.
+ * @param S request type.
+ * @param T response type.
+ * @param E endpoint type.
*/
public interface InboundBinding<E extends Endpoint, S, T> {
Modified: camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/bind/OutboundBinding.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/bind/OutboundBinding.java?rev=1441743&r1=1441742&r2=1441743&view=diff
==============================================================================
--- camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/bind/OutboundBinding.java (original)
+++ camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/bind/OutboundBinding.java Sat Feb 2 13:25:40 2013
@@ -27,12 +27,9 @@ import org.apache.camel.Producer;
* by {@link Producer} implementations to translate between {@link Exchange}
* objects and protocol-specific or services-specific messages.
*
- * @param S
- * request type.
- * @param T
- * response type.
- * @param E
- * endpoint type.
+ * @param S request type.
+ * @param T response type.
+ * @param E endpoint type.
*/
public interface OutboundBinding<E extends Endpoint, S, T> {
Modified: camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/context/GaeDefaultCamelContext.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/context/GaeDefaultCamelContext.java?rev=1441743&r1=1441742&r2=1441743&view=diff
==============================================================================
--- camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/context/GaeDefaultCamelContext.java (original)
+++ camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/context/GaeDefaultCamelContext.java Sat Feb 2 13:25:40 2013
@@ -17,14 +17,15 @@
package org.apache.camel.component.gae.context;
import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.camel.impl.SimpleRegistry;
public class GaeDefaultCamelContext extends DefaultCamelContext {
- @Override
- protected void doStart() throws Exception {
- // JMX not allowed on GAE
+ public GaeDefaultCamelContext() {
+ super();
+ // disable JMX and use the simple registry as JNDI is not allowed
disableJMX();
- super.doStart();
+ setRegistry(new SimpleRegistry());
}
}
Modified: camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/http/GHttpBinding.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/http/GHttpBinding.java?rev=1441743&r1=1441742&r2=1441743&view=diff
==============================================================================
--- camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/http/GHttpBinding.java (original)
+++ camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/http/GHttpBinding.java Sat Feb 2 13:25:40 2013
@@ -55,13 +55,8 @@ public class GHttpBinding implements
* Reads data from <code>response</code> and writes it to the out-message of
* the <code>exchange</code>.
*
- * @param endpoint
- * @param exchange
- * @param response
- * @return the original <code>exchange</code> instance populated with
- * response data.
- * @throws GHttpException
- * if the response code is >= 400 and
+ * @return the original <code>exchange</code> instance populated with response data.
+ * @throws GHttpException if the response code is >= 400 and
* {@link GHttpEndpoint#isThrowExceptionOnFailure()} returns
* <code>true</code>.
*/
@@ -81,11 +76,7 @@ public class GHttpBinding implements
* Reads data from <code>exchange</code> and writes it to a newly created
* {@link HTTPRequest} instance. The <code>request</code> parameter is
* ignored.
- *
- * @param endpoint
- * @param exchange
- * @param request
- * ignored.
+ *
* @return a newly created {@link HTTPRequest} instance containing data from
* <code>exchange</code>.
*/
Modified: camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/http/GHttpProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/http/GHttpProducer.java?rev=1441743&r1=1441742&r2=1441743&view=diff
==============================================================================
--- camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/http/GHttpProducer.java (original)
+++ camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/http/GHttpProducer.java Sat Feb 2 13:25:40 2013
@@ -46,13 +46,10 @@ public class GHttpProducer extends Defau
/**
* Invokes the URL fetch service.
*
- * @param exchange
- * contains the request data in the in-message. The result is
- * written to the out-message.
- * @throws GHttpException
- * if the response code is >= 400 and
- * {@link GHttpEndpoint#isThrowExceptionOnFailure()} returns
- * <code>true</code>.
+ * @param exchange contains the request data in the in-message. The result is written to the out-message.
+ * @throws GHttpException if the response code is >= 400 and {@link GHttpEndpoint#isThrowExceptionOnFailure()}
+ * returns <code>true</code>.
+ *
* @see GHttpBinding
*/
public void process(Exchange exchange) throws Exception {
Modified: camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/login/GLoginBinding.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/login/GLoginBinding.java?rev=1441743&r1=1441742&r2=1441743&view=diff
==============================================================================
--- camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/login/GLoginBinding.java (original)
+++ camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/login/GLoginBinding.java Sat Feb 2 13:25:40 2013
@@ -56,12 +56,6 @@ public class GLoginBinding implements Ou
* Creates a {@link GLoginData} object from endpoint and
* <code>exchange.getIn()</code> header data. The created object is used to
* obtain an authentication token and an authorization cookie.
- *
- * @param endpoint
- * @param exchange
- * @param request
- * ignored.
- * @return
*/
public GLoginData writeRequest(GLoginEndpoint endpoint, Exchange exchange, GLoginData request) {
String hostName = exchange.getIn().getHeader(GLOGIN_HOST_NAME, String.class);
@@ -94,11 +88,6 @@ public class GLoginBinding implements Ou
* {@link #GLOGIN_COOKIE} header containing an authorization cookie. If the
* endpoint is configured to run in development mode, no authentication
* token will be set, only an authorization cookie.
- *
- * @param endpoint
- * @param exchange
- * @param response
- * @return
*/
public Exchange readResponse(GLoginEndpoint endpoint, Exchange exchange, GLoginData response) throws Exception {
if (response.getAuthenticationToken() != null) {
Modified: camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/login/GLoginData.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/login/GLoginData.java?rev=1441743&r1=1441742&r2=1441743&view=diff
==============================================================================
--- camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/login/GLoginData.java (original)
+++ camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/login/GLoginData.java Sat Feb 2 13:25:40 2013
@@ -22,21 +22,13 @@ package org.apache.camel.component.gae.l
public class GLoginData {
private String hostName;
-
private String clientName;
-
private String userName;
-
private String password;
-
private int devPort;
-
private boolean devAdmin;
-
private boolean devMode;
-
private String authenticationToken;
-
private String authorizationCookie;
/**
Modified: camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/login/GLoginEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/login/GLoginEndpoint.java?rev=1441743&r1=1441742&r2=1441743&view=diff
==============================================================================
--- camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/login/GLoginEndpoint.java (original)
+++ camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/login/GLoginEndpoint.java Sat Feb 2 13:25:40 2013
@@ -32,33 +32,23 @@ public class GLoginEndpoint extends Defa
private OutboundBinding<GLoginEndpoint, GLoginData, GLoginData> outboundBinding;
private String hostName;
-
private String clientName;
-
private String userName;
-
private String password;
-
private int devPort;
-
private boolean devAdmin;
-
private boolean devMode;
-
private GLoginService service;
/**
* Creates a new GLoginEndpoint.
*
- * @param endpointUri
- * @param component
- * component that created this endpoint.
- * @param hostName
- * internet hostname of a GAE application, for example
+ * @param endpointUri the endpoint uri
+ * @param component component that created this endpoint.
+ * @param hostName internet hostname of a GAE application, for example
* <code>example.appspot.com</code>, or <code>localhost</code> if
* the application is running on a local development server.
- * @param devPort
- * port for connecting to the local development server.
+ * @param devPort port for connecting to the local development server.
*/
public GLoginEndpoint(String endpointUri, Component component, String hostName, int devPort) {
super(endpointUri, component);
@@ -102,8 +92,6 @@ public class GLoginEndpoint extends Defa
/**
* Sets the client name used for authentication. The default name is
* <code>apache-camel-2.x</code>.
- *
- * @param clientName
*/
public void setClientName(String clientName) {
this.clientName = clientName;
@@ -115,8 +103,6 @@ public class GLoginEndpoint extends Defa
/**
* Sets the login username (a Google mail address).
- *
- * @param userName
*/
public void setUserName(String userName) {
this.userName = userName;
@@ -128,8 +114,6 @@ public class GLoginEndpoint extends Defa
/**
* Sets the login password.
- *
- * @param password
*/
public void setPassword(String password) {
this.password = password;
@@ -151,8 +135,6 @@ public class GLoginEndpoint extends Defa
* Set to <code>true</code> for logging in as admin to a development server.
* Only used if {@link #devMode} is <code>true</code>. Default is
* <code>false</code>.
- *
- * @param devAdmin
*/
public void setDevAdmin(boolean devAdmin) {
this.devAdmin = devAdmin;
@@ -164,8 +146,6 @@ public class GLoginEndpoint extends Defa
/**
* Set to <code>true</code> for connecting to a development server.
- *
- * @param devMode
*/
public void setDevMode(boolean devMode) {
this.devMode = devMode;
@@ -179,8 +159,6 @@ public class GLoginEndpoint extends Defa
* Sets the service that makes the remote calls to Google services or the
* local development server. Testing code should inject a mock service here
* (using serviceRef in endpoint URI).
- *
- * @param service
*/
public void setService(GLoginService service) {
this.service = service;
Modified: camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/login/GLoginProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/login/GLoginProducer.java?rev=1441743&r1=1441742&r2=1441743&view=diff
==============================================================================
--- camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/login/GLoginProducer.java (original)
+++ camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/login/GLoginProducer.java Sat Feb 2 13:25:40 2013
@@ -42,9 +42,7 @@ public class GLoginProducer extends Defa
/**
* First obtains an authentication token and then exchanges the token against
* an authorization cookie.
- *
- * @param exchange
- *
+ *
* @see GLoginBinding
* @see GLoginServiceImpl
*/
Modified: camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/login/GLoginService.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/login/GLoginService.java?rev=1441743&r1=1441742&r2=1441743&view=diff
==============================================================================
--- camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/login/GLoginService.java (original)
+++ camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/login/GLoginService.java Sat Feb 2 13:25:40 2013
@@ -26,10 +26,7 @@ public interface GLoginService {
* {@link GLoginData#setAuthenticationToken(String)} (only if needed by
* {@link #authorize(GLoginData)}).
*
- * @param data
- * authentication input data and response data (authentication
- * token) container.
- * @throws Exception
+ * @param data authentication input data and response data (authentication token) container.
*/
void authenticate(GLoginData data) throws Exception;
@@ -37,10 +34,7 @@ public interface GLoginService {
* Authorizes access to an application and stores an authorization cookie to
* {@link GLoginData#setAuthorizationCookie(String)}.
*
- * @param data
- * authentication input data and response data (authorization
- * cookie) container.
- * @throws Exception
+ * @param data authentication input data and response data (authorization cookie) container.
*/
void authorize(GLoginData data) throws Exception;
Modified: camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/mail/GMailBinding.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/mail/GMailBinding.java?rev=1441743&r1=1441742&r2=1441743&view=diff
==============================================================================
--- camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/mail/GMailBinding.java (original)
+++ camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/mail/GMailBinding.java Sat Feb 2 13:25:40 2013
@@ -58,13 +58,8 @@ public class GMailBinding implements Out
* Reads data from <code>exchange</code> and writes it to a newly created
* {@link Message} instance. The <code>request</code> parameter is
* ignored.
- *
- * @param endpoint
- * @param exchange
- * @param request
- * ignored.
- * @return a newly created {@link Message} instance containing data from
- * <code>exchange</code>.
+ *
+ * @return a newly created {@link Message} instance containing data from <code>exchange</code>.
*/
public Message writeRequest(GMailEndpoint endpoint, Exchange exchange, Message request) {
Message message = new Message();
Modified: camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/mail/GMailEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/mail/GMailEndpoint.java?rev=1441743&r1=1441742&r2=1441743&view=diff
==============================================================================
--- camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/mail/GMailEndpoint.java (original)
+++ camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/mail/GMailEndpoint.java Sat Feb 2 13:25:40 2013
@@ -34,17 +34,11 @@ import org.apache.camel.impl.DefaultEndp
public class GMailEndpoint extends DefaultEndpoint implements OutboundBindingSupport<GMailEndpoint, Message, Void> {
private OutboundBinding<GMailEndpoint, Message, Void> outboundBinding;
-
private MailService mailService;
-
private String sender;
-
private String subject;
-
private String to;
-
private String cc;
-
private String bcc;
public GMailEndpoint(String endpointUri, Component component, String sender) {
Modified: camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/mail/GMailProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/mail/GMailProducer.java?rev=1441743&r1=1441742&r2=1441743&view=diff
==============================================================================
--- camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/mail/GMailProducer.java (original)
+++ camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/mail/GMailProducer.java Sat Feb 2 13:25:40 2013
@@ -45,8 +45,7 @@ public class GMailProducer extends Defau
/**
* Invokes the mail service.
*
- * @param exchange
- * contains the mail data in the in-message.
+ * @param exchange contains the mail data in the in-message.
* @see GMailBinding
*/
public void process(Exchange exchange) throws Exception {
Modified: camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/task/GTaskBinding.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/task/GTaskBinding.java?rev=1441743&r1=1441742&r2=1441743&view=diff
==============================================================================
--- camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/task/GTaskBinding.java (original)
+++ camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/task/GTaskBinding.java Sat Feb 2 13:25:40 2013
@@ -68,11 +68,7 @@ public class GTaskBinding implements
* Reads data from <code>exchange</code> and writes it to a newly created
* {@link TaskOptions} instance. The <code>request</code> parameter is
* ignored.
- *
- * @param endpoint
- * @param exchange
- * @param request
- * ignored.
+ *
* @return a newly created {@link TaskOptions} instance containing data from
* <code>exchange</code>.
*/
Modified: camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/task/GTaskEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/task/GTaskEndpoint.java?rev=1441743&r1=1441742&r2=1441743&view=diff
==============================================================================
--- camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/task/GTaskEndpoint.java (original)
+++ camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/task/GTaskEndpoint.java Sat Feb 2 13:25:40 2013
@@ -44,9 +44,7 @@ public class GTaskEndpoint extends Servl
private OutboundBinding<GTaskEndpoint, TaskOptions, Void> outboundBinding;
private InboundBinding<GTaskEndpoint, HttpServletRequest, HttpServletResponse> inboundBinding;
-
private String workerRoot;
-
private Queue queue;
public GTaskEndpoint(String endpointUri, ServletComponent component,
@@ -76,8 +74,7 @@ public class GTaskEndpoint extends Servl
/**
* Proxies the {@link HttpBinding} returned by {@link super#getBinding()}
* with a dynamic proxy. The proxy's invocation handler further delegates to
- * {@link InboundBinding#readRequest(org.apache.camel.Endpoint, Exchange, Object)}
- * .
+ * {@link InboundBinding#readRequest(org.apache.camel.Endpoint, Exchange, Object)} .
*
* @return proxied {@link HttpBinding}.
*/
@@ -98,12 +95,10 @@ public class GTaskEndpoint extends Servl
/**
* Sets the web hook path root.
*
- * @param workerRoot
- * the assumed web hook path root. The default is
- * <code>worker</code>. The servlet handling the callback from
- * the task queueing service should have a <code>/worker/*</code>
- * servlet mapping in this case. If another servlet mapping is
- * used it must be set here accordingly.
+ * @param workerRoot the assumed web hook path root. The default is <code>worker</code>.
+ * The servlet handling the callback from the task queueing service should have
+ * a <code>/worker/*</code> servlet mapping in this case. If another servlet mapping
+ * is used it must be set here accordingly.
*/
public void setWorkerRoot(String workerRoot) {
this.workerRoot = workerRoot;
Modified: camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/task/GTaskEndpointInfo.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/task/GTaskEndpointInfo.java?rev=1441743&r1=1441742&r2=1441743&view=diff
==============================================================================
--- camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/task/GTaskEndpointInfo.java (original)
+++ camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/task/GTaskEndpointInfo.java Sat Feb 2 13:25:40 2013
@@ -30,9 +30,7 @@ class GTaskEndpointInfo {
private static final String COLON = ":";
private String uri;
-
private String uriPath;
-
private URI uriObject;
public GTaskEndpointInfo(String uri, String uriPath) throws Exception {
Modified: camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/auth/GAuthJksLoaderTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/auth/GAuthJksLoaderTest.java?rev=1441743&r1=1441742&r2=1441743&view=diff
==============================================================================
--- camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/auth/GAuthJksLoaderTest.java (original)
+++ camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/auth/GAuthJksLoaderTest.java Sat Feb 2 13:25:40 2013
@@ -18,20 +18,20 @@ package org.apache.camel.component.gae.a
import java.security.PrivateKey;
+import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Before;
import org.junit.Test;
-import org.springframework.core.io.ClassPathResource;
-import static org.junit.Assert.assertEquals;
-
-public class GAuthJksLoaderTest {
+public class GAuthJksLoaderTest extends CamelTestSupport {
private GAuthJksLoader keyLoader;
@Before
public void setUp() throws Exception {
+ super.setUp();
keyLoader = new GAuthJksLoader();
- keyLoader.setKeyStoreLocation(new ClassPathResource("org/apache/camel/component/gae/auth/test1.jks"));
+ keyLoader.setCamelContext(context);
+ keyLoader.setKeyStoreLocation("classpath:org/apache/camel/component/gae/auth/test1.jks");
keyLoader.setKeyAlias("test1");
keyLoader.setStorePass("test1pass");
keyLoader.setKeyPass("test1pass");
@@ -43,5 +43,10 @@ public class GAuthJksLoaderTest {
assertEquals("RSA", key.getAlgorithm());
assertEquals("PKCS#8", key.getFormat());
}
-
+
+ @Override
+ public boolean isUseRouteBuilder() {
+ return false;
+ }
+
}
Modified: camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/auth/GAuthPk8LoaderTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/auth/GAuthPk8LoaderTest.java?rev=1441743&r1=1441742&r2=1441743&view=diff
==============================================================================
--- camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/auth/GAuthPk8LoaderTest.java (original)
+++ camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/auth/GAuthPk8LoaderTest.java Sat Feb 2 13:25:40 2013
@@ -18,20 +18,20 @@ package org.apache.camel.component.gae.a
import java.security.PrivateKey;
+import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Before;
import org.junit.Test;
-import org.springframework.core.io.ClassPathResource;
-import static org.junit.Assert.assertEquals;
-
-public class GAuthPk8LoaderTest {
+public class GAuthPk8LoaderTest extends CamelTestSupport {
private GAuthPk8Loader keyLoader;
@Before
public void setUp() throws Exception {
+ super.setUp();
keyLoader = new GAuthPk8Loader();
- keyLoader.setKeyLocation(new ClassPathResource("org/apache/camel/component/gae/auth/test2.pk8"));
+ keyLoader.setCamelContext(context);
+ keyLoader.setKeyLocation("classpath:org/apache/camel/component/gae/auth/test2.pk8");
}
@Test
@@ -40,5 +40,9 @@ public class GAuthPk8LoaderTest {
assertEquals("RSA", key.getAlgorithm());
assertEquals("PKCS#8", key.getFormat());
}
-
+
+ @Override
+ public boolean isUseRouteBuilder() {
+ return false;
+ }
}
Modified: camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/http/GHttpTestServlet.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/http/GHttpTestServlet.java?rev=1441743&r1=1441742&r2=1441743&view=diff
==============================================================================
--- camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/http/GHttpTestServlet.java (original)
+++ camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/http/GHttpTestServlet.java Sat Feb 2 13:25:40 2013
@@ -23,7 +23,7 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.io.IOUtils;
+import org.apache.camel.util.IOHelper;
public class GHttpTestServlet extends HttpServlet {
@@ -63,7 +63,7 @@ public class GHttpTestServlet extends Ht
}
// Copy body from request to response
- resp.getWriter().println(IOUtils.toString(req.getInputStream()));
+ IOHelper.copyAndCloseInput(req.getInputStream(), resp.getOutputStream());
resp.getWriter().flush();
}
}
Modified: camel/trunk/components/camel-gae/src/test/resources/org/apache/camel/component/gae/auth/context.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/src/test/resources/org/apache/camel/component/gae/auth/context.xml?rev=1441743&r1=1441742&r2=1441743&view=diff
==============================================================================
--- camel/trunk/components/camel-gae/src/test/resources/org/apache/camel/component/gae/auth/context.xml (original)
+++ camel/trunk/components/camel-gae/src/test/resources/org/apache/camel/component/gae/auth/context.xml Sat Feb 2 13:25:40 2013
@@ -21,37 +21,33 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:camel="http://camel.apache.org/schema/spring"
xsi:schemaLocation="
-http://www.springframework.org/schema/beans
-http://www.springframework.org/schema/beans/spring-beans.xsd
-http://camel.apache.org/schema/spring
-http://camel.apache.org/schema/spring/camel-spring.xsd">
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
<camel:camelContext id="camelContext">
- <camel:jmxAgent id="agent" disabled="true" />
+ <camel:jmxAgent id="agent" disabled="true"/>
<camel:routeBuilder ref="routeBuilder"/>
</camel:camelContext>
- <bean id="routeBuilder"
- class="org.apache.camel.component.gae.auth.GAuthRouteBuilder">
- </bean>
+ <bean id="routeBuilder" class="org.apache.camel.component.gae.auth.GAuthRouteBuilder"/>
<bean id="gauth-cs" class="org.apache.camel.component.gae.auth.GAuthComponent">
- <property name="consumerKey" value="testComsumerKey" />
- <property name="consumerSecret" value="testComsumerSecret" />
+ <property name="consumerKey" value="testComsumerKey"/>
+ <property name="consumerSecret" value="testComsumerSecret"/>
</bean>
<bean id="gauth-pk" class="org.apache.camel.component.gae.auth.GAuthComponent">
- <property name="consumerKey" value="test" />
- <property name="keyLoader" ref="keyLoader" />
+ <property name="consumerKey" value="test"/>
+ <property name="keyLoader" ref="keyLoader"/>
</bean>
<bean id="keyLoader" class="org.apache.camel.component.gae.auth.GAuthJksLoader">
- <property name="keyStoreLocation" value="org/apache/camel/component/gae/auth/test1.jks" />
- <property name="keyAlias" value="test1" />
- <property name="keyPass" value="test1pass" />
- <property name="storePass" value="test1pass" />
+ <property name="keyStoreLocation" value="org/apache/camel/component/gae/auth/test1.jks"/>
+ <property name="keyAlias" value="test1"/>
+ <property name="keyPass" value="test1pass"/>
+ <property name="storePass" value="test1pass"/>
</bean>
- <bean id="testService" class="org.apache.camel.component.gae.auth.GAuthServiceMock" />
+ <bean id="testService" class="org.apache.camel.component.gae.auth.GAuthServiceMock"/>
</beans>
Modified: camel/trunk/components/camel-gae/src/test/resources/org/apache/camel/component/gae/http/context-combined.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/src/test/resources/org/apache/camel/component/gae/http/context-combined.xml?rev=1441743&r1=1441742&r2=1441743&view=diff
==============================================================================
--- camel/trunk/components/camel-gae/src/test/resources/org/apache/camel/component/gae/http/context-combined.xml (original)
+++ camel/trunk/components/camel-gae/src/test/resources/org/apache/camel/component/gae/http/context-combined.xml Sat Feb 2 13:25:40 2013
@@ -21,18 +21,14 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:camel="http://camel.apache.org/schema/spring"
xsi:schemaLocation="
-http://www.springframework.org/schema/beans
-http://www.springframework.org/schema/beans/spring-beans.xsd
-http://camel.apache.org/schema/spring
-http://camel.apache.org/schema/spring/camel-spring.xsd">
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
- <camel:camelContext id="camelContext">
- <camel:jmxAgent id="agent" disabled="true" />
- <camel:routeBuilder ref="routeBuilder"/>
- </camel:camelContext>
+ <camel:camelContext id="camelContext">
+ <camel:jmxAgent id="agent" disabled="true"/>
+ <camel:routeBuilder ref="routeBuilder"/>
+ </camel:camelContext>
+
+ <bean id="routeBuilder" class="org.apache.camel.component.gae.http.GHttpCombinedRouteBuilder"/>
- <bean id="routeBuilder"
- class="org.apache.camel.component.gae.http.GHttpCombinedRouteBuilder">
- </bean>
-
</beans>
Modified: camel/trunk/components/camel-gae/src/test/resources/org/apache/camel/component/gae/http/context-inbound.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/src/test/resources/org/apache/camel/component/gae/http/context-inbound.xml?rev=1441743&r1=1441742&r2=1441743&view=diff
==============================================================================
--- camel/trunk/components/camel-gae/src/test/resources/org/apache/camel/component/gae/http/context-inbound.xml (original)
+++ camel/trunk/components/camel-gae/src/test/resources/org/apache/camel/component/gae/http/context-inbound.xml Sat Feb 2 13:25:40 2013
@@ -21,18 +21,14 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:camel="http://camel.apache.org/schema/spring"
xsi:schemaLocation="
-http://www.springframework.org/schema/beans
-http://www.springframework.org/schema/beans/spring-beans.xsd
-http://camel.apache.org/schema/spring
-http://camel.apache.org/schema/spring/camel-spring.xsd">
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
+
+ <camel:camelContext id="camelContext">
+ <camel:jmxAgent id="agent" disabled="true"/>
+ <camel:routeBuilder ref="routeBuilder"/>
+ </camel:camelContext>
+
+ <bean id="routeBuilder" class="org.apache.camel.component.gae.http.GHttpInboundRouteBuilder"/>
- <camel:camelContext id="camelContext">
- <camel:jmxAgent id="agent" disabled="true" />
- <camel:routeBuilder ref="routeBuilder"/>
- </camel:camelContext>
-
- <bean id="routeBuilder"
- class="org.apache.camel.component.gae.http.GHttpInboundRouteBuilder">
- </bean>
-
</beans>
Modified: camel/trunk/components/camel-gae/src/test/resources/org/apache/camel/component/gae/http/context-outbound.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/src/test/resources/org/apache/camel/component/gae/http/context-outbound.xml?rev=1441743&r1=1441742&r2=1441743&view=diff
==============================================================================
--- camel/trunk/components/camel-gae/src/test/resources/org/apache/camel/component/gae/http/context-outbound.xml (original)
+++ camel/trunk/components/camel-gae/src/test/resources/org/apache/camel/component/gae/http/context-outbound.xml Sat Feb 2 13:25:40 2013
@@ -21,18 +21,14 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:camel="http://camel.apache.org/schema/spring"
xsi:schemaLocation="
-http://www.springframework.org/schema/beans
-http://www.springframework.org/schema/beans/spring-beans.xsd
-http://camel.apache.org/schema/spring
-http://camel.apache.org/schema/spring/camel-spring.xsd">
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
- <camel:camelContext id="camelContext">
- <camel:jmxAgent id="agent" disabled="true" />
- <camel:routeBuilder ref="routeBuilder"/>
- </camel:camelContext>
+ <camel:camelContext id="camelContext">
+ <camel:jmxAgent id="agent" disabled="true"/>
+ <camel:routeBuilder ref="routeBuilder"/>
+ </camel:camelContext>
+
+ <bean id="routeBuilder" class="org.apache.camel.component.gae.http.GHttpOutboundRouteBuilder"/>
- <bean id="routeBuilder"
- class="org.apache.camel.component.gae.http.GHttpOutboundRouteBuilder">
- </bean>
-
</beans>
Modified: camel/trunk/components/camel-gae/src/test/resources/org/apache/camel/component/gae/http/web-combined.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/src/test/resources/org/apache/camel/component/gae/http/web-combined.xml?rev=1441743&r1=1441742&r2=1441743&view=diff
==============================================================================
--- camel/trunk/components/camel-gae/src/test/resources/org/apache/camel/component/gae/http/web-combined.xml (original)
+++ camel/trunk/components/camel-gae/src/test/resources/org/apache/camel/component/gae/http/web-combined.xml Sat Feb 2 13:25:40 2013
@@ -19,25 +19,25 @@
<web-app>
- <!-- tell Spring where it should load the XML file -->
- <context-param>
- <param-name>contextConfigLocation</param-name>
- <param-value>classpath:org/apache/camel/component/gae/http/context-combined.xml</param-value>
- </context-param>
-
- <!-- spring context listener which loads the XML file -->
- <listener>
- <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
- </listener>
-
- <servlet>
- <servlet-name>CamelServlet</servlet-name>
- <servlet-class>org.apache.camel.component.servlet.CamelHttpTransportServlet</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>CamelServlet</servlet-name>
- <url-pattern>/camel/*</url-pattern>
- </servlet-mapping>
-
+ <!-- tell Spring where it should load the XML file -->
+ <context-param>
+ <param-name>contextConfigLocation</param-name>
+ <param-value>classpath:org/apache/camel/component/gae/http/context-combined.xml</param-value>
+ </context-param>
+
+ <!-- spring context listener which loads the XML file -->
+ <listener>
+ <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+ </listener>
+
+ <servlet>
+ <servlet-name>CamelServlet</servlet-name>
+ <servlet-class>org.apache.camel.component.servlet.CamelHttpTransportServlet</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>CamelServlet</servlet-name>
+ <url-pattern>/camel/*</url-pattern>
+ </servlet-mapping>
+
</web-app>
Modified: camel/trunk/components/camel-gae/src/test/resources/org/apache/camel/component/gae/http/web-inbound.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/src/test/resources/org/apache/camel/component/gae/http/web-inbound.xml?rev=1441743&r1=1441742&r2=1441743&view=diff
==============================================================================
--- camel/trunk/components/camel-gae/src/test/resources/org/apache/camel/component/gae/http/web-inbound.xml (original)
+++ camel/trunk/components/camel-gae/src/test/resources/org/apache/camel/component/gae/http/web-inbound.xml Sat Feb 2 13:25:40 2013
@@ -19,25 +19,25 @@
<web-app>
- <!-- tell Spring where it should load the XML file -->
- <context-param>
- <param-name>contextConfigLocation</param-name>
- <param-value>classpath:org/apache/camel/component/gae/http/context-inbound.xml</param-value>
- </context-param>
-
- <!-- spring context listener which loads the XML file -->
- <listener>
- <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
- </listener>
-
- <servlet>
- <servlet-name>CamelServlet</servlet-name>
- <servlet-class>org.apache.camel.component.servlet.CamelHttpTransportServlet</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>CamelServlet</servlet-name>
- <url-pattern>/camel/*</url-pattern>
- </servlet-mapping>
-
+ <!-- tell Spring where it should load the XML file -->
+ <context-param>
+ <param-name>contextConfigLocation</param-name>
+ <param-value>classpath:org/apache/camel/component/gae/http/context-inbound.xml</param-value>
+ </context-param>
+
+ <!-- spring context listener which loads the XML file -->
+ <listener>
+ <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+ </listener>
+
+ <servlet>
+ <servlet-name>CamelServlet</servlet-name>
+ <servlet-class>org.apache.camel.component.servlet.CamelHttpTransportServlet</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>CamelServlet</servlet-name>
+ <url-pattern>/camel/*</url-pattern>
+ </servlet-mapping>
+
</web-app>
Modified: camel/trunk/components/camel-gae/src/test/resources/org/apache/camel/component/gae/login/context.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/src/test/resources/org/apache/camel/component/gae/login/context.xml?rev=1441743&r1=1441742&r2=1441743&view=diff
==============================================================================
--- camel/trunk/components/camel-gae/src/test/resources/org/apache/camel/component/gae/login/context.xml (original)
+++ camel/trunk/components/camel-gae/src/test/resources/org/apache/camel/component/gae/login/context.xml Sat Feb 2 13:25:40 2013
@@ -21,20 +21,16 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:camel="http://camel.apache.org/schema/spring"
xsi:schemaLocation="
-http://www.springframework.org/schema/beans
-http://www.springframework.org/schema/beans/spring-beans.xsd
-http://camel.apache.org/schema/spring
-http://camel.apache.org/schema/spring/camel-spring.xsd">
-
- <camel:camelContext id="camelContext">
- <camel:jmxAgent id="agent" disabled="true" />
- <camel:routeBuilder ref="routeBuilder"/>
- </camel:camelContext>
-
- <bean id="routeBuilder"
- class="org.apache.camel.component.gae.login.GLoginRouteBuilder">
- </bean>
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
- <bean id="testService" class="org.apache.camel.component.gae.login.GLoginServiceMock" />
+ <camel:camelContext id="camelContext">
+ <camel:jmxAgent id="agent" disabled="true"/>
+ <camel:routeBuilder ref="routeBuilder"/>
+ </camel:camelContext>
+
+ <bean id="routeBuilder" class="org.apache.camel.component.gae.login.GLoginRouteBuilder"/>
+
+ <bean id="testService" class="org.apache.camel.component.gae.login.GLoginServiceMock"/>
</beans>
Modified: camel/trunk/components/camel-gae/src/test/resources/org/apache/camel/component/gae/mail/context-outbound.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/src/test/resources/org/apache/camel/component/gae/mail/context-outbound.xml?rev=1441743&r1=1441742&r2=1441743&view=diff
==============================================================================
--- camel/trunk/components/camel-gae/src/test/resources/org/apache/camel/component/gae/mail/context-outbound.xml (original)
+++ camel/trunk/components/camel-gae/src/test/resources/org/apache/camel/component/gae/mail/context-outbound.xml Sat Feb 2 13:25:40 2013
@@ -21,18 +21,14 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:camel="http://camel.apache.org/schema/spring"
xsi:schemaLocation="
-http://www.springframework.org/schema/beans
-http://www.springframework.org/schema/beans/spring-beans.xsd
-http://camel.apache.org/schema/spring
-http://camel.apache.org/schema/spring/camel-spring.xsd">
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
<camel:camelContext id="camelContext">
<camel:jmxAgent id="agent" disabled="true" />
<camel:routeBuilder ref="routeBuilder"/>
</camel:camelContext>
- <bean id="routeBuilder"
- class="org.apache.camel.component.gae.mail.GMailOutboundRouteBuilder">
- </bean>
+ <bean id="routeBuilder" class="org.apache.camel.component.gae.mail.GMailOutboundRouteBuilder"/>
</beans>
Modified: camel/trunk/components/camel-gae/src/test/resources/org/apache/camel/component/gae/task/context-combined.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/src/test/resources/org/apache/camel/component/gae/task/context-combined.xml?rev=1441743&r1=1441742&r2=1441743&view=diff
==============================================================================
--- camel/trunk/components/camel-gae/src/test/resources/org/apache/camel/component/gae/task/context-combined.xml (original)
+++ camel/trunk/components/camel-gae/src/test/resources/org/apache/camel/component/gae/task/context-combined.xml Sat Feb 2 13:25:40 2013
@@ -21,18 +21,14 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:camel="http://camel.apache.org/schema/spring"
xsi:schemaLocation="
-http://www.springframework.org/schema/beans
-http://www.springframework.org/schema/beans/spring-beans.xsd
-http://camel.apache.org/schema/spring
-http://camel.apache.org/schema/spring/camel-spring.xsd">
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
<camel:camelContext id="camelContext">
<camel:jmxAgent id="agent" disabled="true" />
<camel:routeBuilder ref="routeBuilder"/>
</camel:camelContext>
- <bean id="routeBuilder"
- class="org.apache.camel.component.gae.task.GTaskCombinedRouteBuilder">
- </bean>
+ <bean id="routeBuilder" class="org.apache.camel.component.gae.task.GTaskCombinedRouteBuilder"/>
</beans>
Modified: camel/trunk/components/camel-gae/src/test/resources/org/apache/camel/component/gae/task/web-combined.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/src/test/resources/org/apache/camel/component/gae/task/web-combined.xml?rev=1441743&r1=1441742&r2=1441743&view=diff
==============================================================================
--- camel/trunk/components/camel-gae/src/test/resources/org/apache/camel/component/gae/task/web-combined.xml (original)
+++ camel/trunk/components/camel-gae/src/test/resources/org/apache/camel/component/gae/task/web-combined.xml Sat Feb 2 13:25:40 2013
@@ -19,26 +19,26 @@
<web-app>
- <!-- tell Spring where it should load the XML file -->
- <context-param>
- <param-name>contextConfigLocation</param-name>
- <param-value>classpath:org/apache/camel/component/gae/task/context-combined.xml</param-value>
- </context-param>
-
- <!--spring context listener which loads the XML file -->
- <listener>
- <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
- </listener>
-
- <servlet>
- <servlet-name>CamelServlet</servlet-name>
- <servlet-class>org.apache.camel.component.servlet.CamelHttpTransportServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>CamelServlet</servlet-name>
- <url-pattern>/camel/*</url-pattern>
- </servlet-mapping>
-
+ <!-- tell Spring where it should load the XML file -->
+ <context-param>
+ <param-name>contextConfigLocation</param-name>
+ <param-value>classpath:org/apache/camel/component/gae/task/context-combined.xml</param-value>
+ </context-param>
+
+ <!--spring context listener which loads the XML file -->
+ <listener>
+ <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+ </listener>
+
+ <servlet>
+ <servlet-name>CamelServlet</servlet-name>
+ <servlet-class>org.apache.camel.component.servlet.CamelHttpTransportServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>CamelServlet</servlet-name>
+ <url-pattern>/camel/*</url-pattern>
+ </servlet-mapping>
+
</web-app>
Modified: camel/trunk/platforms/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=1441743&r1=1441742&r2=1441743&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml (original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Sat Feb 2 13:25:40 2013
@@ -276,8 +276,6 @@
<feature name='camel-gae' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<feature version='${project.version}'>camel-servlet</feature>
- <feature version='${project.version}'>camel-spring</feature>
- <bundle dependency='true'>mvn:commons-io/commons-io/${commons-io-version}</bundle>
<bundle dependency="true">mvn:com.google.guava/guava/${google-guava-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.gdata/${google-gdata-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.gae/${google-app-engine-bundle-version}</bundle>