af 0.3.13.beta.5 → 0.3.16.1

data/spec/assets/tests/spring/auto-reconfig-test-app/src/main/java/org/cloudfoundry/test/ServiceController.java

@@ -1,122 +0,0 @@
-/*
- * Copyright 2009-2011 the original author or authors.
- *
- * 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.
- */
-package org.cloudfoundry.test;
-
-import java.io.IOException;
-import java.util.Properties;
-
-import javax.servlet.http.HttpServletResponse;
-
-import org.hibernate.impl.SessionFactoryImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * Controller that exposes basic information about dependencies that were
- * auto-wired on app startup
- *
- * @author Jennifer Hickey
- *
- */
-@Controller
-public class ServiceController {
-
-	@Autowired
-	private ServiceHolder serviceHolder;
-
-	@RequestMapping(value = "/", method = RequestMethod.GET)
-	@ResponseBody
-	public String hello(HttpServletResponse response) throws IOException {
-		return "Welcome to the vcap-java test application";
-	}
-
-	@RequestMapping(value = "/properties", method = RequestMethod.GET)
-	public ResponseEntity<Properties> getCloudProperties() {
-		if (serviceHolder.getCloudProperties() == null) {
-			return new ResponseEntity<Properties>(HttpStatus.NOT_FOUND);
-		}
-		return new ResponseEntity<Properties>(serviceHolder.getCloudProperties(), HttpStatus.OK);
-	}
-
-	@RequestMapping(value = "/mysql", method = RequestMethod.GET)
-	public ResponseEntity<String> getMySQLDataSourceDBUrl() {
-		if (serviceHolder.getMySqlDataSource() == null) {
-			return new ResponseEntity<String>(HttpStatus.NOT_FOUND);
-		}
-		return new ResponseEntity<String>(serviceHolder.getMySqlDataSource().getUrl(), HttpStatus.OK);
-	}
-
-	@RequestMapping(value = "/postgres", method = RequestMethod.GET)
-	public ResponseEntity<String> getPostgresDataSourceDBUrl() {
-		if (serviceHolder.getPostgresDataSource() == null) {
-			return new ResponseEntity<String>(HttpStatus.NOT_FOUND);
-		}
-		return new ResponseEntity<String>(serviceHolder.getPostgresDataSource().getUrl(), HttpStatus.OK);
-	}
-
-	@RequestMapping(value = "/mongo", method = RequestMethod.GET)
-	public ResponseEntity<String> getMongoHostAddress() {
-		if (serviceHolder.getMongoDbFactory() == null) {
-			return new ResponseEntity<String>(HttpStatus.NOT_FOUND);
-		}
-		return new ResponseEntity<String>(serviceHolder.getMongoDbFactory().getDb().getMongo().getAddress().toString(),
-				HttpStatus.OK);
-	}
-
-	@RequestMapping(value = "/rabbit", method = RequestMethod.GET)
-	public ResponseEntity<String> getRabbitHost() {
-		if (serviceHolder.getRabbitConnectionFactory() == null) {
-			return new ResponseEntity<String>(HttpStatus.NOT_FOUND);
-		}
-		return new ResponseEntity<String>(serviceHolder.getRabbitConnectionFactory().getHost() + ":"
-				+ serviceHolder.getRabbitConnectionFactory().getPort(), HttpStatus.OK);
-	}
-
-	@RequestMapping(value = "/redis/class", method = RequestMethod.GET)
-	public ResponseEntity<String> getRedisClass() {
-		if (serviceHolder.getRedisConnectionFactory() == null) {
-			return new ResponseEntity<String>(HttpStatus.NOT_FOUND);
-		}
-		return new ResponseEntity<String>(serviceHolder.getRedisConnectionFactory().getClass().getName(), HttpStatus.OK);
-	}
-
-	@RequestMapping(value = "/redis/host", method = RequestMethod.GET)
-	public ResponseEntity<String> getRedisHostAddress() {
-		if (serviceHolder.getRedisConnectionFactory() == null) {
-			return new ResponseEntity<String>(HttpStatus.NOT_FOUND);
-		}
-		// Jedis is the only client we currently support
-		JedisConnectionFactory jedisConnectionFactory = (JedisConnectionFactory) serviceHolder
-				.getRedisConnectionFactory();
-		return new ResponseEntity<String>(
-				jedisConnectionFactory.getHostName() + ':' + jedisConnectionFactory.getPort(), HttpStatus.OK);
-	}
-
-	@RequestMapping(value = "/hibernate", method = RequestMethod.GET)
-	public ResponseEntity<String> getHibernateDialectClass() {
-		if (serviceHolder.getSessionFactory() == null) {
-			return new ResponseEntity<String>(HttpStatus.NOT_FOUND);
-		}
-		return new ResponseEntity<String>(((SessionFactoryImpl)serviceHolder.getSessionFactory()).getDialect().getClass().getName(),
-				HttpStatus.OK);
-	}
-}

data/spec/assets/tests/spring/auto-reconfig-test-app/src/main/java/org/cloudfoundry/test/ServiceHolder.java

@@ -1,97 +0,0 @@
-/*
- * Copyright 2009-2011 the original author or authors.
- *
- * 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.
- */
-package org.cloudfoundry.test;
-
-import java.util.Properties;
-
-import javax.sql.DataSource;
-
-import org.apache.tomcat.dbcp.dbcp.BasicDataSource;
-import org.hibernate.SessionFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.amqp.rabbit.connection.ConnectionFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.data.mongodb.MongoDbFactory;
-import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.stereotype.Component;
-
-/**
- * Container for auto-wired dependencies. Serves as verification of proper
- * dependency resolution by AppContext
- *
- * @author Jennifer Hickey
- *
- */
-@Component
-public class ServiceHolder {
-
-	private final Logger log = LoggerFactory.getLogger(ServiceHolder.class);
-
-	@Autowired(required=false)
-	private MongoDbFactory mongoDbFactory;
-
-	@Autowired(required=false)
-	private ConnectionFactory rabbitConnectionFactory;
-
-	@Autowired(required=false)
-	private RedisConnectionFactory redisConnectionFactory;
-
-	@Autowired(required=false)
-	@Qualifier("test_mysql_database")
-	private DataSource mysqlDataSource;
-
-	@Autowired(required=false)
-	@Qualifier("cloudProperties")
-	private Properties cloudProperties;
-
-	@Autowired(required=false)
-	@Qualifier("test_postgres_database")
-	private DataSource postgresDataSource;
-
-	@Autowired(required=false)
-	private SessionFactory sessionFactory;
-
-	public MongoDbFactory getMongoDbFactory() {
-		return mongoDbFactory;
-	}
-
-	public ConnectionFactory getRabbitConnectionFactory() {
-		return rabbitConnectionFactory;
-	}
-
-	public RedisConnectionFactory getRedisConnectionFactory() {
-		return redisConnectionFactory;
-	}
-
-	public BasicDataSource getMySqlDataSource() {
-		return (BasicDataSource) mysqlDataSource;
-	}
-
-	public Properties getCloudProperties() {
-		log.info("Retrieving cloud properties: " + cloudProperties);
-		return cloudProperties;
-	}
-
-	public BasicDataSource getPostgresDataSource() {
-		return (BasicDataSource) postgresDataSource;
-	}
-
-	public SessionFactory getSessionFactory() {
-		return sessionFactory;
-	}
-}

data/spec/assets/tests/spring/auto-reconfig-test-app/src/main/java/org/cloudfoundry/test/TestApplicationContextInitializer.java

@@ -1,45 +0,0 @@
-/*
- * Copyright 2009-2011 the original author or authors.
- *
- * 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.
- */
-package org.cloudfoundry.test;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.context.ApplicationContextInitializer;
-import org.springframework.context.ConfigurableApplicationContext;
-
-/**
- * Selects a profile to use based on the value of the TEST_PROFILE environment
- * variable. If TEST_PROFILE is not specified, it defaults to the mongo-auto-staging
- * profile.
- *
- * @author Jennifer Hickey
- *
- */
-public class TestApplicationContextInitializer implements ApplicationContextInitializer<ConfigurableApplicationContext> {
-
-	private final Logger log = LoggerFactory.getLogger(TestApplicationContextInitializer.class);
-
-	@Override
-	public void initialize(ConfigurableApplicationContext applicationContext) {
-		String profile = applicationContext.getEnvironment().getProperty("TEST_PROFILE");
-		log.info("Using profile " + profile);
-		if (profile == null || profile.isEmpty()) {
-			applicationContext.getEnvironment().setActiveProfiles("mongo-auto-staging");
-		} else {
-			applicationContext.getEnvironment().setActiveProfiles(profile);
-		}
-	}
-}

data/spec/assets/tests/spring/auto-reconfig-test-app/src/main/resources/META-INF/spring/database.properties

@@ -1,4 +0,0 @@
-database.password=
-database.url=jdbc:mysql://localhost:3306/vcap-java-test-app
-database.username=sa
-database.driverClassName=com.mysql.jdbc.Driver

data/spec/assets/tests/spring/auto-reconfig-test-app/src/main/resources/META-INF/spring/root-context.xml

@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="windows-1252"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
-	xmlns:rabbit="http://www.springframework.org/schema/rabbit"
-	xmlns:context="http://www.springframework.org/schema/context"
-	xmlns:mvc="http://www.springframework.org/schema/mvc" xmlns:cloud="http://schema.cloudfoundry.org/spring"
-	xmlns:mongo="http://www.springframework.org/schema/data/mongo"
-	xsi:schemaLocation="
-http://www.springframework.org/schema/data/mongo http://www.springframework.org/schema/data/mongo/spring-mongo-1.0.xsd
-http://www.springframework.org/schema/beans
-http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
-http://www.springframework.org/schema/context
-http://www.springframework.org/schema/context/spring-context-3.1.xsd
-http://schema.cloudfoundry.org/spring
-http://schema.cloudfoundry.org/spring/cloudfoundry-spring-0.8.xsd
-http://www.springframework.org/schema/mvc
-http://www.springframework.org/schema/mvc/spring-mvc-3.1.xsd
-http://www.springframework.org/schema/rabbit
-http://www.springframework.org/schema/rabbit/spring-rabbit-1.0.xsd">
-
-	<cloud:properties id="cloudProperties" />
-
-	<context:property-placeholder location="classpath*:META-INF/spring/*.properties"/>
-
-	<beans profile="mongo-auto-staging">
-		<mongo:db-factory id="mongoDbFactory" dbname="pwdtest" host="127.0.0.1" port="1234" username="test_user" password="efgh"/>
-	</beans>
-
-	<beans profile="redis-auto-staging">
-		 <bean id="jedisConnectionFactory" class="org.springframework.data.redis.connection.jedis.JedisConnectionFactory"
-		       p:hostName="localhost" p:port="1345"/>
-	</beans>
-
-	<beans profile="rabbit-auto-staging">
-		<rabbit:connection-factory id="rabbitConnectionFactory" host="localhost" password="testpwd" port="1238"
-			username="testuser" virtual-host="virthost" />
-	</beans>
-
-	<beans profile="auto-staging-off-using-cloud-service">
-		<bean class="org.apache.tomcat.dbcp.dbcp.BasicDataSource" id="test_mysql_database">
-			<property name="driverClassName" value="${database.driverClassName}"/>
-			<property name="url" value="${database.url}"/>
-			<property name="username" value="${database.username}"/>
-			<property name="password" value="${database.password}"/>
-		</bean>
-		<cloud:mongo-db-factory id="mongo" />
-	</beans>
-
-	<beans profile="auto-staging-off-using-service-scan">
-		<bean class="org.apache.tomcat.dbcp.dbcp.BasicDataSource" id="test_mysql_database">
-			<property name="driverClassName" value="${database.driverClassName}"/>
-			<property name="url" value="${database.url}"/>
-			<property name="username" value="${database.username}"/>
-			<property name="password" value="${database.password}"/>
-		</bean>
-		<cloud:service-scan />
-	</beans>
-
-	<beans profile="hibernate-auto-staging">
-		<bean name="test_mysql_database"
-			class="org.springframework.jdbc.datasource.DriverManagerDataSource">
-			<property name="url" value="jdbc:hsql:localdb" />
-		</bean>
-
-		<bean name="txAwareDXProxy"
-			class="org.springframework.jdbc.datasource.TransactionAwareDataSourceProxy">
-			<property name="targetDataSource" ref="test_mysql_database" />
-		</bean>
-
-		<bean id="sessionFactory"
-			class="org.springframework.orm.hibernate3.LocalSessionFactoryBean"
-			lazy-init="true">
-			<property name="dataSource" ref="test_mysql_database" />
-			<property name="hibernateProperties">
-				<props>
-					<prop key="hibernate.dialect">org.hibernate.dialect.HSQLDialect</prop>
-					<prop key="hibernate.show_sql">true</prop>
-					<prop key="hibernate.generate_statistics">false</prop>
-					<!-- To avoid connecting to database during testing -->
-					<prop key="hibernate.temp.use_jdbc_metadata_defaults">false</prop>
-				</props>
-			</property>
-		</bean>
-	</beans>
-
-</beans>

data/spec/assets/tests/spring/auto-reconfig-test-app/src/main/resources/log4j.xml

@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration PUBLIC "-//APACHE//DTD LOG4J 1.2//EN" "log4j.dtd">
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-
-	<!-- Appenders -->
-	<appender name="console" class="org.apache.log4j.ConsoleAppender">
-		<param name="Target" value="System.out" />
-		<layout class="org.apache.log4j.PatternLayout">
-			<param name="ConversionPattern" value="%-5p: %c - %m%n" />
-		</layout>
-	</appender>
-
-	<!-- Application Loggers -->
-	<logger name="org.springframework.data">
-		<level value="info" />
-	</logger>
-
-	<!-- 3rdparty Loggers -->
-	<logger name="org.springframework.core">
-		<level value="info" />
-	</logger>
-
-	<logger name="org.springframework.beans">
-		<level value="info" />
-	</logger>
-
-	<logger name="org.springframework.context">
-		<level value="info" />
-	</logger>
-
-	<logger name="org.springframework.web">
-		<level value="info" />
-	</logger>
-
-	<!-- Root Logger -->
-	<root>
-		<priority value="info" />
-		<appender-ref ref="console" />
-	</root>
-
-</log4j:configuration>

data/spec/assets/tests/spring/auto-reconfig-test-app/src/main/webapp/META-INF/MANIFEST.MF

@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-Class-Path:

data/spec/assets/tests/spring/auto-reconfig-test-app/src/main/webapp/WEB-INF/spring/servlet-context.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="windows-1252"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
-	xmlns:context="http://www.springframework.org/schema/context"
-	xmlns:mvc="http://www.springframework.org/schema/mvc"
-	xsi:schemaLocation="
-http://www.springframework.org/schema/beans
-http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-http://www.springframework.org/schema/context
-http://www.springframework.org/schema/context/spring-context-3.0.xsd
-http://www.springframework.org/schema/mvc
-http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd">
-
-	<!-- Use @Component annotations for bean definitions -->
-	<context:component-scan base-package="org.cloudfoundry.test" />
-
-	<!-- Use @Controller annotations for MVC controller definitions -->
-	<mvc:annotation-driven />
-
-	<mvc:default-servlet-handler/>
-
-</beans>

data/spec/assets/tests/spring/auto-reconfig-test-app/src/main/webapp/WEB-INF/web.xml

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
-http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
-
-	<context-param>
-		<param-name>contextInitializerClasses</param-name>
-		<param-value>org.cloudfoundry.test.TestApplicationContextInitializer</param-value>
-	</context-param>
-	<context-param>
-		<param-name>contextConfigLocation</param-name>
-		<param-value>classpath:/META-INF/spring/root-context.xml</param-value>
-	</context-param>
-	<listener>
-		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-	</listener>
-	<servlet>
-		<servlet-name>vcap-java-test-app</servlet-name>
-		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
-		<init-param>
-			<param-name>contextConfigLocation</param-name>
-			<param-value>/WEB-INF/spring/servlet-context.xml</param-value>
-		</init-param>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>vcap-java-test-app</servlet-name>
-		<url-pattern>/</url-pattern>
-	</servlet-mapping>
-	<session-config>
-		<session-timeout>30</session-timeout>
-	</session-config>
-</web-app>