You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@provisionr.apache.org by as...@apache.org on 2013/06/12 23:18:26 UTC
git commit: PROVISIONR-31. Add Apache Rat pluging for license auditing
Updated Branches:
refs/heads/master 78166fe3a -> 8bffe881f
PROVISIONR-31. Add Apache Rat pluging for license auditing
* I've also fixed all existing violations on the way
Project: http://git-wip-us.apache.org/repos/asf/incubator-provisionr/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-provisionr/commit/8bffe881
Tree: http://git-wip-us.apache.org/repos/asf/incubator-provisionr/tree/8bffe881
Diff: http://git-wip-us.apache.org/repos/asf/incubator-provisionr/diff/8bffe881
Branch: refs/heads/master
Commit: 8bffe881f932d5919f055cf68a0491c9ab91e41d
Parents: 78166fe
Author: Andrei Savu <as...@apache.org>
Authored: Sat Jun 8 19:59:30 2013 +0300
Committer: Andrei Savu <as...@apache.org>
Committed: Mon Jun 10 03:42:15 2013 +0300
----------------------------------------------------------------------
.../src/test/resources/activiti.cfg.xml | 30 ++++++++++----
.../src/test/resources/logging.properties | 18 ++++++++
.../explorer/src/main/webapp/WEB-INF/web.xml | 17 ++++++++
.../api/hardware/BlockDeviceBuilder.java | 19 ++++++++-
.../resources/org.apache.provisionr.console.cfg | 19 ++++++++-
.../apache/provisionr/core/CoreConstants.java | 18 ++++++++
.../org.apache.felix.fileinstall-templates.cfg | 17 ++++++++
.../main/resources/org.apache.provisionr.cfg | 17 ++++++++
.../provisionr/core/puppet/files.pp.mustache | 17 ++++++++
.../provisionr/core/puppet/packages.pp.mustache | 17 ++++++++
.../core/puppet/repositories.pp.mustache | 18 ++++++++
.../provisionr/core/ProvisionrSupportTest.java | 18 ++++++++
core/src/test/resources/templates/test.xml | 17 ++++++++
.../resources/OSGI-INF/blueprint/context.xml | 1 -
examples/src/main/resources/features.xml | 2 -
.../provisionr/examples/templates/cdh3.xml | 17 ++++++++
.../provisionr/examples/templates/cdh4.xml | 17 ++++++++
.../provisionr/examples/templates/jenkins.xml | 17 ++++++++
.../rundeck/src/main/resources/features.xml | 2 -
.../src/test/resources/fixtures/project.xml | 17 ++++++++
.../templates/cdh3.xml.sample | 17 ++++++++
.../provisionr/commands/CreateCommand.java | 18 ++++++++
.../provisionr/commands/CreateImageCommand.java | 18 ++++++++
.../provisionr/commands/templates/test-1.xml | 17 ++++++++
.../provisionr/commands/templates/test-2.xml | 17 ++++++++
parent/pom.xml | 43 ++++++++++++++++++++
.../amazon/activities/CancelSpotRequests.java | 18 ++++++++
.../activities/CheckAllRequestsAreActive.java | 25 ++++++++++--
.../activities/CheckNoRequestsAreOpen.java | 20 ++++++++-
.../GetInstanceIdsFromSpotRequests.java | 38 ++++++++++++-----
.../amazon/activities/RunInstances.java | 18 ++++++++
.../resources/org.apache.provisionr.amazon.cfg | 17 ++++++++
.../amazon/puppet/adminaccess.pp.mustache | 17 ++++++++
.../amazon/puppet/sshd_config.mustache | 18 ++++++++
.../org/apache/provisionr/amazon/puppet/sudoers | 19 +++++++++
.../org/apache/provisionr/amazon/userdata.sh | 23 ++++++++++-
.../amazon/activities/CreatePoolLiveTest.java | 22 +++++++++-
.../activities/DeleteKeyPairLiveTest.java | 6 +--
.../activities/EnsureKeyPairExistsLiveTest.java | 6 +--
providers/amazon/src/test/resources/keys/test | 27 ------------
.../amazon/src/test/resources/keys/test.pub | 1 -
.../org.apache.provisionr.cloudstack.cfg | 17 ++++++++
.../activities/DeleteKeyPairLiveTest.java | 7 ++--
.../activities/EnsureKeyPairExistsLiveTest.java | 6 +--
.../activities/RunInstancesLiveTest.java | 4 +-
.../cloudstack/src/test/resources/keys/test | 27 ------------
.../cloudstack/src/test/resources/keys/test.pub | 1 -
scripts/activities_test.sh | 17 ++++++++
scripts/create_distribution.sh | 18 ++++++++
scripts/deploy.sh | 17 ++++++++
scripts/process_test.sh | 17 ++++++++
scripts/release.sh | 17 ++++++++
52 files changed, 764 insertions(+), 104 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-provisionr/blob/8bffe881/activiti/commands/src/test/resources/activiti.cfg.xml
----------------------------------------------------------------------
diff --git a/activiti/commands/src/test/resources/activiti.cfg.xml b/activiti/commands/src/test/resources/activiti.cfg.xml
index 3bf6173..21cb6d1 100644
--- a/activiti/commands/src/test/resources/activiti.cfg.xml
+++ b/activiti/commands/src/test/resources/activiti.cfg.xml
@@ -1,6 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+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
-<beans xmlns="http://www.springframework.org/schema/beans"
+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.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:context="http://www.springframework.org/schema/context"
xmlns:tx="http://www.springframework.org/schema/tx"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -20,33 +36,33 @@
<bean id="transactionManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
<property name="dataSource" ref="dataSource" />
</bean>
-
+
<bean id="processEngineConfiguration" class="org.activiti.spring.SpringProcessEngineConfiguration">
<property name="dataSource" ref="dataSource" />
<property name="transactionManager" ref="transactionManager" />
<property name="databaseSchemaUpdate" value="true" />
<property name="jobExecutorActivate" value="false" />
<!-- mail server configurations -->
- <property name="mailServerHost" value="outbound.cisco.com" />
+ <property name="mailServerHost" value="outbound.cisco.com" />
<property name="history" value="full" />
</bean>
-
+
<bean id="processEngine" class="org.activiti.spring.ProcessEngineFactoryBean">
<property name="processEngineConfiguration" ref="processEngineConfiguration" />
</bean>
-
+
<bean id="repositoryService" factory-bean="processEngine" factory-method="getRepositoryService" />
<bean id="runtimeService" factory-bean="processEngine" factory-method="getRuntimeService" />
<bean id="taskService" factory-bean="processEngine" factory-method="getTaskService" />
<bean id="historyService" factory-bean="processEngine" factory-method="getHistoryService" />
<bean id="managementService" factory-bean="processEngine" factory-method="getManagementService" />
-
+
<bean id="activitiRule" class="org.activiti.engine.test.ActivitiRule">
<property name="processEngine" ref="processEngine" />
</bean>
<tx:annotation-driven transaction-manager="transactionManager"/>
<!-- End Process engine setup -->
-
+
</beans>
http://git-wip-us.apache.org/repos/asf/incubator-provisionr/blob/8bffe881/activiti/commands/src/test/resources/logging.properties
----------------------------------------------------------------------
diff --git a/activiti/commands/src/test/resources/logging.properties b/activiti/commands/src/test/resources/logging.properties
index ef605ed..5fc2dc9 100644
--- a/activiti/commands/src/test/resources/logging.properties
+++ b/activiti/commands/src/test/resources/logging.properties
@@ -1,3 +1,21 @@
+#
+# 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.
+#
+
org.level = WARNING
handlers = java.util.logging.ConsoleHandler
http://git-wip-us.apache.org/repos/asf/incubator-provisionr/blob/8bffe881/activiti/explorer/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/activiti/explorer/src/main/webapp/WEB-INF/web.xml b/activiti/explorer/src/main/webapp/WEB-INF/web.xml
index fe6babc..6f4fd89 100644
--- a/activiti/explorer/src/main/webapp/WEB-INF/web.xml
+++ b/activiti/explorer/src/main/webapp/WEB-INF/web.xml
@@ -1,4 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+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.
+-->
<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
http://git-wip-us.apache.org/repos/asf/incubator-provisionr/blob/8bffe881/api/src/main/java/org/apache/provisionr/api/hardware/BlockDeviceBuilder.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/provisionr/api/hardware/BlockDeviceBuilder.java b/api/src/main/java/org/apache/provisionr/api/hardware/BlockDeviceBuilder.java
index 17fb5c3..f4c1e7e 100644
--- a/api/src/main/java/org/apache/provisionr/api/hardware/BlockDeviceBuilder.java
+++ b/api/src/main/java/org/apache/provisionr/api/hardware/BlockDeviceBuilder.java
@@ -1,8 +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.provisionr.api.hardware;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
-
import org.apache.provisionr.api.util.BuilderWithOptions;
public class BlockDeviceBuilder extends BuilderWithOptions<BlockDeviceBuilder> {
http://git-wip-us.apache.org/repos/asf/incubator-provisionr/blob/8bffe881/console/src/main/resources/org.apache.provisionr.console.cfg
----------------------------------------------------------------------
diff --git a/console/src/main/resources/org.apache.provisionr.console.cfg b/console/src/main/resources/org.apache.provisionr.console.cfg
index 5e012c3..d3d0210 100644
--- a/console/src/main/resources/org.apache.provisionr.console.cfg
+++ b/console/src/main/resources/org.apache.provisionr.console.cfg
@@ -1,5 +1,22 @@
+#
+# 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.
+#
#
-# REST API Configurations
+# Web Console & REST API Configurations
#
http://git-wip-us.apache.org/repos/asf/incubator-provisionr/blob/8bffe881/core/src/main/java/org/apache/provisionr/core/CoreConstants.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/provisionr/core/CoreConstants.java b/core/src/main/java/org/apache/provisionr/core/CoreConstants.java
index b24c111..175bcc2 100644
--- a/core/src/main/java/org/apache/provisionr/core/CoreConstants.java
+++ b/core/src/main/java/org/apache/provisionr/core/CoreConstants.java
@@ -1,3 +1,21 @@
+/*
+ * 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.provisionr.core;
public class CoreConstants {
http://git-wip-us.apache.org/repos/asf/incubator-provisionr/blob/8bffe881/core/src/main/resources/org.apache.felix.fileinstall-templates.cfg
----------------------------------------------------------------------
diff --git a/core/src/main/resources/org.apache.felix.fileinstall-templates.cfg b/core/src/main/resources/org.apache.felix.fileinstall-templates.cfg
index 4182045..5f69a0f 100644
--- a/core/src/main/resources/org.apache.felix.fileinstall-templates.cfg
+++ b/core/src/main/resources/org.apache.felix.fileinstall-templates.cfg
@@ -1,3 +1,20 @@
+#
+# 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.
+#
#
# FileInstall configurations for custom templates
http://git-wip-us.apache.org/repos/asf/incubator-provisionr/blob/8bffe881/core/src/main/resources/org.apache.provisionr.cfg
----------------------------------------------------------------------
diff --git a/core/src/main/resources/org.apache.provisionr.cfg b/core/src/main/resources/org.apache.provisionr.cfg
index cc2e4a4..df4242d 100644
--- a/core/src/main/resources/org.apache.provisionr.cfg
+++ b/core/src/main/resources/org.apache.provisionr.cfg
@@ -1,3 +1,20 @@
+#
+# 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.
+#
#
# Database configuration
http://git-wip-us.apache.org/repos/asf/incubator-provisionr/blob/8bffe881/core/src/main/resources/org/apache/provisionr/core/puppet/files.pp.mustache
----------------------------------------------------------------------
diff --git a/core/src/main/resources/org/apache/provisionr/core/puppet/files.pp.mustache b/core/src/main/resources/org/apache/provisionr/core/puppet/files.pp.mustache
index e13abb2..dd5ab62 100644
--- a/core/src/main/resources/org/apache/provisionr/core/puppet/files.pp.mustache
+++ b/core/src/main/resources/org/apache/provisionr/core/puppet/files.pp.mustache
@@ -1,3 +1,20 @@
+#
+# 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 { "wget":
ensure => "installed"
http://git-wip-us.apache.org/repos/asf/incubator-provisionr/blob/8bffe881/core/src/main/resources/org/apache/provisionr/core/puppet/packages.pp.mustache
----------------------------------------------------------------------
diff --git a/core/src/main/resources/org/apache/provisionr/core/puppet/packages.pp.mustache b/core/src/main/resources/org/apache/provisionr/core/puppet/packages.pp.mustache
index 0826e53..3ec852c 100644
--- a/core/src/main/resources/org/apache/provisionr/core/puppet/packages.pp.mustache
+++ b/core/src/main/resources/org/apache/provisionr/core/puppet/packages.pp.mustache
@@ -1,3 +1,20 @@
+#
+# 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.
+#
# Ensure all packages listed bellow are installed
Package { ensure => "installed" }
http://git-wip-us.apache.org/repos/asf/incubator-provisionr/blob/8bffe881/core/src/main/resources/org/apache/provisionr/core/puppet/repositories.pp.mustache
----------------------------------------------------------------------
diff --git a/core/src/main/resources/org/apache/provisionr/core/puppet/repositories.pp.mustache b/core/src/main/resources/org/apache/provisionr/core/puppet/repositories.pp.mustache
index 67c4385..a4f062b 100644
--- a/core/src/main/resources/org/apache/provisionr/core/puppet/repositories.pp.mustache
+++ b/core/src/main/resources/org/apache/provisionr/core/puppet/repositories.pp.mustache
@@ -1,3 +1,21 @@
+#
+# 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.
+#
+
# Register repositories and refresh index
define apt::repository (
http://git-wip-us.apache.org/repos/asf/incubator-provisionr/blob/8bffe881/core/src/test/java/org/apache/provisionr/core/ProvisionrSupportTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/provisionr/core/ProvisionrSupportTest.java b/core/src/test/java/org/apache/provisionr/core/ProvisionrSupportTest.java
index 93eb226..8c86d79 100644
--- a/core/src/test/java/org/apache/provisionr/core/ProvisionrSupportTest.java
+++ b/core/src/test/java/org/apache/provisionr/core/ProvisionrSupportTest.java
@@ -1,3 +1,21 @@
+/*
+ * 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.provisionr.core;
import static org.fest.assertions.api.Assertions.assertThat;
http://git-wip-us.apache.org/repos/asf/incubator-provisionr/blob/8bffe881/core/src/test/resources/templates/test.xml
----------------------------------------------------------------------
diff --git a/core/src/test/resources/templates/test.xml b/core/src/test/resources/templates/test.xml
index 380a73a..0a7d50d 100644
--- a/core/src/test/resources/templates/test.xml
+++ b/core/src/test/resources/templates/test.xml
@@ -1,4 +1,21 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+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.
+-->
<template os-version="10.04 LTS" id="jenkins">
<description>Just testing</description>
<files>
http://git-wip-us.apache.org/repos/asf/incubator-provisionr/blob/8bffe881/examples/src/main/resources/OSGI-INF/blueprint/context.xml
----------------------------------------------------------------------
diff --git a/examples/src/main/resources/OSGI-INF/blueprint/context.xml b/examples/src/main/resources/OSGI-INF/blueprint/context.xml
index 0348784..900cc81 100644
--- a/examples/src/main/resources/OSGI-INF/blueprint/context.xml
+++ b/examples/src/main/resources/OSGI-INF/blueprint/context.xml
@@ -15,7 +15,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
<!-- Just a placeholder for future examples on how to use the Java API -->
</blueprint>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-provisionr/blob/8bffe881/examples/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/examples/src/main/resources/features.xml b/examples/src/main/resources/features.xml
index e1cf09d..88e1233 100644
--- a/examples/src/main/resources/features.xml
+++ b/examples/src/main/resources/features.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,7 +16,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<features name="provisionr-examples-features-${project.version}"
xmlns="http://karaf.apache.org/xmlns/features/v1.0.0">
http://git-wip-us.apache.org/repos/asf/incubator-provisionr/blob/8bffe881/examples/src/main/resources/org/apache/provisionr/examples/templates/cdh3.xml
----------------------------------------------------------------------
diff --git a/examples/src/main/resources/org/apache/provisionr/examples/templates/cdh3.xml b/examples/src/main/resources/org/apache/provisionr/examples/templates/cdh3.xml
index a289182..53b1c0c 100644
--- a/examples/src/main/resources/org/apache/provisionr/examples/templates/cdh3.xml
+++ b/examples/src/main/resources/org/apache/provisionr/examples/templates/cdh3.xml
@@ -1,4 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+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.
+-->
<template id="cdh3" os-version="10.04 LTS">
<description>
Cloudera CDH3 template for Ubuntu 10.04 LTS (lucid) including the Cloudera Manager installer
http://git-wip-us.apache.org/repos/asf/incubator-provisionr/blob/8bffe881/examples/src/main/resources/org/apache/provisionr/examples/templates/cdh4.xml
----------------------------------------------------------------------
diff --git a/examples/src/main/resources/org/apache/provisionr/examples/templates/cdh4.xml b/examples/src/main/resources/org/apache/provisionr/examples/templates/cdh4.xml
index bd9181b..fa08d90 100644
--- a/examples/src/main/resources/org/apache/provisionr/examples/templates/cdh4.xml
+++ b/examples/src/main/resources/org/apache/provisionr/examples/templates/cdh4.xml
@@ -1,4 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+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.
+-->
<template id="cdh4" os-version="10.04 LTS">
<description>
Cloudera CDH4 template for Ubuntu 10.04 LTS (lucid)
http://git-wip-us.apache.org/repos/asf/incubator-provisionr/blob/8bffe881/examples/src/main/resources/org/apache/provisionr/examples/templates/jenkins.xml
----------------------------------------------------------------------
diff --git a/examples/src/main/resources/org/apache/provisionr/examples/templates/jenkins.xml b/examples/src/main/resources/org/apache/provisionr/examples/templates/jenkins.xml
index c7297f3..c066944 100644
--- a/examples/src/main/resources/org/apache/provisionr/examples/templates/jenkins.xml
+++ b/examples/src/main/resources/org/apache/provisionr/examples/templates/jenkins.xml
@@ -1,4 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+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.
+-->
<template id="jenkins">
<description>A short template that installs the latest jenkins with git & svn</description>
<packages>
http://git-wip-us.apache.org/repos/asf/incubator-provisionr/blob/8bffe881/integration/rundeck/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/integration/rundeck/src/main/resources/features.xml b/integration/rundeck/src/main/resources/features.xml
index 11e433a..2563501 100644
--- a/integration/rundeck/src/main/resources/features.xml
+++ b/integration/rundeck/src/main/resources/features.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,7 +16,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<features name="provisionr-rundeck-features-${project.version}"
xmlns="http://karaf.apache.org/xmlns/features/v1.0.0">
http://git-wip-us.apache.org/repos/asf/incubator-provisionr/blob/8bffe881/integration/rundeck/src/test/resources/fixtures/project.xml
----------------------------------------------------------------------
diff --git a/integration/rundeck/src/test/resources/fixtures/project.xml b/integration/rundeck/src/test/resources/fixtures/project.xml
index abb2cc1..d8a3ebc 100644
--- a/integration/rundeck/src/test/resources/fixtures/project.xml
+++ b/integration/rundeck/src/test/resources/fixtures/project.xml
@@ -1,4 +1,21 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+ 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.
+ -->
<project>
<node username="psql" tags="a,b" name="db-1" hostname="db-1.example.com">
<attribute value="val1" name="key1"/>
http://git-wip-us.apache.org/repos/asf/incubator-provisionr/blob/8bffe881/karaf/assembly/src/main/filtered-resources/templates/cdh3.xml.sample
----------------------------------------------------------------------
diff --git a/karaf/assembly/src/main/filtered-resources/templates/cdh3.xml.sample b/karaf/assembly/src/main/filtered-resources/templates/cdh3.xml.sample
index a625b80..b636b49 100644
--- a/karaf/assembly/src/main/filtered-resources/templates/cdh3.xml.sample
+++ b/karaf/assembly/src/main/filtered-resources/templates/cdh3.xml.sample
@@ -1,4 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+ -->
<template id="cloudera-cdh3" os-version="10.04 LTS">
<description>Cloudera CDH3 template for Ubuntu 10.04 LTS (lucid) including Cloudera Manager</description>
<packages>
http://git-wip-us.apache.org/repos/asf/incubator-provisionr/blob/8bffe881/karaf/commands/src/main/java/org/apache/provisionr/commands/CreateCommand.java
----------------------------------------------------------------------
diff --git a/karaf/commands/src/main/java/org/apache/provisionr/commands/CreateCommand.java b/karaf/commands/src/main/java/org/apache/provisionr/commands/CreateCommand.java
index d2f9f66..1696c2c 100644
--- a/karaf/commands/src/main/java/org/apache/provisionr/commands/CreateCommand.java
+++ b/karaf/commands/src/main/java/org/apache/provisionr/commands/CreateCommand.java
@@ -1,3 +1,21 @@
+/*
+ * 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.provisionr.commands;
import com.google.common.annotations.VisibleForTesting;
http://git-wip-us.apache.org/repos/asf/incubator-provisionr/blob/8bffe881/karaf/commands/src/main/java/org/apache/provisionr/commands/CreateImageCommand.java
----------------------------------------------------------------------
diff --git a/karaf/commands/src/main/java/org/apache/provisionr/commands/CreateImageCommand.java b/karaf/commands/src/main/java/org/apache/provisionr/commands/CreateImageCommand.java
index 38e7f96..0d865d6 100644
--- a/karaf/commands/src/main/java/org/apache/provisionr/commands/CreateImageCommand.java
+++ b/karaf/commands/src/main/java/org/apache/provisionr/commands/CreateImageCommand.java
@@ -1,3 +1,21 @@
+/*
+ * 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.provisionr.commands;
import com.google.common.annotations.VisibleForTesting;
http://git-wip-us.apache.org/repos/asf/incubator-provisionr/blob/8bffe881/karaf/commands/src/test/resources/org/apache/provisionr/commands/templates/test-1.xml
----------------------------------------------------------------------
diff --git a/karaf/commands/src/test/resources/org/apache/provisionr/commands/templates/test-1.xml b/karaf/commands/src/test/resources/org/apache/provisionr/commands/templates/test-1.xml
index bbaf908..b5d3719 100644
--- a/karaf/commands/src/test/resources/org/apache/provisionr/commands/templates/test-1.xml
+++ b/karaf/commands/src/test/resources/org/apache/provisionr/commands/templates/test-1.xml
@@ -1,4 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+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.
+-->
<template id="test-1">
<description>
Random test template
http://git-wip-us.apache.org/repos/asf/incubator-provisionr/blob/8bffe881/karaf/commands/src/test/resources/org/apache/provisionr/commands/templates/test-2.xml
----------------------------------------------------------------------
diff --git a/karaf/commands/src/test/resources/org/apache/provisionr/commands/templates/test-2.xml b/karaf/commands/src/test/resources/org/apache/provisionr/commands/templates/test-2.xml
index ede1778..40f93f8 100644
--- a/karaf/commands/src/test/resources/org/apache/provisionr/commands/templates/test-2.xml
+++ b/karaf/commands/src/test/resources/org/apache/provisionr/commands/templates/test-2.xml
@@ -1,4 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+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.
+-->
<template id="test-2" os-version="10.04 LTS">
<description>
Random test template
http://git-wip-us.apache.org/repos/asf/incubator-provisionr/blob/8bffe881/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 14994bf..cfd88f3 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -424,5 +424,48 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>with-rat</id>
+ <activation>
+ <property>
+ <name>!skipRat</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>0.9</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <excludes>
+ <exlude>**/*.md</exlude>
+ <exclude>NOTICE</exclude>
+ <exclude>.git/**</exclude>
+ <exclude>.gitignore</exclude>
+ <exclude>.idea/**</exclude>
+ <exclude>**/*.iml</exclude>
+ <exclude>**/*.project</exclude>
+ <exclude>**/*.classpath</exclude>
+ <exclude>**/id_rsa_test</exclude>
+ <exclude>**/id_rsa_test.pub</exclude>
+ <exclude>**/*.bpmn20.xml</exclude>
+ <exclude>**/*.activiti</exclude>
+ <exclude>**/*.csv</exclude>
+ <exclude>**/target/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-provisionr/blob/8bffe881/providers/amazon/src/main/java/org/apache/provisionr/amazon/activities/CancelSpotRequests.java
----------------------------------------------------------------------
diff --git a/providers/amazon/src/main/java/org/apache/provisionr/amazon/activities/CancelSpotRequests.java b/providers/amazon/src/main/java/org/apache/provisionr/amazon/activities/CancelSpotRequests.java
index 77e3709..6fdae06 100644
--- a/providers/amazon/src/main/java/org/apache/provisionr/amazon/activities/CancelSpotRequests.java
+++ b/providers/amazon/src/main/java/org/apache/provisionr/amazon/activities/CancelSpotRequests.java
@@ -1,3 +1,21 @@
+/*
+ * 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.provisionr.amazon.activities;
import static com.google.common.base.Preconditions.checkNotNull;
http://git-wip-us.apache.org/repos/asf/incubator-provisionr/blob/8bffe881/providers/amazon/src/main/java/org/apache/provisionr/amazon/activities/CheckAllRequestsAreActive.java
----------------------------------------------------------------------
diff --git a/providers/amazon/src/main/java/org/apache/provisionr/amazon/activities/CheckAllRequestsAreActive.java b/providers/amazon/src/main/java/org/apache/provisionr/amazon/activities/CheckAllRequestsAreActive.java
index 1103d77..5f9a9b4 100644
--- a/providers/amazon/src/main/java/org/apache/provisionr/amazon/activities/CheckAllRequestsAreActive.java
+++ b/providers/amazon/src/main/java/org/apache/provisionr/amazon/activities/CheckAllRequestsAreActive.java
@@ -1,13 +1,30 @@
-package org.apache.provisionr.amazon.activities;
+/*
+ * 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.
+ */
-import org.activiti.engine.delegate.DelegateExecution;
+package org.apache.provisionr.amazon.activities;
import com.amazonaws.services.ec2.AmazonEC2;
import com.amazonaws.services.ec2.model.SpotInstanceRequest;
+import com.google.common.base.Predicate;
+import org.activiti.engine.delegate.DelegateExecution;
import org.apache.provisionr.amazon.ProcessVariables;
import org.apache.provisionr.amazon.core.ProviderClientCache;
import org.apache.provisionr.api.pool.Pool;
-import com.google.common.base.Predicate;
public class CheckAllRequestsAreActive extends AllSpotRequestsMatchPredicate {
@@ -30,6 +47,6 @@ public class CheckAllRequestsAreActive extends AllSpotRequestsMatchPredicate {
@Override
public void execute(AmazonEC2 client, Pool pool, DelegateExecution execution) throws Exception {
- super.execute(client, pool, execution);
+ super.execute(client, pool, execution);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-provisionr/blob/8bffe881/providers/amazon/src/main/java/org/apache/provisionr/amazon/activities/CheckNoRequestsAreOpen.java
----------------------------------------------------------------------
diff --git a/providers/amazon/src/main/java/org/apache/provisionr/amazon/activities/CheckNoRequestsAreOpen.java b/providers/amazon/src/main/java/org/apache/provisionr/amazon/activities/CheckNoRequestsAreOpen.java
index 2eebaa2..99c2964 100644
--- a/providers/amazon/src/main/java/org/apache/provisionr/amazon/activities/CheckNoRequestsAreOpen.java
+++ b/providers/amazon/src/main/java/org/apache/provisionr/amazon/activities/CheckNoRequestsAreOpen.java
@@ -1,9 +1,27 @@
+/*
+ * 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.provisionr.amazon.activities;
import com.amazonaws.services.ec2.model.SpotInstanceRequest;
+import com.google.common.base.Predicate;
import org.apache.provisionr.amazon.ProcessVariables;
import org.apache.provisionr.amazon.core.ProviderClientCache;
-import com.google.common.base.Predicate;
public class CheckNoRequestsAreOpen extends AllSpotRequestsMatchPredicate {
http://git-wip-us.apache.org/repos/asf/incubator-provisionr/blob/8bffe881/providers/amazon/src/main/java/org/apache/provisionr/amazon/activities/GetInstanceIdsFromSpotRequests.java
----------------------------------------------------------------------
diff --git a/providers/amazon/src/main/java/org/apache/provisionr/amazon/activities/GetInstanceIdsFromSpotRequests.java b/providers/amazon/src/main/java/org/apache/provisionr/amazon/activities/GetInstanceIdsFromSpotRequests.java
index 7fa9b1b..4639b77 100644
--- a/providers/amazon/src/main/java/org/apache/provisionr/amazon/activities/GetInstanceIdsFromSpotRequests.java
+++ b/providers/amazon/src/main/java/org/apache/provisionr/amazon/activities/GetInstanceIdsFromSpotRequests.java
@@ -1,24 +1,40 @@
-package org.apache.provisionr.amazon.activities;
-
-import java.util.ArrayList;
-import java.util.List;
+/*
+ * 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.
+ */
-import org.activiti.engine.delegate.DelegateExecution;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+package org.apache.provisionr.amazon.activities;
import com.amazonaws.services.ec2.AmazonEC2;
import com.amazonaws.services.ec2.model.DescribeSpotInstanceRequestsRequest;
import com.amazonaws.services.ec2.model.DescribeSpotInstanceRequestsResult;
import com.amazonaws.services.ec2.model.SpotInstanceRequest;
+import java.util.ArrayList;
+import java.util.List;
+import org.activiti.engine.delegate.DelegateExecution;
import org.apache.provisionr.amazon.ProcessVariables;
import org.apache.provisionr.amazon.core.ProviderClientCache;
import org.apache.provisionr.api.pool.Pool;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class GetInstanceIdsFromSpotRequests extends AmazonActivity {
private static final Logger LOG = LoggerFactory.getLogger(GetInstanceIdsFromSpotRequests.class);
-
+
public GetInstanceIdsFromSpotRequests(ProviderClientCache providerClientCache) {
super(providerClientCache);
}
@@ -28,10 +44,10 @@ public class GetInstanceIdsFromSpotRequests extends AmazonActivity {
LOG.info(">> retrieving instance Ids from spot request Ids");
@SuppressWarnings("unchecked")
- List<String> requestIds =
- (List<String>) execution.getVariable(ProcessVariables.SPOT_INSTANCE_REQUEST_IDS);
+ List<String> requestIds =
+ (List<String>) execution.getVariable(ProcessVariables.SPOT_INSTANCE_REQUEST_IDS);
DescribeSpotInstanceRequestsResult result = client.describeSpotInstanceRequests(
- new DescribeSpotInstanceRequestsRequest().withSpotInstanceRequestIds(requestIds));
+ new DescribeSpotInstanceRequestsRequest().withSpotInstanceRequestIds(requestIds));
List<String> instanceIds = new ArrayList<String>();
for (SpotInstanceRequest spotRequest : result.getSpotInstanceRequests()) {
if (spotRequest.getInstanceId() != null) {
http://git-wip-us.apache.org/repos/asf/incubator-provisionr/blob/8bffe881/providers/amazon/src/main/java/org/apache/provisionr/amazon/activities/RunInstances.java
----------------------------------------------------------------------
diff --git a/providers/amazon/src/main/java/org/apache/provisionr/amazon/activities/RunInstances.java b/providers/amazon/src/main/java/org/apache/provisionr/amazon/activities/RunInstances.java
index aa04a2d..cc65fa3 100644
--- a/providers/amazon/src/main/java/org/apache/provisionr/amazon/activities/RunInstances.java
+++ b/providers/amazon/src/main/java/org/apache/provisionr/amazon/activities/RunInstances.java
@@ -1,3 +1,21 @@
+/*
+ * 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.provisionr.amazon.activities;
import com.amazonaws.AmazonWebServiceRequest;
http://git-wip-us.apache.org/repos/asf/incubator-provisionr/blob/8bffe881/providers/amazon/src/main/resources/org.apache.provisionr.amazon.cfg
----------------------------------------------------------------------
diff --git a/providers/amazon/src/main/resources/org.apache.provisionr.amazon.cfg b/providers/amazon/src/main/resources/org.apache.provisionr.amazon.cfg
index d5837d6..c342baa 100644
--- a/providers/amazon/src/main/resources/org.apache.provisionr.amazon.cfg
+++ b/providers/amazon/src/main/resources/org.apache.provisionr.amazon.cfg
@@ -1,3 +1,20 @@
+#
+# 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.
+#
# Amazon provisioning service configuration
http://git-wip-us.apache.org/repos/asf/incubator-provisionr/blob/8bffe881/providers/amazon/src/main/resources/org/apache/provisionr/amazon/puppet/adminaccess.pp.mustache
----------------------------------------------------------------------
diff --git a/providers/amazon/src/main/resources/org/apache/provisionr/amazon/puppet/adminaccess.pp.mustache b/providers/amazon/src/main/resources/org/apache/provisionr/amazon/puppet/adminaccess.pp.mustache
index 8551619..4d8b3ac 100644
--- a/providers/amazon/src/main/resources/org/apache/provisionr/amazon/puppet/adminaccess.pp.mustache
+++ b/providers/amazon/src/main/resources/org/apache/provisionr/amazon/puppet/adminaccess.pp.mustache
@@ -1,3 +1,20 @@
+#
+# 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.
+#
#
# Make sure only a single user can access the machines over ssh
http://git-wip-us.apache.org/repos/asf/incubator-provisionr/blob/8bffe881/providers/amazon/src/main/resources/org/apache/provisionr/amazon/puppet/sshd_config.mustache
----------------------------------------------------------------------
diff --git a/providers/amazon/src/main/resources/org/apache/provisionr/amazon/puppet/sshd_config.mustache b/providers/amazon/src/main/resources/org/apache/provisionr/amazon/puppet/sshd_config.mustache
index 68eb68f..06dbfce 100644
--- a/providers/amazon/src/main/resources/org/apache/provisionr/amazon/puppet/sshd_config.mustache
+++ b/providers/amazon/src/main/resources/org/apache/provisionr/amazon/puppet/sshd_config.mustache
@@ -1,3 +1,21 @@
+#
+# 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 generated configuration file
# See the sshd_config(5) manpage for details
http://git-wip-us.apache.org/repos/asf/incubator-provisionr/blob/8bffe881/providers/amazon/src/main/resources/org/apache/provisionr/amazon/puppet/sudoers
----------------------------------------------------------------------
diff --git a/providers/amazon/src/main/resources/org/apache/provisionr/amazon/puppet/sudoers b/providers/amazon/src/main/resources/org/apache/provisionr/amazon/puppet/sudoers
index 2292dce..c7a8c46 100644
--- a/providers/amazon/src/main/resources/org/apache/provisionr/amazon/puppet/sudoers
+++ b/providers/amazon/src/main/resources/org/apache/provisionr/amazon/puppet/sudoers
@@ -1,3 +1,21 @@
+#
+# 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.
+#
+
# This file MUST be edited with the 'visudo' command as root.
#
# Please consider adding local content in /etc/sudoers.d/ instead of
@@ -5,6 +23,7 @@
#
# See the man page for details on how to write a sudoers file.
#
+
Defaults env_reset
Defaults secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
http://git-wip-us.apache.org/repos/asf/incubator-provisionr/blob/8bffe881/providers/amazon/src/main/resources/org/apache/provisionr/amazon/userdata.sh
----------------------------------------------------------------------
diff --git a/providers/amazon/src/main/resources/org/apache/provisionr/amazon/userdata.sh b/providers/amazon/src/main/resources/org/apache/provisionr/amazon/userdata.sh
index 9009fd6..d659822 100644
--- a/providers/amazon/src/main/resources/org/apache/provisionr/amazon/userdata.sh
+++ b/providers/amazon/src/main/resources/org/apache/provisionr/amazon/userdata.sh
@@ -1,11 +1,30 @@
#!/bin/bash
+#
+# 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.
+#
+
set -e -x
export DEBIAN_FRONTEND=noninteractive
-# adds the distribution codename as a shell var
+# Adds the distribution codename as a shell var
. /etc/lsb-release
-# add the puppet package repository
+# Add the puppet package repository
+# TODO: add support for .rpm
wget http://apt.puppetlabs.com/puppetlabs-release-$DISTRIB_CODENAME.deb
dpkg -i puppetlabs-release-$DISTRIB_CODENAME.deb
http://git-wip-us.apache.org/repos/asf/incubator-provisionr/blob/8bffe881/providers/amazon/src/test/java/org/apache/provisionr/amazon/activities/CreatePoolLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/amazon/src/test/java/org/apache/provisionr/amazon/activities/CreatePoolLiveTest.java b/providers/amazon/src/test/java/org/apache/provisionr/amazon/activities/CreatePoolLiveTest.java
index 18e0644..c934fda 100644
--- a/providers/amazon/src/test/java/org/apache/provisionr/amazon/activities/CreatePoolLiveTest.java
+++ b/providers/amazon/src/test/java/org/apache/provisionr/amazon/activities/CreatePoolLiveTest.java
@@ -1,3 +1,21 @@
+/*
+ * 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.provisionr.amazon.activities;
import java.util.ArrayList;
@@ -29,8 +47,8 @@ public abstract class CreatePoolLiveTest<T extends AmazonActivity> extends Amazo
final AdminAccess adminAccess = AdminAccess.builder()
.username("admin")
- .publicKey(getResourceAsString("keys/test.pub"))
- .privateKey(getResourceAsString("keys/test"))
+ .publicKey(getResourceAsString("/org/apache/provisionr/test/id_rsa_test.pub"))
+ .privateKey(getResourceAsString("/org/apache/provisionr/test/id_rsa_test"))
.createAdminAccess();
final Network network = Network.builder().addRules(
http://git-wip-us.apache.org/repos/asf/incubator-provisionr/blob/8bffe881/providers/amazon/src/test/java/org/apache/provisionr/amazon/activities/DeleteKeyPairLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/amazon/src/test/java/org/apache/provisionr/amazon/activities/DeleteKeyPairLiveTest.java b/providers/amazon/src/test/java/org/apache/provisionr/amazon/activities/DeleteKeyPairLiveTest.java
index 997eb5d..d2368cc 100644
--- a/providers/amazon/src/test/java/org/apache/provisionr/amazon/activities/DeleteKeyPairLiveTest.java
+++ b/providers/amazon/src/test/java/org/apache/provisionr/amazon/activities/DeleteKeyPairLiveTest.java
@@ -44,7 +44,7 @@ public class DeleteKeyPairLiveTest extends AmazonActivityLiveTest<DeleteKeyPair>
super.setUp();
client.importKeyPair(new ImportKeyPairRequest().withKeyName(KEYPAIR_NAME)
- .withPublicKeyMaterial(getResourceAsString("keys/test.pub")));
+ .withPublicKeyMaterial(getResourceAsString("/org/apache/provisionr/test/id_rsa_test.pub")));
}
@Override
@@ -57,8 +57,8 @@ public class DeleteKeyPairLiveTest extends AmazonActivityLiveTest<DeleteKeyPair>
public void testDeleteKeyPair() throws Exception {
final AdminAccess adminAccess = AdminAccess.builder()
.username("admin")
- .publicKey(getResourceAsString("keys/test.pub"))
- .privateKey(getResourceAsString("keys/test"))
+ .publicKey(getResourceAsString("/org/apache/provisionr/test/id_rsa_test.pub"))
+ .privateKey(getResourceAsString("/org/apache/provisionr/test/id_rsa_test"))
.createAdminAccess();
DelegateExecution execution = mock(DelegateExecution.class);
http://git-wip-us.apache.org/repos/asf/incubator-provisionr/blob/8bffe881/providers/amazon/src/test/java/org/apache/provisionr/amazon/activities/EnsureKeyPairExistsLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/amazon/src/test/java/org/apache/provisionr/amazon/activities/EnsureKeyPairExistsLiveTest.java b/providers/amazon/src/test/java/org/apache/provisionr/amazon/activities/EnsureKeyPairExistsLiveTest.java
index e2697ee..e17cef2 100644
--- a/providers/amazon/src/test/java/org/apache/provisionr/amazon/activities/EnsureKeyPairExistsLiveTest.java
+++ b/providers/amazon/src/test/java/org/apache/provisionr/amazon/activities/EnsureKeyPairExistsLiveTest.java
@@ -36,7 +36,7 @@ public class EnsureKeyPairExistsLiveTest extends AmazonActivityLiveTest<EnsureKe
/**
* Computed in an Amazon specific way
*/
- public static final String TEST_KEY_FINGERPRINT = "2f:e9:a0:bc:17:71:3a:7e:d7:c0:16:99:0d:62:8e:be";
+ public static final String TEST_KEY_FINGERPRINT = "0e:2f:16:f4:15:a3:80:e8:c5:1a:8b:85:e4:fe:69:fa";
private final String KEYPAIR_NAME = KeyPairs.formatNameFromBusinessKey(BUSINESS_KEY);
@@ -50,8 +50,8 @@ public class EnsureKeyPairExistsLiveTest extends AmazonActivityLiveTest<EnsureKe
public void testEnsureKeyPairExists() throws Exception {
final AdminAccess adminAccess = AdminAccess.builder()
.username("admin")
- .publicKey(getResourceAsString("keys/test.pub"))
- .privateKey(getResourceAsString("keys/test"))
+ .publicKey(getResourceAsString("/org/apache/provisionr/test/id_rsa_test.pub"))
+ .privateKey(getResourceAsString("/org/apache/provisionr/test/id_rsa_test"))
.createAdminAccess();
DelegateExecution execution = mock(DelegateExecution.class);
http://git-wip-us.apache.org/repos/asf/incubator-provisionr/blob/8bffe881/providers/amazon/src/test/resources/keys/test
----------------------------------------------------------------------
diff --git a/providers/amazon/src/test/resources/keys/test b/providers/amazon/src/test/resources/keys/test
deleted file mode 100644
index 28f157a..0000000
--- a/providers/amazon/src/test/resources/keys/test
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEoQIBAAKCAQEAnCGwJNGPvH9NKlDQVJI62qCYj3+VlY3/GWYUyzPFt85SOtad
-4v6sWaVxPQlcyEWIGGqy/VDri0jj6n+hgczUIumnRRj4V28RNSOh8WFU5Vpi0i4+
-Ltr+EEDKwsC5T9QiHO7jRe8zCS5LFchoXLpvpgq9ETNDiUASy9QErd9sNChIlceR
-1dvnGiYzuXpBdxvh+HH2CiBw8oavyy6NmxmGwzeEXTeW1VBkD2zE1TULKS2Hqh98
-Tkmq0KfY2fcq/TqQjCCF8CPnlWtq+2sEO1gpbZW0WxoWLAemA2dUOVqJC6g7Lus4
-pBbxwbSy+N6FgF7N4Uqe27x+mb2dKSpOVtmUrwIBIwKCAQAaw/JPdGHIitoHQQ3F
-WuWEkI8uiuZxaMylRLMbhTfWXeI1+OfdxUId/xq6AZrggPLCW28kHIAmgYYoMyMA
-Tv/LeIMTKNodngLzKq4MH1Bh1Pr/daRCi/EKGbxb5oYq8SprXCb2C7+bLIHmeiCE
-7MKuwAMnhSGFPi8boLBYUi/ObQm5rL081ImkvgasVpS+y3VwMpAqgUAz/8N4yOmu
-CpS7+1Tab71XsyiFB71AYYPF6WeRzZf64bUAkvVTOWgfyf3uLLlb9lQcJxiTFaCG
-x28zD2PDDVcsAkkwpbEPzyxD4CwvkoOdK+tLhzT/sBI9NCvP9Eo0JMQOrInp2erN
-u4D7AoGBAMkA4S3hqMA1Sbcm6cO7QudRqOXipTQd9vwKyTiCp8IJgz0iL769asgZ
-OxtSGlibpAv6c8fBPeLhh3GxH34aUXMpyuK4Xb6vEOHjW6wbz3FMY6hbtWkqVcxV
-YzuvS0g3//4iVkLq4tRT38KxS7xwYRLN4HRaTwRojLSW3BhtNURLAoGBAMbZzBQR
-W1lOiABP7MS4NiLtohyE3pulO79/0VdL3rZxJNhA0VztpdpDhIQ2NzHgYp+H0b4A
-PH1rxyVuCM1+ztQfphSfU+jsy88TZoUNUq93WEYNltsrpIQSPY+t1r6dDJChvktP
-CUDf6uXJZQlVoruBA8777Ffbl8QTgbGO3oqtAoGAROpb1TdtDrMvN3sOUbyL94m2
-QDBzJ8/CZQsDKVFeFqQs/wRoJCOvlQ/3Ag2FYDVc0OgnsjOgMIfWqqMgvYVdwRWk
-pYEKMr+uBE3zi3c/zxLgVvrfHL4OybbgMbhxlRqDp5a+fVfYvdOdLM8SpwH1ZYhq
-NoVc65GPU9vzsJp4qbMCgYBglaxEQvHa66EkuRs6+mNwDQWY0tKGHQ5kVAaYHYlu
-jrof5Pf578WV5ket7nKUkY79B3SA24sYWOuzGDApTDiS6s0Cs8mrpjcbb9K1p2Ks
-/3QExMWdp3vLHs1xrDUawU8+73mvjMn68GrHYdH9ODkZPqoUE/Zz0Q8zWe6JcUeF
-LwKBgQCsRfXZDWdzntwNYA7ql3iftGvvDpolvWCNzJ+EqojczIyY6j7VKzDqZB/t
-w798cUCXxMxY2l8kTlnbGoRonRB9oMCwXChBtbk9/QXFjQk3dHeH8UWcPWjykBCK
-LGPedvMZrURdREVAeFfrQevQZ03tnPG7QQQheRERCcFL+7vSfA==
------END RSA PRIVATE KEY-----
http://git-wip-us.apache.org/repos/asf/incubator-provisionr/blob/8bffe881/providers/amazon/src/test/resources/keys/test.pub
----------------------------------------------------------------------
diff --git a/providers/amazon/src/test/resources/keys/test.pub b/providers/amazon/src/test/resources/keys/test.pub
deleted file mode 100644
index f528fbd..0000000
--- a/providers/amazon/src/test/resources/keys/test.pub
+++ /dev/null
@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAnCGwJNGPvH9NKlDQVJI62qCYj3+VlY3/GWYUyzPFt85SOtad4v6sWaVxPQlcyEWIGGqy/VDri0jj6n+hgczUIumnRRj4V28RNSOh8WFU5Vpi0i4+Ltr+EEDKwsC5T9QiHO7jRe8zCS5LFchoXLpvpgq9ETNDiUASy9QErd9sNChIlceR1dvnGiYzuXpBdxvh+HH2CiBw8oavyy6NmxmGwzeEXTeW1VBkD2zE1TULKS2Hqh98Tkmq0KfY2fcq/TqQjCCF8CPnlWtq+2sEO1gpbZW0WxoWLAemA2dUOVqJC6g7Lus4pBbxwbSy+N6FgF7N4Uqe27x+mb2dKSpOVtmUrw== andreisavu@tmac-3.local
http://git-wip-us.apache.org/repos/asf/incubator-provisionr/blob/8bffe881/providers/cloudstack/src/main/resources/org.apache.provisionr.cloudstack.cfg
----------------------------------------------------------------------
diff --git a/providers/cloudstack/src/main/resources/org.apache.provisionr.cloudstack.cfg b/providers/cloudstack/src/main/resources/org.apache.provisionr.cloudstack.cfg
index f826bb0..88800db 100644
--- a/providers/cloudstack/src/main/resources/org.apache.provisionr.cloudstack.cfg
+++ b/providers/cloudstack/src/main/resources/org.apache.provisionr.cloudstack.cfg
@@ -1,3 +1,20 @@
+#
+# 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.
+#
# CloudStack provisioning service configuration
http://git-wip-us.apache.org/repos/asf/incubator-provisionr/blob/8bffe881/providers/cloudstack/src/test/java/org/apache/provisionr/cloudstack/activities/DeleteKeyPairLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/cloudstack/src/test/java/org/apache/provisionr/cloudstack/activities/DeleteKeyPairLiveTest.java b/providers/cloudstack/src/test/java/org/apache/provisionr/cloudstack/activities/DeleteKeyPairLiveTest.java
index 8abcafe..8460505 100644
--- a/providers/cloudstack/src/test/java/org/apache/provisionr/cloudstack/activities/DeleteKeyPairLiveTest.java
+++ b/providers/cloudstack/src/test/java/org/apache/provisionr/cloudstack/activities/DeleteKeyPairLiveTest.java
@@ -39,7 +39,8 @@ public class DeleteKeyPairLiveTest extends CloudStackActivityLiveTest<DeleteKeyP
public void setUp() throws Exception {
super.setUp();
logKeyPairs();
- context.getApi().getSSHKeyPairClient().registerSSHKeyPair(KEYPAIR_NAME, getResourceAsString("keys/test.pub"));
+ context.getApi().getSSHKeyPairClient().registerSSHKeyPair(KEYPAIR_NAME,
+ getResourceAsString("/org/apache/provisionr/test/id_rsa_test.pub"));
}
@Override
@@ -54,8 +55,8 @@ public class DeleteKeyPairLiveTest extends CloudStackActivityLiveTest<DeleteKeyP
public void testDeleteKeyPair() throws Exception {
final AdminAccess adminAccess = AdminAccess.builder()
.username("admin")
- .publicKey(getResourceAsString("keys/test.pub"))
- .privateKey(getResourceAsString("keys/test"))
+ .publicKey(getResourceAsString("/org/apache/provisionr/test/id_rsa_test.pub"))
+ .privateKey(getResourceAsString("/org/apache/provisionr/test/id_rsa_test"))
.createAdminAccess();
DelegateExecution execution = mock(DelegateExecution.class);
http://git-wip-us.apache.org/repos/asf/incubator-provisionr/blob/8bffe881/providers/cloudstack/src/test/java/org/apache/provisionr/cloudstack/activities/EnsureKeyPairExistsLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/cloudstack/src/test/java/org/apache/provisionr/cloudstack/activities/EnsureKeyPairExistsLiveTest.java b/providers/cloudstack/src/test/java/org/apache/provisionr/cloudstack/activities/EnsureKeyPairExistsLiveTest.java
index 141125d..2ea588a 100644
--- a/providers/cloudstack/src/test/java/org/apache/provisionr/cloudstack/activities/EnsureKeyPairExistsLiveTest.java
+++ b/providers/cloudstack/src/test/java/org/apache/provisionr/cloudstack/activities/EnsureKeyPairExistsLiveTest.java
@@ -34,7 +34,7 @@ import static org.mockito.Mockito.when;
public class EnsureKeyPairExistsLiveTest extends CloudStackActivityLiveTest<EnsureKeyPairExists> {
- public static final String TEST_KEY_FINGERPRINT = "15:0b:a4:43:dd:58:19:9e:84:ca:db:31:a8:6b:b6:c3";
+ public static final String TEST_KEY_FINGERPRINT = "0e:2f:16:f4:15:a3:80:e8:c5:1a:8b:85:e4:fe:69:fa";
private final String KEYPAIR_NAME = KeyPairs.formatNameFromBusinessKey(BUSINESS_KEY);
@Override
@@ -56,8 +56,8 @@ public class EnsureKeyPairExistsLiveTest extends CloudStackActivityLiveTest<Ensu
public void testEnsureKeyPairExists() throws Exception {
final AdminAccess adminAccess = AdminAccess.builder()
.username("admin")
- .publicKey(getResourceAsString("keys/test.pub"))
- .privateKey(getResourceAsString("keys/test"))
+ .publicKey(getResourceAsString("/org/apache/provisionr/test/id_rsa_test.pub"))
+ .privateKey(getResourceAsString("/org/apache/provisionr/test/id_rsa_test"))
.createAdminAccess();
DelegateExecution execution = mock(DelegateExecution.class);
http://git-wip-us.apache.org/repos/asf/incubator-provisionr/blob/8bffe881/providers/cloudstack/src/test/java/org/apache/provisionr/cloudstack/activities/RunInstancesLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/cloudstack/src/test/java/org/apache/provisionr/cloudstack/activities/RunInstancesLiveTest.java b/providers/cloudstack/src/test/java/org/apache/provisionr/cloudstack/activities/RunInstancesLiveTest.java
index 56a0b90..d5ab6d3 100644
--- a/providers/cloudstack/src/test/java/org/apache/provisionr/cloudstack/activities/RunInstancesLiveTest.java
+++ b/providers/cloudstack/src/test/java/org/apache/provisionr/cloudstack/activities/RunInstancesLiveTest.java
@@ -58,8 +58,8 @@ public class RunInstancesLiveTest extends CloudStackActivityLiveTest<RunInstance
final AdminAccess adminAccess = AdminAccess.builder()
.username("admin")
- .publicKey(getResourceAsString("keys/test.pub"))
- .privateKey(getResourceAsString("keys/test"))
+ .publicKey(getResourceAsString("/org/apache/provisionr/test/id_rsa_test.pub"))
+ .privateKey(getResourceAsString("/org/apache/provisionr/test/id_rsa_test"))
.createAdminAccess();
final Network network = Network.builder().addRules(
http://git-wip-us.apache.org/repos/asf/incubator-provisionr/blob/8bffe881/providers/cloudstack/src/test/resources/keys/test
----------------------------------------------------------------------
diff --git a/providers/cloudstack/src/test/resources/keys/test b/providers/cloudstack/src/test/resources/keys/test
deleted file mode 100644
index 28f157a..0000000
--- a/providers/cloudstack/src/test/resources/keys/test
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEoQIBAAKCAQEAnCGwJNGPvH9NKlDQVJI62qCYj3+VlY3/GWYUyzPFt85SOtad
-4v6sWaVxPQlcyEWIGGqy/VDri0jj6n+hgczUIumnRRj4V28RNSOh8WFU5Vpi0i4+
-Ltr+EEDKwsC5T9QiHO7jRe8zCS5LFchoXLpvpgq9ETNDiUASy9QErd9sNChIlceR
-1dvnGiYzuXpBdxvh+HH2CiBw8oavyy6NmxmGwzeEXTeW1VBkD2zE1TULKS2Hqh98
-Tkmq0KfY2fcq/TqQjCCF8CPnlWtq+2sEO1gpbZW0WxoWLAemA2dUOVqJC6g7Lus4
-pBbxwbSy+N6FgF7N4Uqe27x+mb2dKSpOVtmUrwIBIwKCAQAaw/JPdGHIitoHQQ3F
-WuWEkI8uiuZxaMylRLMbhTfWXeI1+OfdxUId/xq6AZrggPLCW28kHIAmgYYoMyMA
-Tv/LeIMTKNodngLzKq4MH1Bh1Pr/daRCi/EKGbxb5oYq8SprXCb2C7+bLIHmeiCE
-7MKuwAMnhSGFPi8boLBYUi/ObQm5rL081ImkvgasVpS+y3VwMpAqgUAz/8N4yOmu
-CpS7+1Tab71XsyiFB71AYYPF6WeRzZf64bUAkvVTOWgfyf3uLLlb9lQcJxiTFaCG
-x28zD2PDDVcsAkkwpbEPzyxD4CwvkoOdK+tLhzT/sBI9NCvP9Eo0JMQOrInp2erN
-u4D7AoGBAMkA4S3hqMA1Sbcm6cO7QudRqOXipTQd9vwKyTiCp8IJgz0iL769asgZ
-OxtSGlibpAv6c8fBPeLhh3GxH34aUXMpyuK4Xb6vEOHjW6wbz3FMY6hbtWkqVcxV
-YzuvS0g3//4iVkLq4tRT38KxS7xwYRLN4HRaTwRojLSW3BhtNURLAoGBAMbZzBQR
-W1lOiABP7MS4NiLtohyE3pulO79/0VdL3rZxJNhA0VztpdpDhIQ2NzHgYp+H0b4A
-PH1rxyVuCM1+ztQfphSfU+jsy88TZoUNUq93WEYNltsrpIQSPY+t1r6dDJChvktP
-CUDf6uXJZQlVoruBA8777Ffbl8QTgbGO3oqtAoGAROpb1TdtDrMvN3sOUbyL94m2
-QDBzJ8/CZQsDKVFeFqQs/wRoJCOvlQ/3Ag2FYDVc0OgnsjOgMIfWqqMgvYVdwRWk
-pYEKMr+uBE3zi3c/zxLgVvrfHL4OybbgMbhxlRqDp5a+fVfYvdOdLM8SpwH1ZYhq
-NoVc65GPU9vzsJp4qbMCgYBglaxEQvHa66EkuRs6+mNwDQWY0tKGHQ5kVAaYHYlu
-jrof5Pf578WV5ket7nKUkY79B3SA24sYWOuzGDApTDiS6s0Cs8mrpjcbb9K1p2Ks
-/3QExMWdp3vLHs1xrDUawU8+73mvjMn68GrHYdH9ODkZPqoUE/Zz0Q8zWe6JcUeF
-LwKBgQCsRfXZDWdzntwNYA7ql3iftGvvDpolvWCNzJ+EqojczIyY6j7VKzDqZB/t
-w798cUCXxMxY2l8kTlnbGoRonRB9oMCwXChBtbk9/QXFjQk3dHeH8UWcPWjykBCK
-LGPedvMZrURdREVAeFfrQevQZ03tnPG7QQQheRERCcFL+7vSfA==
------END RSA PRIVATE KEY-----
http://git-wip-us.apache.org/repos/asf/incubator-provisionr/blob/8bffe881/providers/cloudstack/src/test/resources/keys/test.pub
----------------------------------------------------------------------
diff --git a/providers/cloudstack/src/test/resources/keys/test.pub b/providers/cloudstack/src/test/resources/keys/test.pub
deleted file mode 100644
index f528fbd..0000000
--- a/providers/cloudstack/src/test/resources/keys/test.pub
+++ /dev/null
@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAnCGwJNGPvH9NKlDQVJI62qCYj3+VlY3/GWYUyzPFt85SOtad4v6sWaVxPQlcyEWIGGqy/VDri0jj6n+hgczUIumnRRj4V28RNSOh8WFU5Vpi0i4+Ltr+EEDKwsC5T9QiHO7jRe8zCS5LFchoXLpvpgq9ETNDiUASy9QErd9sNChIlceR1dvnGiYzuXpBdxvh+HH2CiBw8oavyy6NmxmGwzeEXTeW1VBkD2zE1TULKS2Hqh98Tkmq0KfY2fcq/TqQjCCF8CPnlWtq+2sEO1gpbZW0WxoWLAemA2dUOVqJC6g7Lus4pBbxwbSy+N6FgF7N4Uqe27x+mb2dKSpOVtmUrw== andreisavu@tmac-3.local
http://git-wip-us.apache.org/repos/asf/incubator-provisionr/blob/8bffe881/scripts/activities_test.sh
----------------------------------------------------------------------
diff --git a/scripts/activities_test.sh b/scripts/activities_test.sh
index de4dba7..55911f1 100755
--- a/scripts/activities_test.sh
+++ b/scripts/activities_test.sh
@@ -1,4 +1,21 @@
#!/bin/bash
+#
+# 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.
+#
if [ -z $1 ];
then
http://git-wip-us.apache.org/repos/asf/incubator-provisionr/blob/8bffe881/scripts/create_distribution.sh
----------------------------------------------------------------------
diff --git a/scripts/create_distribution.sh b/scripts/create_distribution.sh
index be4ebbb..a0ec701 100755
--- a/scripts/create_distribution.sh
+++ b/scripts/create_distribution.sh
@@ -1,2 +1,20 @@
#!/bin/bash
+#
+# 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.
+#
+
mvn -DskipTests -DskipKarafTests -Pwith-assembly clean install
http://git-wip-us.apache.org/repos/asf/incubator-provisionr/blob/8bffe881/scripts/deploy.sh
----------------------------------------------------------------------
diff --git a/scripts/deploy.sh b/scripts/deploy.sh
index 1eb318f..d99406b 100755
--- a/scripts/deploy.sh
+++ b/scripts/deploy.sh
@@ -1,4 +1,21 @@
#!/bin/bash
+#
+# 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.
+#
# utility script to automatically unzip and setup AWS credentails from Mavem for snapshot builds
if [ $# -ne 2 ]; then
http://git-wip-us.apache.org/repos/asf/incubator-provisionr/blob/8bffe881/scripts/process_test.sh
----------------------------------------------------------------------
diff --git a/scripts/process_test.sh b/scripts/process_test.sh
index b12090a..124b8f6 100755
--- a/scripts/process_test.sh
+++ b/scripts/process_test.sh
@@ -1,4 +1,21 @@
#!/bin/bash
+#
+# 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.
+#
if [ -z $1 ];
then
http://git-wip-us.apache.org/repos/asf/incubator-provisionr/blob/8bffe881/scripts/release.sh
----------------------------------------------------------------------
diff --git a/scripts/release.sh b/scripts/release.sh
index 9e76355..b1c7463 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -1,4 +1,21 @@
#!/bin/bash
+#
+# 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.
+#
RELEASE_VERSION=$1
DEVELOPMENT_VERSION=$2