Skip to content

Commit f21ae26

Browse files
committed
refactored base package to com
1 parent cfb0a27 commit f21ae26

File tree

146 files changed

+396
-383
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

146 files changed

+396
-383
lines changed

README-Microsoft

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ destroy - deletes a previously created environment
1717
Your credentials file must have this format, but the property values for
1818
name, username, and password can be anything.
1919

20-
type=org.urbancode.terraform.credentials.microsoft.CredentialsMicrosoft
20+
type=com.urbancode.terraform.credentials.microsoft.CredentialsMicrosoft
2121
name=my.azure.creds
2222
username=asdf
2323
password=jkl

README-Rackspace

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ destroy - deletes a previously created environment
1212
-----------
1313
A Rackspace credentials file requires a valid Rackspace username and API key.
1414

15-
type=org.urbancode.terraform.credentials.rackspace.CredentialsRackspace
15+
type=com.urbancode.terraform.credentials.rackspace.CredentialsRackspace
1616
name=my.rackspace.creds
1717
username=myusername
1818
api-key=0123456789abcdef
@@ -84,7 +84,7 @@ that is managing the HTTP traffic of the 2 web servers.
8484

8585
<?xml version="1.0" encoding="UTF-8"?>
8686
<context
87-
xmlns="org.urbancode.terraform.tasks.rackspace">
87+
xmlns="com.urbancode.terraform.tasks.rackspace">
8888
<environment
8989
name="SIT-env">
9090
<server name="app-server" append-suffix="true" region="ORD" flavor="2GB" image="8bf22129-8483-462b-a020-1754ec822770"/>

README-vmware

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ snapshot - take a snapshot of all VMs in the environment.
6868
element under the context:
6969

7070
<context
71-
xmlns="org.urbancode.terraform.tasks.vmware">
71+
xmlns="com.urbancode.terraform.tasks.vmware">
7272
<environment
7373
name="terra-env"
7474
folder-name="terra-folder">
@@ -191,7 +191,7 @@ snapshot - take a snapshot of all VMs in the environment.
191191

192192
<?xml version="1.0" encoding="UTF-8"?>
193193
<context
194-
xmlns="org.urbancode.terraform.tasks.vmware">
194+
xmlns="com.urbancode.terraform.tasks.vmware">
195195
<environment
196196
name="terra-env"
197197
folder-name="terra-folder">
@@ -245,13 +245,13 @@ snapshot - take a snapshot of all VMs in the environment.
245245
The name of the element is: <chef:post-create-task>. It goes inside a clone element.
246246
You must have this namespace in your context element:
247247

248-
xmlns:chef="org.urbancode.terraform.tasks.vmware.chef"
248+
xmlns:chef="com.urbancode.terraform.tasks.vmware.chef"
249249

250250
So for example, your opening context tag might look like this:
251251

252252
<context
253-
xmlns="org.urbancode.terraform.tasks.vmware"
254-
xmlns:chef="org.urbancode.terraform.tasks.vmware.chef">
253+
xmlns="com.urbancode.terraform.tasks.vmware"
254+
xmlns:chef="com.urbancode.terraform.tasks.vmware.chef">
255255

256256
This task will:
257257
1. check if Chef is installed, and if not, install it
@@ -334,7 +334,7 @@ snapshot - take a snapshot of all VMs in the environment.
334334
Example file - creds-example.key
335335
Contents:
336336

337-
type=org.urbancode.terraform.credentials.vmware.CredentialsVmware
337+
type=com.urbancode.terraform.credentials.vmware.CredentialsVmware
338338
name=my.vmware.creds
339339
username=my-vcenter-user
340340
password=my-vcenter-password

bin/terraform

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ javacmd="java"
1313
INPUT_FILE=$2
1414
CREDS=$3
1515

16-
create_class=org.urbancode.terraform.main.Main
17-
destroy_class=org.urbancode.terraform.main.Main
18-
restore_class=org.urbancode.terraform.main.Main
16+
create_class=com.urbancode.terraform.main.Main
17+
destroy_class=com.urbancode.terraform.main.Main
18+
restore_class=com.urbancode.terraform.main.Main
1919

2020
# set TERRAFORM_HOME
2121
SHELL_NAME=$0

bin/terraform.cmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ goto start
88
:start
99
set javacmd=java
1010

11-
set main_class=org.urbancode.terraform.main.Main
11+
set main_class=com.urbancode.terraform.main.Main
1212

1313
set currdir=%cd%
1414
set SCRIPT_HOME="%~dp0"

examples/credentials-examples/aws-creds-template.key

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
type=org.urbancode.terraform.credentials.aws.CredentialsAWS
1+
type=com.urbancode.terraform.credentials.aws.CredentialsAWS
22
name=name.of.credentials
33
44
password=not.currently.used.for.aws
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
type=org.urbancode.terraform.credentials.rackspace.CredentialsRackspace
1+
type=com.urbancode.terraform.credentials.rackspace.CredentialsRackspace
22
name=my.rackspace.test
33
username=myusername
44
api-key=0123456789abcdef

examples/credentials-examples/vmware-creds-example.key

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
type=org.urbancode.terraform.credentials.vmware.CredentialsVmware
1+
type=com.urbancode.terraform.credentials.vmware.CredentialsVmware
22
name=my.vmware.creds
33
username=myvcenterusername
44
password=myvcenterpassword

examples/xml-templates/aws-ec2-1.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ This is an Environment Template used to create an environment with Amazon Web Se
55
-->
66

77
<!-- The context points to what Tasks to use for each element of the template-->
8-
<context xmlns="org.urbancode.terraform.tasks.aws" >
8+
<context xmlns="com.urbancode.terraform.tasks.aws" >
99
<!-- The name of your instances will be prefixed with your environment name-->
1010
<environment name="durr" >
1111
<!-- This is an instance to launch. It has a name, an Amazon Machine Image.

examples/xml-templates/aws-vpc-1.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ This is an Environment Template used to create an environment with Amazon Web Se
55
-->
66

77
<!-- The context points to what Tasks to use for each element of the template-->
8-
<context xmlns="org.urbancode.terraform.tasks.aws" >
8+
<context xmlns="com.urbancode.terraform.tasks.aws" >
99
<!-- The name of your instances will be prefixed with your environment name-->
1010
<environment name="durr" >
1111
<!-- The Virtual Private Cloud is the network in Amazon that the instances

examples/xml-templates/aws-vpc-2.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<context xmlns="org.urbancode.terraform.tasks.aws" >
1+
<context xmlns="com.urbancode.terraform.tasks.aws" >
22
<environment name="durr" >
33
<vpc cidr="192.168.1.0/16">
44
<subnet name="myHouse" zone="us-east-1d" cidr="192.168.2.0/24" />

examples/xml-templates/aws-vpc-3.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<context xmlns="org.urbancode.terraform.tasks.aws" >
1+
<context xmlns="com.urbancode.terraform.tasks.aws" >
22
<environment name="durr" >
33
<vpc cidr="192.168.1.0/16">
44
<subnet name="myHouse" zone="us-east-1d" cidr="192.168.2.0/24" />

examples/xml-templates/rackspace-HA.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<context
3-
xmlns="org.urbancode.terraform.tasks.rackspace">
3+
xmlns="com.urbancode.terraform.tasks.rackspace">
44
<environment
55
name="SIT-env">
66
<server name="app-server" append-suffix="true" region="ORD" flavor="2GB" image="8bf22129-8483-462b-a020-1754ec822770"/>

examples/xml-templates/vmware-config.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<context
3-
xmlns="org.urbancode.terraform.tasks.vmware">
3+
xmlns="com.urbancode.terraform.tasks.vmware">
44
<!-- This creates an environment with a router, app server, and db server on a private network-->
55
<environment
66
name="my-environment"

src/main/java/org/urbancode/terraform/commands/aws/ResumeCommand.java renamed to src/main/java/com/urbancode/terraform/commands/aws/ResumeCommand.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
package org.urbancode.terraform.commands.aws;
1+
package com.urbancode.terraform.commands.aws;
22

33
import java.rmi.RemoteException;
44
import java.util.ArrayList;
55
import java.util.Collections;
66
import java.util.List;
77

88
import org.apache.log4j.Logger;
9-
import org.urbancode.terraform.commands.common.Command;
10-
import org.urbancode.terraform.commands.common.CommandException;
11-
import org.urbancode.terraform.tasks.aws.ContextAWS;
12-
import org.urbancode.terraform.tasks.aws.EnvironmentTaskAWS;
13-
import org.urbancode.terraform.tasks.aws.InstanceTask;
14-
import org.urbancode.terraform.tasks.aws.helpers.AWSHelper;
15-
import org.urbancode.terraform.tasks.aws.util.InstancePriorityComparator;
169

1710
import com.amazonaws.services.ec2.AmazonEC2;
11+
import com.urbancode.terraform.commands.common.Command;
12+
import com.urbancode.terraform.commands.common.CommandException;
13+
import com.urbancode.terraform.tasks.aws.ContextAWS;
14+
import com.urbancode.terraform.tasks.aws.EnvironmentTaskAWS;
15+
import com.urbancode.terraform.tasks.aws.InstanceTask;
16+
import com.urbancode.terraform.tasks.aws.helpers.AWSHelper;
17+
import com.urbancode.terraform.tasks.aws.util.InstancePriorityComparator;
1818

1919
public class ResumeCommand implements Command {
2020

src/main/java/org/urbancode/terraform/commands/aws/SuspendCommand.java renamed to src/main/java/com/urbancode/terraform/commands/aws/SuspendCommand.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
package org.urbancode.terraform.commands.aws;
1+
package com.urbancode.terraform.commands.aws;
22

33
import java.rmi.RemoteException;
44
import java.util.ArrayList;
55
import java.util.Collections;
66
import java.util.List;
77

88
import org.apache.log4j.Logger;
9-
import org.urbancode.terraform.commands.common.Command;
10-
import org.urbancode.terraform.commands.common.CommandException;
11-
import org.urbancode.terraform.tasks.aws.ContextAWS;
12-
import org.urbancode.terraform.tasks.aws.EnvironmentTaskAWS;
13-
import org.urbancode.terraform.tasks.aws.InstanceTask;
14-
import org.urbancode.terraform.tasks.aws.helpers.AWSHelper;
15-
import org.urbancode.terraform.tasks.aws.util.InstancePriorityComparator;
169

1710
import com.amazonaws.services.ec2.AmazonEC2;
11+
import com.urbancode.terraform.commands.common.Command;
12+
import com.urbancode.terraform.commands.common.CommandException;
13+
import com.urbancode.terraform.tasks.aws.ContextAWS;
14+
import com.urbancode.terraform.tasks.aws.EnvironmentTaskAWS;
15+
import com.urbancode.terraform.tasks.aws.InstanceTask;
16+
import com.urbancode.terraform.tasks.aws.helpers.AWSHelper;
17+
import com.urbancode.terraform.tasks.aws.util.InstancePriorityComparator;
1818

1919
public class SuspendCommand implements Command {
2020

src/main/java/org/urbancode/terraform/commands/common/Command.java renamed to src/main/java/com/urbancode/terraform/commands/common/Command.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.urbancode.terraform.commands.common;
1+
package com.urbancode.terraform.commands.common;
22

33
public interface Command {
44

src/main/java/org/urbancode/terraform/commands/common/CommandException.java renamed to src/main/java/com/urbancode/terraform/commands/common/CommandException.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.urbancode.terraform.commands.common;
1+
package com.urbancode.terraform.commands.common;
22

33
public class CommandException extends RuntimeException {
44

src/main/java/org/urbancode/terraform/commands/vmware/ResumeCommand.java renamed to src/main/java/com/urbancode/terraform/commands/vmware/ResumeCommand.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
package org.urbancode.terraform.commands.vmware;
1+
package com.urbancode.terraform.commands.vmware;
22

33
import java.rmi.RemoteException;
44
import java.util.Collections;
55
import java.util.List;
66

77
import org.apache.log4j.Logger;
8-
import org.urbancode.terraform.commands.common.Command;
9-
import org.urbancode.terraform.commands.common.CommandException;
10-
import org.urbancode.terraform.tasks.vmware.CloneTask;
11-
import org.urbancode.terraform.tasks.vmware.ContextVmware;
12-
import org.urbancode.terraform.tasks.vmware.EnvironmentTaskVmware;
138

9+
import com.urbancode.terraform.commands.common.Command;
10+
import com.urbancode.terraform.commands.common.CommandException;
11+
import com.urbancode.terraform.tasks.vmware.CloneTask;
12+
import com.urbancode.terraform.tasks.vmware.ContextVmware;
13+
import com.urbancode.terraform.tasks.vmware.EnvironmentTaskVmware;
1414
import com.vmware.vim25.InvalidProperty;
1515
import com.vmware.vim25.RuntimeFault;
1616

src/main/java/org/urbancode/terraform/commands/vmware/SuspendCommand.java renamed to src/main/java/com/urbancode/terraform/commands/vmware/SuspendCommand.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
package org.urbancode.terraform.commands.vmware;
1+
package com.urbancode.terraform.commands.vmware;
22

33
import java.rmi.RemoteException;
44
import java.util.Collections;
55
import java.util.List;
66

77
import org.apache.log4j.Logger;
8-
import org.urbancode.terraform.commands.common.Command;
9-
import org.urbancode.terraform.commands.common.CommandException;
10-
import org.urbancode.terraform.tasks.vmware.CloneTask;
11-
import org.urbancode.terraform.tasks.vmware.ContextVmware;
12-
import org.urbancode.terraform.tasks.vmware.EnvironmentTaskVmware;
138

9+
import com.urbancode.terraform.commands.common.Command;
10+
import com.urbancode.terraform.commands.common.CommandException;
11+
import com.urbancode.terraform.tasks.vmware.CloneTask;
12+
import com.urbancode.terraform.tasks.vmware.ContextVmware;
13+
import com.urbancode.terraform.tasks.vmware.EnvironmentTaskVmware;
1414
import com.vmware.vim25.InvalidProperty;
1515
import com.vmware.vim25.RuntimeFault;
1616

src/main/java/org/urbancode/terraform/commands/vmware/TakeSnapshotCommand.java renamed to src/main/java/com/urbancode/terraform/commands/vmware/TakeSnapshotCommand.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
package org.urbancode.terraform.commands.vmware;
1+
package com.urbancode.terraform.commands.vmware;
22

33
import java.rmi.RemoteException;
44
import java.util.Collections;
55
import java.util.List;
66

77
import org.apache.log4j.Logger;
8-
import org.urbancode.terraform.commands.common.Command;
9-
import org.urbancode.terraform.commands.common.CommandException;
10-
import org.urbancode.terraform.tasks.vmware.CloneTask;
11-
import org.urbancode.terraform.tasks.vmware.ContextVmware;
12-
import org.urbancode.terraform.tasks.vmware.EnvironmentTaskVmware;
138

9+
import com.urbancode.terraform.commands.common.Command;
10+
import com.urbancode.terraform.commands.common.CommandException;
11+
import com.urbancode.terraform.tasks.vmware.CloneTask;
12+
import com.urbancode.terraform.tasks.vmware.ContextVmware;
13+
import com.urbancode.terraform.tasks.vmware.EnvironmentTaskVmware;
1414
import com.vmware.vim25.VimFault;
1515

1616
public class TakeSnapshotCommand implements Command {

src/main/java/org/urbancode/terraform/credentials/aws/CredentialsAWS.java renamed to src/main/java/com/urbancode/terraform/credentials/aws/CredentialsAWS.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
******************************************************************************/
16-
package org.urbancode.terraform.credentials.aws;
16+
package com.urbancode.terraform.credentials.aws;
1717

1818
import org.apache.log4j.Logger;
19-
import org.urbancode.terraform.credentials.common.Credentials;
2019

2120
import com.amazonaws.auth.AWSCredentials;
2221
import com.amazonaws.auth.BasicAWSCredentials;
22+
import com.urbancode.terraform.credentials.common.Credentials;
2323

2424
public class CredentialsAWS extends Credentials {
2525

src/main/java/org/urbancode/terraform/credentials/aws/CredentialsParserAWS.java renamed to src/main/java/com/urbancode/terraform/credentials/aws/CredentialsParserAWS.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
******************************************************************************/
16-
package org.urbancode.terraform.credentials.aws;
16+
package com.urbancode.terraform.credentials.aws;
1717

1818
import java.util.Properties;
1919

20-
import org.urbancode.terraform.credentials.common.Credentials;
21-
import org.urbancode.terraform.credentials.common.CredentialsParser;
20+
import com.urbancode.terraform.credentials.common.Credentials;
21+
import com.urbancode.terraform.credentials.common.CredentialsParser;
2222

2323

2424
public class CredentialsParserAWS extends CredentialsParser {

src/main/java/org/urbancode/terraform/credentials/common/Credentials.java renamed to src/main/java/com/urbancode/terraform/credentials/common/Credentials.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
******************************************************************************/
16-
package org.urbancode.terraform.credentials.common;
16+
package com.urbancode.terraform.credentials.common;
1717

1818
abstract public class Credentials {
1919

src/main/java/org/urbancode/terraform/credentials/common/CredentialsException.java renamed to src/main/java/com/urbancode/terraform/credentials/common/CredentialsException.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
******************************************************************************/
16-
package org.urbancode.terraform.credentials.common;
16+
package com.urbancode.terraform.credentials.common;
1717

1818
public class CredentialsException extends Exception {
1919

src/main/java/org/urbancode/terraform/credentials/common/CredentialsParser.java renamed to src/main/java/com/urbancode/terraform/credentials/common/CredentialsParser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
******************************************************************************/
16-
package org.urbancode.terraform.credentials.common;
16+
package com.urbancode.terraform.credentials.common;
1717

1818
import java.util.Properties;
1919

src/main/java/org/urbancode/terraform/credentials/common/CredentialsParserRegistry.java renamed to src/main/java/com/urbancode/terraform/credentials/common/CredentialsParserRegistry.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
******************************************************************************/
16-
package org.urbancode.terraform.credentials.common;
16+
package com.urbancode.terraform.credentials.common;
1717

1818
import java.util.HashMap;
1919
import java.util.Map;

src/main/java/org/urbancode/terraform/credentials/microsoft/CredentialsMicrosoft.java renamed to src/main/java/com/urbancode/terraform/credentials/microsoft/CredentialsMicrosoft.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package org.urbancode.terraform.credentials.microsoft;
1+
package com.urbancode.terraform.credentials.microsoft;
22

3-
import org.urbancode.terraform.credentials.common.Credentials;
3+
import com.urbancode.terraform.credentials.common.Credentials;
44

55
public class CredentialsMicrosoft extends Credentials {
66

src/main/java/org/urbancode/terraform/credentials/microsoft/CredentialsParserMicrosoft.java renamed to src/main/java/com/urbancode/terraform/credentials/microsoft/CredentialsParserMicrosoft.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package org.urbancode.terraform.credentials.microsoft;
1+
package com.urbancode.terraform.credentials.microsoft;
22

33
import java.util.Properties;
44

5-
import org.urbancode.terraform.credentials.common.Credentials;
6-
import org.urbancode.terraform.credentials.common.CredentialsParser;
5+
import com.urbancode.terraform.credentials.common.Credentials;
6+
import com.urbancode.terraform.credentials.common.CredentialsParser;
77

88
public class CredentialsParserMicrosoft extends CredentialsParser {
99

src/main/java/org/urbancode/terraform/credentials/rackspace/CredentialsParserRackspace.java renamed to src/main/java/com/urbancode/terraform/credentials/rackspace/CredentialsParserRackspace.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package org.urbancode.terraform.credentials.rackspace;
1+
package com.urbancode.terraform.credentials.rackspace;
22

33
import java.util.Properties;
44

5-
import org.urbancode.terraform.credentials.common.Credentials;
6-
import org.urbancode.terraform.credentials.common.CredentialsParser;
5+
import com.urbancode.terraform.credentials.common.Credentials;
6+
import com.urbancode.terraform.credentials.common.CredentialsParser;
77

88
public class CredentialsParserRackspace extends CredentialsParser {
99

0 commit comments

Comments
 (0)